eventespresso / event-espresso-core

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

Doc Comments +3 added lines

@@ -98,6 +98,9 @@
         $this->get_migration_script()->set_mapping($this->_old_table, $old_event['id'], $this->_new_table, $new_event_question_group_ids);
     }
 
+    /**
+     * @param boolean $primary
+     */
     private function _insert_event_question_group($old_event, $old_question_group_id, $primary)
     {
         global $wpdb;

Indentation +104 added lines, -106 removed lines

@@ -16,15 +16,13 @@ 
             'EQG_primary'=>new EE_Boolean_Field('EQG_primary', __('Flag indicating question is only for primary attendees','event_espresso'), false, false)
         )
     );
-
-
  *
  */
 class EE_DMS_4_1_0_event_question_group extends EE_Data_Migration_Script_Stage_Table
 {
-    private $_new_table;
-    public function _migrate_old_row($old_row)
-    {
+	private $_new_table;
+	public function _migrate_old_row($old_row)
+	{
 //      $txn_id = $this->get_migration_script()->get_mapping_new_pk($this->_old_table, $old_row['id'], $this->_new_transaction_table);
 //          if ( ! $txn_id ){
 //              $this->add_error(sprintf(__("Could not find the transaction for the 3.1 attendee %d from row %s", "event_espresso"),$old_row['id'],$this->_json_encode($old_row)));
@@ -34,8 +32,8 @@ 
 //          $new_line_items = $this->_insert_new_line_items($txn,$old_row);
 //          $this->get_migration_script()->set_mapping($this->_old_table,$old_row['id'],$this->_new_line_table,$new_line_items);
 
-            $this->_insert_new_event_question_groups($old_row);
-    }
+			$this->_insert_new_event_question_groups($old_row);
+	}
 //  function _migration_step($num_items=50){
 //      global $wpdb;
 //      $start_at_record = $this->count_records_migrated();
@@ -55,109 +53,109 @@ 
 //      $count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
 //      return $count;
 //  }
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_detail";
-        $this->_extra_where_sql = 'WHERE event_status!="D"';
-        $this->_new_table = $wpdb->prefix . "esp_event_question_group";
-        $this->_pretty_name = __("Question Groups in each Event", "event_espresso");
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix . "events_detail";
+		$this->_extra_where_sql = 'WHERE event_status!="D"';
+		$this->_new_table = $wpdb->prefix . "esp_event_question_group";
+		$this->_pretty_name = __("Question Groups in each Event", "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
-     * @return void
-     */
-    private function _insert_new_event_question_groups($old_event)
-    {
-        $new_event_question_group_ids = array();
-        $question_groups_for_primary = maybe_unserialize($old_event['question_groups']);
-        if (is_array($question_groups_for_primary)) {
-            foreach ($question_groups_for_primary as $old_question_group_id) {
-                $new_id = $this->_insert_event_question_group($old_event, $old_question_group_id, true);
-                if ($new_id) {
-                    $new_event_question_group_ids[] = $new_id;
-                }
-            }
-        }
-        $event_meta = maybe_unserialize($old_event['event_meta']);
-        if (isset($event_meta['add_attendee_question_groups'])) {
-            if (is_array($event_meta['add_attendee_question_groups'])) {
-                foreach ($event_meta['add_attendee_question_groups'] as $old_question_group_id) {
-                    $new_id = $this->_insert_event_question_group($old_event, $old_question_group_id, false);
-                    if ($new_id) {
-                        $new_event_question_group_ids[] = $new_id;
-                    }
-                }
-            }
-        }
+	/**
+	 * Attempts to insert a new question group inthe new format given an old one
+	 * @global type $wpdb
+	 * @param array $old_event
+	 * @return void
+	 */
+	private function _insert_new_event_question_groups($old_event)
+	{
+		$new_event_question_group_ids = array();
+		$question_groups_for_primary = maybe_unserialize($old_event['question_groups']);
+		if (is_array($question_groups_for_primary)) {
+			foreach ($question_groups_for_primary as $old_question_group_id) {
+				$new_id = $this->_insert_event_question_group($old_event, $old_question_group_id, true);
+				if ($new_id) {
+					$new_event_question_group_ids[] = $new_id;
+				}
+			}
+		}
+		$event_meta = maybe_unserialize($old_event['event_meta']);
+		if (isset($event_meta['add_attendee_question_groups'])) {
+			if (is_array($event_meta['add_attendee_question_groups'])) {
+				foreach ($event_meta['add_attendee_question_groups'] as $old_question_group_id) {
+					$new_id = $this->_insert_event_question_group($old_event, $old_question_group_id, false);
+					if ($new_id) {
+						$new_event_question_group_ids[] = $new_id;
+					}
+				}
+			}
+		}
 
 
-        $this->get_migration_script()->set_mapping($this->_old_table, $old_event['id'], $this->_new_table, $new_event_question_group_ids);
-    }
+		$this->get_migration_script()->set_mapping($this->_old_table, $old_event['id'], $this->_new_table, $new_event_question_group_ids);
+	}
 
-    private function _insert_event_question_group($old_event, $old_question_group_id, $primary)
-    {
-        global $wpdb;
-        $new_question_group_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_qst_group",
-            intval($old_question_group_id),
-            $wpdb->prefix . "esp_question_group"
-        );
+	private function _insert_event_question_group($old_event, $old_question_group_id, $primary)
+	{
+		global $wpdb;
+		$new_question_group_id = $this->get_migration_script()->get_mapping_new_pk(
+			$wpdb->prefix . "events_qst_group",
+			intval($old_question_group_id),
+			$wpdb->prefix . "esp_question_group"
+		);
 
-        if (! $new_question_group_id) {
-            $this->add_error(
-                sprintf(
-                    // translators: %s question ID, %s event ID
-                    __("Could not find 4.1 question ID for 3.1 question id #%s on event $%s", "event_espresso"),
-                    $old_question_group_id,
-                    $old_event['id']
-                )
-            );
-            return 0;
-        }
-        $new_event_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_detail",
-            intval($old_event['id']),
-            $wpdb->posts
-        );
-        if (! $new_question_group_id) {
-            $this->add_error(
-                sprintf(
-                    // translators: %s event ID
-                    __("Could not find 4.1 event 3.1 event id #%s", "event_espresso"),
-                    $old_event['id']
-                )
-            );
-            return 0;
-        }
-        $cols_n_values = array(
-            'EVT_ID' => $new_event_id,
-            'QSG_ID' => $new_question_group_id,
-            'EQG_primary' => $primary
-        );
+		if (! $new_question_group_id) {
+			$this->add_error(
+				sprintf(
+					// translators: %s question ID, %s event ID
+					__("Could not find 4.1 question ID for 3.1 question id #%s on event $%s", "event_espresso"),
+					$old_question_group_id,
+					$old_event['id']
+				)
+			);
+			return 0;
+		}
+		$new_event_id = $this->get_migration_script()->get_mapping_new_pk(
+			$wpdb->prefix . "events_detail",
+			intval($old_event['id']),
+			$wpdb->posts
+		);
+		if (! $new_question_group_id) {
+			$this->add_error(
+				sprintf(
+					// translators: %s event ID
+					__("Could not find 4.1 event 3.1 event id #%s", "event_espresso"),
+					$old_event['id']
+				)
+			);
+			return 0;
+		}
+		$cols_n_values = array(
+			'EVT_ID' => $new_event_id,
+			'QSG_ID' => $new_question_group_id,
+			'EQG_primary' => $primary
+		);
 
-        $datatypes = array(
-            '%d',// EVT_ID
-            '%d',// QSG_ID
-            '%d',// EQG_primary
-        );
-        $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_event,
-                    $this->_new_table,
-                    $cols_n_values,
-                    $datatypes
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
+		$datatypes = array(
+			'%d',// EVT_ID
+			'%d',// QSG_ID
+			'%d',// EQG_primary
+		);
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_event,
+					$this->_new_table,
+					$cols_n_values,
+					$datatypes
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -58,9 +58,9 @@ 
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_detail";
+        $this->_old_table = $wpdb->prefix."events_detail";
         $this->_extra_where_sql = 'WHERE event_status!="D"';
-        $this->_new_table = $wpdb->prefix . "esp_event_question_group";
+        $this->_new_table = $wpdb->prefix."esp_event_question_group";
         $this->_pretty_name = __("Question Groups in each Event", "event_espresso");
         parent::__construct();
     }
@@ -103,12 +103,12 @@ 
     {
         global $wpdb;
         $new_question_group_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_qst_group",
+            $wpdb->prefix."events_qst_group",
             intval($old_question_group_id),
-            $wpdb->prefix . "esp_question_group"
+            $wpdb->prefix."esp_question_group"
         );
 
-        if (! $new_question_group_id) {
+        if ( ! $new_question_group_id) {
             $this->add_error(
                 sprintf(
                     // translators: %s question ID, %s event ID
@@ -120,11 +120,11 @@ 
             return 0;
         }
         $new_event_id = $this->get_migration_script()->get_mapping_new_pk(
-            $wpdb->prefix . "events_detail",
+            $wpdb->prefix."events_detail",
             intval($old_event['id']),
             $wpdb->posts
         );
-        if (! $new_question_group_id) {
+        if ( ! $new_question_group_id) {
             $this->add_error(
                 sprintf(
                     // translators: %s event ID
@@ -141,12 +141,12 @@ 
         );
 
         $datatypes = array(
-            '%d',// EVT_ID
-            '%d',// QSG_ID
-            '%d',// EQG_primary
+            '%d', // EVT_ID
+            '%d', // QSG_ID
+            '%d', // EQG_primary
         );
         $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,

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

Doc Comments +3 added lines, -3 removed lines

@@ -426,7 +426,7 @@ 
 
     /**
      * @param $old_event
-     * @param $new_cpt_id
+     * @param integer $new_cpt_id
      * @return int
      */
     private function _insert_event_meta($old_event, $new_cpt_id)
@@ -693,8 +693,8 @@ 
 
 
     /**
-     * @param $new_event_id
-     * @param $new_venue_id
+     * @param integer $new_event_id
+     * @param integer $new_venue_id
      * @return int
      */
     private function _insert_new_venue_to_event($new_event_id, $new_venue_id)

Indentation +635 added lines, -640 removed lines

@@ -85,8 +85,6 @@ 
   KEY `submitted` (`submitted`),
   KEY `likes` (`likes`)
 ) ENGINE=InnoDB AUTO_INCREMENT=63 DEFAULT CHARSET=utf8$$
-
-
  *
  * 4.1 Event model:
  * $this->_tables = array(
@@ -125,7 +123,6 @@ 
                 'EVT_donations'=>new EE_Boolean_Field('EVT_donations', __("Accept Donations?", "event_espresso"), false, false)
 
             ));
-
  *
  * 3.1's start end table
  *
@@ -138,8 +135,6 @@ 
   PRIMARY KEY (`id`),
   KEY `event_id` (`event_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8$$
-
-
  *
  * and 4.1 Datetime model's tables and fields:
  * $this->_tables = array(
@@ -161,172 +156,172 @@ 
  */
 class EE_DMS_4_1_0_events extends EE_Data_Migration_Script_Stage
 {
-    private $_old_table;
-    private $_old_start_end_table;
-    private $_new_table;
-    private $_new_meta_table;
-    private $_new_datetime_table;
-
-
-
-    /**
-     * Just initializes the status of the migration
-     * @throws EE_Error
-     */
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_detail";
-        $this->_old_start_end_table = $wpdb->prefix . "events_start_end";
-        $this->_new_table = $wpdb->prefix . "posts";
-        $this->_new_meta_table = $wpdb->prefix . "esp_event_meta";
-        $this->_new_datetime_table = $wpdb->prefix . "esp_datetime";
-        $this->_pretty_name = __("Events", "event_espresso");
-        parent::__construct();
-    }
-
-
-
-    /**
-     * Counts the records to migrate; the public version may cache it
-     * @return int
-     */
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(*) FROM " . $this->_old_table . ' WHERE event_status !="D"');
-        return intval($count);
-    }
-
-
-
-    /**
-     * 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;
-        // because the migration of each event can be a LOT more work, make each step smaller
-        $num_items_to_migrate = max(1, $num_items_to_migrate / 5);
-        $events = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table WHERE event_status!='D' LIMIT %d,%d", $this->count_records_migrated(), $num_items_to_migrate), ARRAY_A);
-        $items_migrated_this_step = 0;
-
-        foreach ($events as $event_row) {
-            $guid = null;
-            // insert new 4.1 Attendee object using $wpdb
-            $post_id = $this->_insert_cpt($event_row);
-            if ($post_id) {
-                $this->get_migration_script()->set_mapping($this->_old_table, $event_row['id'], $this->_new_table, $post_id);
-                $meta_id = $this->_insert_event_meta($event_row, $post_id);
-                if ($meta_id) {
-                    $this->get_migration_script()->set_mapping($this->_old_table, $event_row['id'], $this->_new_meta_table, $meta_id);
-                }
-                $this->_convert_start_end_times($event_row, $post_id);
-                $event_meta = maybe_unserialize($event_row['event_meta']);
-                $guid = isset($event_meta['event_thumbnail_url']) ? $event_meta['event_thumbnail_url'] : null;
-                $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $post_id, $this);
-
-                // maybe create a venue from info on the event?
-                $new_venue_id = $this->_maybe_create_venue($event_row);
-                if ($new_venue_id) {
-                    $this->_insert_new_venue_to_event($post_id, $new_venue_id);
-                }
-                $this->_add_post_metas($event_row, $post_id);
-            }
-            $items_migrated_this_step++;
-            if ($guid) {
-                // if we had to check for an image attachment
-                // then let's call it a day (avoid timing out, because this took a long time)
-                break;
-            }
-        }
-        if ($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()) {
-            $this->set_status(EE_Data_Migration_Manager::status_completed);
-        }
-        return $items_migrated_this_step;
-    }
-
-    /**
-     * Stores any extra 3.1 "event_meta" column things as post meta
-     * @param array $old_event
-     * @param int $post_id
-     * @return void
-     */
-    private function _add_post_metas($old_event, $post_id)
-    {
-        $event_meta = maybe_unserialize($old_event['event_meta']);
-        if (! $event_meta || ! is_array($event_meta)) {
-            return;
-        }
-        unset($event_meta['date_submitted']);// factored into CPT
-        unset($event_meta['additional_attendee_reg_info']);// factored into event meta table
-        unset($event_meta['default_payment_status']);// dido
-        unset($event_meta['event_thumbnail_url']);// used to find post featured image
-        foreach ($event_meta as $meta_key => $meta_value) {
-            if ($meta_key) {// if the meta key is just an empty string, ignore it
-                $success = add_post_meta($post_id, $meta_key, $meta_value, true);
-                if (! $success) {
-                    $this->add_error(sprintf(__("Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s", "event_espresso"), $post_id, $meta_key, $meta_value, implode(",", $old_event)));
-                }
-            }
-        }
-        if ($old_event['alt_email']) {
-            add_post_meta($post_id, 'alt_email', $old_event['alt_email']);
-        }
-        if ($old_event['recurrence_id']) {
-            add_post_meta($post_id, 'recurrence_id', $old_event['recurrence_id']);
-        }
-    }
-
-
-
-    /**
-     * Finds a unique slug for this event, given its name (we could have simply used
-     * the old unique_identifier column, but it added a long string of seemingly random characters onto the end
-     * and really wasn't that pretty for a slug, so we decided we'd make our own slug again)
-     * @param string $event_name (the name of the event for reading by humans)
-     * @param string $old_identifier the old EE3 identifier (a long unique string)
-     * @param string $new_post_status a post status
-     * @return string
-     */
-    private function _find_unique_slug($event_name, $old_identifier = '', $new_post_status = 'publish')
-    {
-        $count = 0;
-        $original_name = $event_name ? sanitize_title($event_name) : $old_identifier;
-        return wp_unique_post_slug($original_name, 0, $new_post_status, 'espresso_events', 0);
-    }
-
-    /**
-     * returns whether or not there is a post that has this same slug (post_title)
-     * @global wpdb $wpdb
-     * @param string $slug
-     * @return boolean
-     */
-    private function _other_post_exists_with_that_slug($slug)
-    {
-        global $wpdb;
-        $query = $wpdb->prepare("SELECT COUNT(ID) FROM {$this->_new_table} WHERE event_status != 'D' AND post_name = %s", $slug);
-        $count = $wpdb->get_var($query);
-        return (bool) intval($count);
-    }
-
-
-
-    /**
-     * @param $old_event
-     * @return int
-     */
-    private function _insert_cpt($old_event)
-    {
-        global $wpdb;
-        // convert 3.1 event status to 4.1 CPT status
-        // for reference, 3.1 event stati available for setting are:
+	private $_old_table;
+	private $_old_start_end_table;
+	private $_new_table;
+	private $_new_meta_table;
+	private $_new_datetime_table;
+
+
+
+	/**
+	 * Just initializes the status of the migration
+	 * @throws EE_Error
+	 */
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix . "events_detail";
+		$this->_old_start_end_table = $wpdb->prefix . "events_start_end";
+		$this->_new_table = $wpdb->prefix . "posts";
+		$this->_new_meta_table = $wpdb->prefix . "esp_event_meta";
+		$this->_new_datetime_table = $wpdb->prefix . "esp_datetime";
+		$this->_pretty_name = __("Events", "event_espresso");
+		parent::__construct();
+	}
+
+
+
+	/**
+	 * Counts the records to migrate; the public version may cache it
+	 * @return int
+	 */
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		$count = $wpdb->get_var("SELECT COUNT(*) FROM " . $this->_old_table . ' WHERE event_status !="D"');
+		return intval($count);
+	}
+
+
+
+	/**
+	 * 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;
+		// because the migration of each event can be a LOT more work, make each step smaller
+		$num_items_to_migrate = max(1, $num_items_to_migrate / 5);
+		$events = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table WHERE event_status!='D' LIMIT %d,%d", $this->count_records_migrated(), $num_items_to_migrate), ARRAY_A);
+		$items_migrated_this_step = 0;
+
+		foreach ($events as $event_row) {
+			$guid = null;
+			// insert new 4.1 Attendee object using $wpdb
+			$post_id = $this->_insert_cpt($event_row);
+			if ($post_id) {
+				$this->get_migration_script()->set_mapping($this->_old_table, $event_row['id'], $this->_new_table, $post_id);
+				$meta_id = $this->_insert_event_meta($event_row, $post_id);
+				if ($meta_id) {
+					$this->get_migration_script()->set_mapping($this->_old_table, $event_row['id'], $this->_new_meta_table, $meta_id);
+				}
+				$this->_convert_start_end_times($event_row, $post_id);
+				$event_meta = maybe_unserialize($event_row['event_meta']);
+				$guid = isset($event_meta['event_thumbnail_url']) ? $event_meta['event_thumbnail_url'] : null;
+				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $post_id, $this);
+
+				// maybe create a venue from info on the event?
+				$new_venue_id = $this->_maybe_create_venue($event_row);
+				if ($new_venue_id) {
+					$this->_insert_new_venue_to_event($post_id, $new_venue_id);
+				}
+				$this->_add_post_metas($event_row, $post_id);
+			}
+			$items_migrated_this_step++;
+			if ($guid) {
+				// if we had to check for an image attachment
+				// then let's call it a day (avoid timing out, because this took a long time)
+				break;
+			}
+		}
+		if ($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()) {
+			$this->set_status(EE_Data_Migration_Manager::status_completed);
+		}
+		return $items_migrated_this_step;
+	}
+
+	/**
+	 * Stores any extra 3.1 "event_meta" column things as post meta
+	 * @param array $old_event
+	 * @param int $post_id
+	 * @return void
+	 */
+	private function _add_post_metas($old_event, $post_id)
+	{
+		$event_meta = maybe_unserialize($old_event['event_meta']);
+		if (! $event_meta || ! is_array($event_meta)) {
+			return;
+		}
+		unset($event_meta['date_submitted']);// factored into CPT
+		unset($event_meta['additional_attendee_reg_info']);// factored into event meta table
+		unset($event_meta['default_payment_status']);// dido
+		unset($event_meta['event_thumbnail_url']);// used to find post featured image
+		foreach ($event_meta as $meta_key => $meta_value) {
+			if ($meta_key) {// if the meta key is just an empty string, ignore it
+				$success = add_post_meta($post_id, $meta_key, $meta_value, true);
+				if (! $success) {
+					$this->add_error(sprintf(__("Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s", "event_espresso"), $post_id, $meta_key, $meta_value, implode(",", $old_event)));
+				}
+			}
+		}
+		if ($old_event['alt_email']) {
+			add_post_meta($post_id, 'alt_email', $old_event['alt_email']);
+		}
+		if ($old_event['recurrence_id']) {
+			add_post_meta($post_id, 'recurrence_id', $old_event['recurrence_id']);
+		}
+	}
+
+
+
+	/**
+	 * Finds a unique slug for this event, given its name (we could have simply used
+	 * the old unique_identifier column, but it added a long string of seemingly random characters onto the end
+	 * and really wasn't that pretty for a slug, so we decided we'd make our own slug again)
+	 * @param string $event_name (the name of the event for reading by humans)
+	 * @param string $old_identifier the old EE3 identifier (a long unique string)
+	 * @param string $new_post_status a post status
+	 * @return string
+	 */
+	private function _find_unique_slug($event_name, $old_identifier = '', $new_post_status = 'publish')
+	{
+		$count = 0;
+		$original_name = $event_name ? sanitize_title($event_name) : $old_identifier;
+		return wp_unique_post_slug($original_name, 0, $new_post_status, 'espresso_events', 0);
+	}
+
+	/**
+	 * returns whether or not there is a post that has this same slug (post_title)
+	 * @global wpdb $wpdb
+	 * @param string $slug
+	 * @return boolean
+	 */
+	private function _other_post_exists_with_that_slug($slug)
+	{
+		global $wpdb;
+		$query = $wpdb->prepare("SELECT COUNT(ID) FROM {$this->_new_table} WHERE event_status != 'D' AND post_name = %s", $slug);
+		$count = $wpdb->get_var($query);
+		return (bool) intval($count);
+	}
+
+
+
+	/**
+	 * @param $old_event
+	 * @return int
+	 */
+	private function _insert_cpt($old_event)
+	{
+		global $wpdb;
+		// convert 3.1 event status to 4.1 CPT status
+		// for reference, 3.1 event stati available for setting are:
 //      $status = array(array('id' => 'A', 'text' => __('Public', 'event_espresso')), array('id' => 'S', 'text' => __('Waitlist', 'event_espresso')), array('id' => 'O', 'text' => __('Ongoing', 'event_espresso')), array('id' => 'R', 'text' => __('Draft', 'event_espresso')), array('id' => 'D', 'text' => __('Deleted', 'event_espresso')));
 //      and the json api uses the following to convert from 3.1 to 4.0
 //      'S'=>'secondary/waitlist',
@@ -340,487 +335,487 @@ 
 //      4.1 Event Post stati are the normal post statis
 //      (publish,future,draft,pending,private,trash,auto-draft,inherit)
 //      and 3 custom ones: cancelled,postponed,sold_out
-        $status_conversions = array(
-            'R' => 'draft',
-            'X' => 'draft',// 4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
-            'P' => 'pending',
-            'IA' => 'draft',// draft and in the past
+		$status_conversions = array(
+			'R' => 'draft',
+			'X' => 'draft',// 4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
+			'P' => 'pending',
+			'IA' => 'draft',// draft and in the past
 // IA=inactive in 3.1: events were switched to this when they expired. in 4.1 that's just calculated
-            'O' => 'publish',// @todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
-            'A' => 'publish',
-            'S' => 'draft',// @todo: is it ok to just mark secondary/waitlist events as DRAFTS?
-            'D' => 'trash',
-        );
-        $post_status = $status_conversions[ $old_event['event_status'] ];
-        // check if we've sold out
-        if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])) {
-            $post_status = 'sold_out';
-        }
+			'O' => 'publish',// @todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
+			'A' => 'publish',
+			'S' => 'draft',// @todo: is it ok to just mark secondary/waitlist events as DRAFTS?
+			'D' => 'trash',
+		);
+		$post_status = $status_conversions[ $old_event['event_status'] ];
+		// check if we've sold out
+		if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])) {
+			$post_status = 'sold_out';
+		}
 //      FYI postponed and cancelled don't exist in 3.1
-        $cols_n_values = array(
-            'post_title' => stripslashes($old_event['event_name']),// EVT_name
-            'post_content' => stripslashes($old_event['event_desc']),// EVT_desc
-            'post_name' => $this->_find_unique_slug($old_event['event_name'], $old_event['event_identifier'], $post_status),// EVT_slug
-            'post_date' => $old_event['submitted'],// EVT_created NOT
-            'post_date_gmt' => get_gmt_from_date($old_event['submitted']),
-            'post_excerpt' => '',// EVT_short_desc
-            'post_modified' => $old_event['submitted'],// EVT_modified
-            'post_modified_gmt' => get_gmt_from_date($old_event['submitted']),
-            'post_author' => $old_event['wp_user'],// EVT_wp_user
-            'post_parent' => 0,// parent maybe get this from some REM field?
-            'menu_order' => 0,// EVT_order
-            'post_type' => 'espresso_events',// post_type
-            'post_status' => $post_status,// status
-        );
-        $cols_n_values_with_no_invalid_text = array();
-        foreach ($cols_n_values as $col => $value) {
-            $value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column($this->_new_table, $col, $value);
-            if (! is_wp_error($value_sans_invalid_chars)) {
-                $cols_n_values_with_no_invalid_text[ $col ] = $value_sans_invalid_chars;
-            } else {
-                // otherwise leave it as-is. It will blow everything up and stop the migration
-                $cols_n_values_with_no_invalid_text[ $col ] = $value;
-            }
-        }
-        $cols_n_values = $cols_n_values_with_no_invalid_text;
-        $datatypes = array(
-            '%s',// EVT_name
-            '%s',// EVT_desc
-            '%s',// EVT_slug
-            '%s',// EVT_created
-            '%s',
-            '%s',// EVT_short_desc
-            '%s',// EVT_modified
-            '%s',
-            '%s',// EVT_wp_user
-            '%d',// post_parent
-            '%d',// EVT_order
-            '%s',// post_type
-            '%s',// status
-        );
-        $success = $wpdb->insert(
-            $this->_new_table,
-            $cols_n_values,
-            $datatypes
-        );
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-    /**
-     * Counts all the registrations for the event in the 3.1 DB. (takes into account attendee rows which represent various registrations)
-     * @global wpdb $wpdb
-     * @param int $event_id
-     * @return int
-     */
-    public static function count_registrations($event_id)
-    {
-        global $wpdb;
-        $count = $wpdb->get_var($wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d", $event_id));
-        return intval($count);
-    }
-
-
-
-    /**
-     * @param $old_event
-     * @param $new_cpt_id
-     * @return int
-     */
-    private function _insert_event_meta($old_event, $new_cpt_id)
-    {
-        global $wpdb;
-        $event_meta = maybe_unserialize($old_event['event_meta']);
+		$cols_n_values = array(
+			'post_title' => stripslashes($old_event['event_name']),// EVT_name
+			'post_content' => stripslashes($old_event['event_desc']),// EVT_desc
+			'post_name' => $this->_find_unique_slug($old_event['event_name'], $old_event['event_identifier'], $post_status),// EVT_slug
+			'post_date' => $old_event['submitted'],// EVT_created NOT
+			'post_date_gmt' => get_gmt_from_date($old_event['submitted']),
+			'post_excerpt' => '',// EVT_short_desc
+			'post_modified' => $old_event['submitted'],// EVT_modified
+			'post_modified_gmt' => get_gmt_from_date($old_event['submitted']),
+			'post_author' => $old_event['wp_user'],// EVT_wp_user
+			'post_parent' => 0,// parent maybe get this from some REM field?
+			'menu_order' => 0,// EVT_order
+			'post_type' => 'espresso_events',// post_type
+			'post_status' => $post_status,// status
+		);
+		$cols_n_values_with_no_invalid_text = array();
+		foreach ($cols_n_values as $col => $value) {
+			$value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column($this->_new_table, $col, $value);
+			if (! is_wp_error($value_sans_invalid_chars)) {
+				$cols_n_values_with_no_invalid_text[ $col ] = $value_sans_invalid_chars;
+			} else {
+				// otherwise leave it as-is. It will blow everything up and stop the migration
+				$cols_n_values_with_no_invalid_text[ $col ] = $value;
+			}
+		}
+		$cols_n_values = $cols_n_values_with_no_invalid_text;
+		$datatypes = array(
+			'%s',// EVT_name
+			'%s',// EVT_desc
+			'%s',// EVT_slug
+			'%s',// EVT_created
+			'%s',
+			'%s',// EVT_short_desc
+			'%s',// EVT_modified
+			'%s',
+			'%s',// EVT_wp_user
+			'%d',// post_parent
+			'%d',// EVT_order
+			'%s',// post_type
+			'%s',// status
+		);
+		$success = $wpdb->insert(
+			$this->_new_table,
+			$cols_n_values,
+			$datatypes
+		);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+	/**
+	 * Counts all the registrations for the event in the 3.1 DB. (takes into account attendee rows which represent various registrations)
+	 * @global wpdb $wpdb
+	 * @param int $event_id
+	 * @return int
+	 */
+	public static function count_registrations($event_id)
+	{
+		global $wpdb;
+		$count = $wpdb->get_var($wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d", $event_id));
+		return intval($count);
+	}
+
+
+
+	/**
+	 * @param $old_event
+	 * @param $new_cpt_id
+	 * @return int
+	 */
+	private function _insert_event_meta($old_event, $new_cpt_id)
+	{
+		global $wpdb;
+		$event_meta = maybe_unserialize($old_event['event_meta']);
 //      for reference, 3.1 'default_payment_status' are: $default_payment_status = array(
 //  array('id' => "", 'text' => 'No Change'),
 //  array('id' => 'Incomplete', 'text' => 'Incomplete'),
 //  array('id' => 'Pending', 'text' => 'Pending'),
 //  //array('id' => 'Completed', 'text' => 'Completed')
 // );
-        $default_reg_status = $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(isset($event_meta['default_payment_status']) ? $event_meta['default_payment_status'] : '', intval($old_event['require_pre_approval']));
-        $cols_n_values = array(
-            'EVT_ID' => $new_cpt_id,// EVT_ID_fk
-            'EVT_display_desc' => 'Y' == $old_event['display_desc'],
-            'EVT_display_ticket_selector' => 'Y' == $old_event['display_reg_form'],
-            'EVT_visible_on' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_event, current_time('mysql'), $old_event['timezone_string']),// don't use the old 'visible_on', as it wasn't ever used
-            'EVT_additional_limit' => $old_event['allow_multiple'] == 'N' ? 1 : $old_event['additional_limit'],
-            'EVT_default_registration_status' => $default_reg_status,
-            'EVT_member_only' => $old_event['member_only'],
-            'EVT_phone' => $old_event['phone'],
-            'EVT_allow_overflow' => 'Y' == $old_event['allow_overflow'],
-            'EVT_timezone_string' => $old_event['timezone_string'],
-            'EVT_external_URL' => $old_event['externalURL'],
-            'EVT_donations' => false// doesnt exist in 3.1
-
-        );
-        $datatypes = array(
-            '%s',// EVT_ID
-            '%d',// EVT_display_desc
-            '%d',// EVT_display_ticket_selector
-            '%s',// EVT_visible_on
-            '%d',// EVT_additional_limit
-            '%s',// EVT_default_registration_status
-            '%d',// EVT_member_only
-            '%s',// EVT_phone
-            '%d',// EVT_allow_overflow
-            '%s',// EVT_timezone_string
-            '%s',// EVT_external_URL
-            '%d',// EVT_donations
-        );
-        $success = $wpdb->insert(
-            $this->_new_meta_table,
-            $cols_n_values,
-            $datatypes
-        );
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-
-
-    /**
-     * @param $old_event
-     * @return int
-     */
-    private function _maybe_create_venue($old_event)
-    {
-        if (
-            $old_event['address'] ||
-                $old_event['address2'] ||
-                $old_event['city'] ||
-                $old_event['state'] ||
-                $old_event['zip'] ||
-                $old_event['venue_title'] ||
-                $old_event['venue_url'] ||
-                $old_event['venue_image'] ||
-                $old_event['venue_phone'] ||
-                $old_event['virtual_url'] ||
-                $old_event['virtual_phone']
-        ) {
-            $old_id = $this->_duplicate_venue_exists($old_event);
-            if ($old_id) {
-                return $old_id;
-            }
-            $new_id = $this->_insert_venue_into_posts($old_event);
-            if ($new_id) {
-                $this->_insert_venue_into_meta_table($new_id, $old_event);
-                $guid = isset($old_event['venue_image']) ? $old_event['venue_image']  : null;
-                $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id, $this);
-            }
-            // we don't bother recording the conversion from old events to venues as that
-            // will complicate finding the conversion from old venues to new events
-            return $new_id;
-        } else {
-            return 0;
-        }
-    }
-
-    /**
-     * Assuming there is venue data on this event, check if there is a duplicate venue already in the system for it.
-     * If so, return it. Otherwise return NULL.
-     * @param array $old_event
-     * @return int duplicate venue id
-     */
-    private function _duplicate_venue_exists($old_event)
-    {
-        global $wpdb;
-        $conditions = array(
-            'VNU_address' => $old_event ['address'],
-            'VNU_address2' => $old_event['address2'],
-            'VNU_city' => $old_event['city'],
-            'VNU_zip' => $old_event['zip'],
-            'post_title' => $this->_get_venue_title_for_event($old_event),
-            'VNU_phone' => $old_event['venue_phone'],// VNU_phone
-            'VNU_url' => $old_event['venue_url'],// VNU_url
-            'VNU_virtual_phone' => $old_event['virtual_phone'],// VNU_virtual_phone
-            'VNU_virtual_url' => $old_event['virtual_url'],// VNU_virtual_url
-        );
-        $sql_conditions = array();
-        foreach ($conditions as $column => $value) {
-            $sql_conditions [] = $wpdb->prepare("$column = %s", $value);
-        }
-        $query = "SELECT VNU_ID
+		$default_reg_status = $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(isset($event_meta['default_payment_status']) ? $event_meta['default_payment_status'] : '', intval($old_event['require_pre_approval']));
+		$cols_n_values = array(
+			'EVT_ID' => $new_cpt_id,// EVT_ID_fk
+			'EVT_display_desc' => 'Y' == $old_event['display_desc'],
+			'EVT_display_ticket_selector' => 'Y' == $old_event['display_reg_form'],
+			'EVT_visible_on' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_event, current_time('mysql'), $old_event['timezone_string']),// don't use the old 'visible_on', as it wasn't ever used
+			'EVT_additional_limit' => $old_event['allow_multiple'] == 'N' ? 1 : $old_event['additional_limit'],
+			'EVT_default_registration_status' => $default_reg_status,
+			'EVT_member_only' => $old_event['member_only'],
+			'EVT_phone' => $old_event['phone'],
+			'EVT_allow_overflow' => 'Y' == $old_event['allow_overflow'],
+			'EVT_timezone_string' => $old_event['timezone_string'],
+			'EVT_external_URL' => $old_event['externalURL'],
+			'EVT_donations' => false// doesnt exist in 3.1
+
+		);
+		$datatypes = array(
+			'%s',// EVT_ID
+			'%d',// EVT_display_desc
+			'%d',// EVT_display_ticket_selector
+			'%s',// EVT_visible_on
+			'%d',// EVT_additional_limit
+			'%s',// EVT_default_registration_status
+			'%d',// EVT_member_only
+			'%s',// EVT_phone
+			'%d',// EVT_allow_overflow
+			'%s',// EVT_timezone_string
+			'%s',// EVT_external_URL
+			'%d',// EVT_donations
+		);
+		$success = $wpdb->insert(
+			$this->_new_meta_table,
+			$cols_n_values,
+			$datatypes
+		);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+
+
+	/**
+	 * @param $old_event
+	 * @return int
+	 */
+	private function _maybe_create_venue($old_event)
+	{
+		if (
+			$old_event['address'] ||
+				$old_event['address2'] ||
+				$old_event['city'] ||
+				$old_event['state'] ||
+				$old_event['zip'] ||
+				$old_event['venue_title'] ||
+				$old_event['venue_url'] ||
+				$old_event['venue_image'] ||
+				$old_event['venue_phone'] ||
+				$old_event['virtual_url'] ||
+				$old_event['virtual_phone']
+		) {
+			$old_id = $this->_duplicate_venue_exists($old_event);
+			if ($old_id) {
+				return $old_id;
+			}
+			$new_id = $this->_insert_venue_into_posts($old_event);
+			if ($new_id) {
+				$this->_insert_venue_into_meta_table($new_id, $old_event);
+				$guid = isset($old_event['venue_image']) ? $old_event['venue_image']  : null;
+				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id, $this);
+			}
+			// we don't bother recording the conversion from old events to venues as that
+			// will complicate finding the conversion from old venues to new events
+			return $new_id;
+		} else {
+			return 0;
+		}
+	}
+
+	/**
+	 * Assuming there is venue data on this event, check if there is a duplicate venue already in the system for it.
+	 * If so, return it. Otherwise return NULL.
+	 * @param array $old_event
+	 * @return int duplicate venue id
+	 */
+	private function _duplicate_venue_exists($old_event)
+	{
+		global $wpdb;
+		$conditions = array(
+			'VNU_address' => $old_event ['address'],
+			'VNU_address2' => $old_event['address2'],
+			'VNU_city' => $old_event['city'],
+			'VNU_zip' => $old_event['zip'],
+			'post_title' => $this->_get_venue_title_for_event($old_event),
+			'VNU_phone' => $old_event['venue_phone'],// VNU_phone
+			'VNU_url' => $old_event['venue_url'],// VNU_url
+			'VNU_virtual_phone' => $old_event['virtual_phone'],// VNU_virtual_phone
+			'VNU_virtual_url' => $old_event['virtual_url'],// VNU_virtual_url
+		);
+		$sql_conditions = array();
+		foreach ($conditions as $column => $value) {
+			$sql_conditions [] = $wpdb->prepare("$column = %s", $value);
+		}
+		$query = "SELECT VNU_ID
 					FROM
 		{$wpdb->posts} as p INNER JOIN
 		{$wpdb->prefix}esp_venue_meta as v ON p.ID = v.VNU_ID
 			WHERE " . implode(" AND ", $sql_conditions) . " LIMIT 1";
-        $id = $wpdb->get_var($query);
-        return $id;
-    }
-
-    /**
-     * Gets teh venue's title or makes one up if there is none
-     * @param array $event_data_array keys are events_details columns and values are their values
-     * @return string
-     */
-    protected function _get_venue_title_for_event($event_data_array)
-    {
-        return $event_data_array['venue_title'] ? stripslashes($event_data_array['venue_title']) : stripslashes(sprintf(__('Venue of %s', 'event_espresso'), $event_data_array['event_name']));
-    }
-
-    /**
-     * Inserts the CPT
-     *
-     * @param array $old_event keys are cols, values are col values
-     * @return int
-     */
-    private function _insert_venue_into_posts($old_event)
-    {
-        global $wpdb;
-        $insertion_array = array(
-                    'post_title' => $this->_get_venue_title_for_event($old_event),// VNU_name
-                    'post_content' => '',// VNU_desc
-                    'post_name' => $this->_find_unique_slug($old_event['venue_title'], sanitize_title('venue-of-' . $old_event['event_name'])),// VNU_identifier
-                    'post_date' => current_time('mysql'),// VNU_created
-                    'post_date_gmt' => get_gmt_from_date(current_time('mysql')),
-                    'post_excerpt' => '',// VNU_short_desc arbitrary only 50 characters
-                    'post_modified' => current_time('mysql'),// VNU_modified
-                    'post_modified_gmt' => get_gmt_from_date(current_time('mysql')),
-                    'post_author' => $old_event['wp_user'],// VNU_wp_user
-                    'post_parent' => 0,// parent
-                    'menu_order' => 0,// VNU_order
-                    'post_type' => 'espresso_venues'// post_type
-                );
-        $datatypes_array = array(
-                    '%s',// VNU_name
-                    '%s',// VNU_desc
-                    '%s',// VNU_identifier
-                    '%s',// VNU_created
-                    '%s',
-                    '%s',// VNU_short_desc
-                    '%s',// VNU_modified
-                    '%s',
-                    '%d',// VNU_wp_user
-                    '%d',// parent
-                    '%d',// VNU_order
-                    '%s',// post_type
-                );
-        $success = $wpdb->insert(
-            $wpdb->posts,
-            $insertion_array,
-            $datatypes_array
-        );
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_event,
-                    $this->_new_table,
-                    $insertion_array,
-                    $datatypes_array
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-    /**
-     * Inserts into the venue_meta table
-     * @param int $cpt_id
-     * @param array $old_event
-     * @return int
-     */
-    private function _insert_venue_into_meta_table($cpt_id, $old_event)
-    {
-        global $wpdb;
-
-        // assume the country is the same as the organization's old settings
-        $country_iso = $this->get_migration_script()->get_default_country_iso();
-        // find the state from the venue, or the organization, or just guess california
-        if (! $old_event['state']) {
-            $old_org_options = get_option('events_organization_settings');
-            $state_name = stripslashes($old_org_options['organization_state']);
-        } else {
-            $state_name = $old_event['state'];
-        }
-        if (! $state_name) {
-            $state_name = 'CA';
-        }
-        // get a state ID with the same name, if possible
-        try {
-            $state = $this->get_migration_script()->get_or_create_state($state_name, $country_iso);
-            $state_id = $state['STA_ID'];
-        } catch (EE_Error $e) {
-            $this->add_error($e->getMessage());
-            $state_id = 0;
-        }
-        // now insert into meta table
-        $insertion_array = array(
-            'VNU_ID' => $cpt_id,// VNU_ID_fk
-            'VNU_address' => stripslashes($old_event['address']),// VNU_address
-            'VNU_address2' => stripslashes($old_event['address2']),// VNU_address2
-            'VNU_city' => stripslashes($old_event['city']),// VNU_city
-            'STA_ID' => $state_id,// STA_ID
-            'CNT_ISO' => $country_iso,// CNT_ISO
-            'VNU_zip' => $old_event['zip'],// VNU_zip
-            'VNU_phone' => $old_event['venue_phone'],// VNU_phone
-            'VNU_capacity' => -1,// VNU_capacity
-            'VNU_url' => $old_event['venue_url'],// VNU_url
-            'VNU_virtual_phone' => $old_event['virtual_phone'],// VNU_virtual_phone
-            'VNU_virtual_url' => $old_event['virtual_url'],// VNU_virtual_url
-            'VNU_google_map_link' => '',// VNU_google_map_link
-            'VNU_enable_for_gmap' => true // VNU_enable_for_gmap
-        );
-        $datatypes = array(
-            '%d',// VNU_ID_fk
-            '%s',// VNU_address
-            '%s',// VNU_address2
-            '%s',// VNU_city
-            '%d',// STA_ID
-            '%s',// CNT_ISO
-            '%s',// VNU_zip
-            '%s',// VNU_phone
-            '%d',// VNU_capacity
-            '%s',// VNU_url
-            '%s',// VNU_virtual_phone
-            '%s',// VNU_virtual_url
-            '%s',// VNU_google_map_link
-            '%d',// VNU_enable_for_gmap
-        );
-        $success = $wpdb->insert($wpdb->prefix . "esp_venue_meta", $insertion_array, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $insertion_array, $datatypes));
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-
-
-    /**
-     * @param $new_event_id
-     * @param $new_venue_id
-     * @return int
-     */
-    private function _insert_new_venue_to_event($new_event_id, $new_venue_id)
-    {
-        global $wpdb;
-        if (! $new_event_id) {
-            $this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $new_event_id));
-            return 0;
-        }
-        if (! $new_venue_id) {
-            $this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $new_venue_id));
-            return 0;
-        }
-        $cols_n_values = array(
-            'EVT_ID' => $new_event_id,
-            'VNU_ID' => $new_venue_id,
-            'EVV_primary' => true
-        );
-        $datatypes = array(
-            '%d',// EVT_ID
-            '%d',// VNU_ID
-            '%d',// EVT_primary
-        );
-        $success = $wpdb->insert($wpdb->prefix . "esp_event_venue", $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    array(),
-                    $this->_new_table,
-                    $cols_n_values,
-                    $datatypes
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-    /**
-     * Converts all the 3.1 start-end times for the event to 4.1 datetimes
-     * @global wpdb $wpdb
-     * @param array $old_event results of get_results(...,ARRAY_A)
-     * @param int $new_cpt_id new post ID
-     * @return void (if there are errors though, adds them to the stage's error list
-     */
-    private function _convert_start_end_times($old_event, $new_cpt_id)
-    {
-        $start_end_times = $this->_get_old_start_end_times($old_event['id']);
-        foreach ($start_end_times as $start_end_time) {
-            $datetime_id = $this->_insert_new_datetime($start_end_time, $old_event, $new_cpt_id);
-            if ($datetime_id) {
-                $this->get_migration_script()->set_mapping($this->_old_start_end_table, $start_end_time['id'], $this->_new_datetime_table, $datetime_id);
-            }
-        }
-    }
-    /**
-     * Queries the 3.1 wp_events_start_end table to get all the start and end times for the event
-     * @global wpdb $wpdb
-     * @param int $old_event_id
-     * @return array
-     */
-    private function _get_old_start_end_times($old_event_id)
-    {
-        global $wpdb;
-        return $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d", $old_event_id), ARRAY_A);
-    }
-    /**
-     * Inserts a 4.1 datetime given the 3.1 start_end db row and event_details row
-     * @param array $start_end_time_row
-     * @param array $old_event_row
-     * @param int $new_cpt_id
-     * @return int ID of new datetime
-     */
-    private function _insert_new_datetime($start_end_time_row, $old_event_row, $new_cpt_id)
-    {
-        global $wpdb;
-        $start_date = $old_event_row['start_date'];
-        $start_time = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['start_time']);
-        $end_date = $old_event_row['end_date'];
-        $end_time = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['end_time']);
-        $existing_datetimes = $this->_count_other_datetimes_exist_for_new_event($new_cpt_id);
-        $start_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$start_date $start_time:00", $old_event_row['timezone_string']);
-        $end_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$end_date $end_time:00", $old_event_row['timezone_string']);
-        $cols_n_values = array(
-            'EVT_ID' => $new_cpt_id,// EVT_ID
-            'DTT_EVT_start' => $start_datetime_utc,// DTT_EVT_start
-            'DTT_EVT_end' => $end_datetime_utc,// DTT_EVT_end
-            'DTT_reg_limit' => intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit'] : $old_event_row['reg_limit'],// DTT_reg_limit
-            'DTT_sold' => 0,// note: we will increment this as registrations are added during the migration
+		$id = $wpdb->get_var($query);
+		return $id;
+	}
+
+	/**
+	 * Gets teh venue's title or makes one up if there is none
+	 * @param array $event_data_array keys are events_details columns and values are their values
+	 * @return string
+	 */
+	protected function _get_venue_title_for_event($event_data_array)
+	{
+		return $event_data_array['venue_title'] ? stripslashes($event_data_array['venue_title']) : stripslashes(sprintf(__('Venue of %s', 'event_espresso'), $event_data_array['event_name']));
+	}
+
+	/**
+	 * Inserts the CPT
+	 *
+	 * @param array $old_event keys are cols, values are col values
+	 * @return int
+	 */
+	private function _insert_venue_into_posts($old_event)
+	{
+		global $wpdb;
+		$insertion_array = array(
+					'post_title' => $this->_get_venue_title_for_event($old_event),// VNU_name
+					'post_content' => '',// VNU_desc
+					'post_name' => $this->_find_unique_slug($old_event['venue_title'], sanitize_title('venue-of-' . $old_event['event_name'])),// VNU_identifier
+					'post_date' => current_time('mysql'),// VNU_created
+					'post_date_gmt' => get_gmt_from_date(current_time('mysql')),
+					'post_excerpt' => '',// VNU_short_desc arbitrary only 50 characters
+					'post_modified' => current_time('mysql'),// VNU_modified
+					'post_modified_gmt' => get_gmt_from_date(current_time('mysql')),
+					'post_author' => $old_event['wp_user'],// VNU_wp_user
+					'post_parent' => 0,// parent
+					'menu_order' => 0,// VNU_order
+					'post_type' => 'espresso_venues'// post_type
+				);
+		$datatypes_array = array(
+					'%s',// VNU_name
+					'%s',// VNU_desc
+					'%s',// VNU_identifier
+					'%s',// VNU_created
+					'%s',
+					'%s',// VNU_short_desc
+					'%s',// VNU_modified
+					'%s',
+					'%d',// VNU_wp_user
+					'%d',// parent
+					'%d',// VNU_order
+					'%s',// post_type
+				);
+		$success = $wpdb->insert(
+			$wpdb->posts,
+			$insertion_array,
+			$datatypes_array
+		);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_event,
+					$this->_new_table,
+					$insertion_array,
+					$datatypes_array
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+	/**
+	 * Inserts into the venue_meta table
+	 * @param int $cpt_id
+	 * @param array $old_event
+	 * @return int
+	 */
+	private function _insert_venue_into_meta_table($cpt_id, $old_event)
+	{
+		global $wpdb;
+
+		// assume the country is the same as the organization's old settings
+		$country_iso = $this->get_migration_script()->get_default_country_iso();
+		// find the state from the venue, or the organization, or just guess california
+		if (! $old_event['state']) {
+			$old_org_options = get_option('events_organization_settings');
+			$state_name = stripslashes($old_org_options['organization_state']);
+		} else {
+			$state_name = $old_event['state'];
+		}
+		if (! $state_name) {
+			$state_name = 'CA';
+		}
+		// get a state ID with the same name, if possible
+		try {
+			$state = $this->get_migration_script()->get_or_create_state($state_name, $country_iso);
+			$state_id = $state['STA_ID'];
+		} catch (EE_Error $e) {
+			$this->add_error($e->getMessage());
+			$state_id = 0;
+		}
+		// now insert into meta table
+		$insertion_array = array(
+			'VNU_ID' => $cpt_id,// VNU_ID_fk
+			'VNU_address' => stripslashes($old_event['address']),// VNU_address
+			'VNU_address2' => stripslashes($old_event['address2']),// VNU_address2
+			'VNU_city' => stripslashes($old_event['city']),// VNU_city
+			'STA_ID' => $state_id,// STA_ID
+			'CNT_ISO' => $country_iso,// CNT_ISO
+			'VNU_zip' => $old_event['zip'],// VNU_zip
+			'VNU_phone' => $old_event['venue_phone'],// VNU_phone
+			'VNU_capacity' => -1,// VNU_capacity
+			'VNU_url' => $old_event['venue_url'],// VNU_url
+			'VNU_virtual_phone' => $old_event['virtual_phone'],// VNU_virtual_phone
+			'VNU_virtual_url' => $old_event['virtual_url'],// VNU_virtual_url
+			'VNU_google_map_link' => '',// VNU_google_map_link
+			'VNU_enable_for_gmap' => true // VNU_enable_for_gmap
+		);
+		$datatypes = array(
+			'%d',// VNU_ID_fk
+			'%s',// VNU_address
+			'%s',// VNU_address2
+			'%s',// VNU_city
+			'%d',// STA_ID
+			'%s',// CNT_ISO
+			'%s',// VNU_zip
+			'%s',// VNU_phone
+			'%d',// VNU_capacity
+			'%s',// VNU_url
+			'%s',// VNU_virtual_phone
+			'%s',// VNU_virtual_url
+			'%s',// VNU_google_map_link
+			'%d',// VNU_enable_for_gmap
+		);
+		$success = $wpdb->insert($wpdb->prefix . "esp_venue_meta", $insertion_array, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $insertion_array, $datatypes));
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+
+
+	/**
+	 * @param $new_event_id
+	 * @param $new_venue_id
+	 * @return int
+	 */
+	private function _insert_new_venue_to_event($new_event_id, $new_venue_id)
+	{
+		global $wpdb;
+		if (! $new_event_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $new_event_id));
+			return 0;
+		}
+		if (! $new_venue_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $new_venue_id));
+			return 0;
+		}
+		$cols_n_values = array(
+			'EVT_ID' => $new_event_id,
+			'VNU_ID' => $new_venue_id,
+			'EVV_primary' => true
+		);
+		$datatypes = array(
+			'%d',// EVT_ID
+			'%d',// VNU_ID
+			'%d',// EVT_primary
+		);
+		$success = $wpdb->insert($wpdb->prefix . "esp_event_venue", $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					array(),
+					$this->_new_table,
+					$cols_n_values,
+					$datatypes
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+	/**
+	 * Converts all the 3.1 start-end times for the event to 4.1 datetimes
+	 * @global wpdb $wpdb
+	 * @param array $old_event results of get_results(...,ARRAY_A)
+	 * @param int $new_cpt_id new post ID
+	 * @return void (if there are errors though, adds them to the stage's error list
+	 */
+	private function _convert_start_end_times($old_event, $new_cpt_id)
+	{
+		$start_end_times = $this->_get_old_start_end_times($old_event['id']);
+		foreach ($start_end_times as $start_end_time) {
+			$datetime_id = $this->_insert_new_datetime($start_end_time, $old_event, $new_cpt_id);
+			if ($datetime_id) {
+				$this->get_migration_script()->set_mapping($this->_old_start_end_table, $start_end_time['id'], $this->_new_datetime_table, $datetime_id);
+			}
+		}
+	}
+	/**
+	 * Queries the 3.1 wp_events_start_end table to get all the start and end times for the event
+	 * @global wpdb $wpdb
+	 * @param int $old_event_id
+	 * @return array
+	 */
+	private function _get_old_start_end_times($old_event_id)
+	{
+		global $wpdb;
+		return $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d", $old_event_id), ARRAY_A);
+	}
+	/**
+	 * Inserts a 4.1 datetime given the 3.1 start_end db row and event_details row
+	 * @param array $start_end_time_row
+	 * @param array $old_event_row
+	 * @param int $new_cpt_id
+	 * @return int ID of new datetime
+	 */
+	private function _insert_new_datetime($start_end_time_row, $old_event_row, $new_cpt_id)
+	{
+		global $wpdb;
+		$start_date = $old_event_row['start_date'];
+		$start_time = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['start_time']);
+		$end_date = $old_event_row['end_date'];
+		$end_time = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['end_time']);
+		$existing_datetimes = $this->_count_other_datetimes_exist_for_new_event($new_cpt_id);
+		$start_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$start_date $start_time:00", $old_event_row['timezone_string']);
+		$end_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$end_date $end_time:00", $old_event_row['timezone_string']);
+		$cols_n_values = array(
+			'EVT_ID' => $new_cpt_id,// EVT_ID
+			'DTT_EVT_start' => $start_datetime_utc,// DTT_EVT_start
+			'DTT_EVT_end' => $end_datetime_utc,// DTT_EVT_end
+			'DTT_reg_limit' => intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit'] : $old_event_row['reg_limit'],// DTT_reg_limit
+			'DTT_sold' => 0,// note: we will increment this as registrations are added during the migration
 //          'DTT_is_primary'=> 0 == $existing_datetimes ,//DTT_is_primary... if count==0, then we'll call it the 'primary'
-            'DTT_order' => $existing_datetimes,// DTT_order, just give it the same order as the count of how many datetimes already exist
-            'DTT_parent' => 0,
-            'DTT_deleted' => false
-        );
-        $datatypes = array(
-            '%d',// EVT_Id
-            '%s',// DTT_EVT_start
-            '%s',// DTT_EVT_end
-            '%d',// DTT_reg_limit
-            '%d',// DTT_sold
+			'DTT_order' => $existing_datetimes,// DTT_order, just give it the same order as the count of how many datetimes already exist
+			'DTT_parent' => 0,
+			'DTT_deleted' => false
+		);
+		$datatypes = array(
+			'%d',// EVT_Id
+			'%s',// DTT_EVT_start
+			'%s',// DTT_EVT_end
+			'%d',// DTT_reg_limit
+			'%d',// DTT_sold
 //          '%d',//DTT_is_primary
-            '%d',// DTT_order
-            '%d',// DTT_parent
-            '%d',// DTT_deleted
-        );
-        $success = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_start_end_table, array_merge($old_event_row, $start_end_time_row), $this->_new_datetime_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-    /**
-     * Checks if there's a 4.1 datetime for this event already. This is mostly only handy
-     * when deciding whether a datetime we're about ot insert should be the 'primary' or not
-     * @global wpdb $wpdb
-     * @param int $cpt_event_id
-     * @return int
-     */
-    private function _count_other_datetimes_exist_for_new_event($cpt_event_id)
-    {
-        global $wpdb;
-        $count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d", $cpt_event_id));
-        return intval($count);
-    }
+			'%d',// DTT_order
+			'%d',// DTT_parent
+			'%d',// DTT_deleted
+		);
+		$success = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_start_end_table, array_merge($old_event_row, $start_end_time_row), $this->_new_datetime_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+	/**
+	 * Checks if there's a 4.1 datetime for this event already. This is mostly only handy
+	 * when deciding whether a datetime we're about ot insert should be the 'primary' or not
+	 * @global wpdb $wpdb
+	 * @param int $cpt_event_id
+	 * @return int
+	 */
+	private function _count_other_datetimes_exist_for_new_event($cpt_event_id)
+	{
+		global $wpdb;
+		$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d", $cpt_event_id));
+		return intval($count);
+	}
 }

Spacing +137 added lines, -137 removed lines

@@ -176,11 +176,11 @@ 
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_detail";
-        $this->_old_start_end_table = $wpdb->prefix . "events_start_end";
-        $this->_new_table = $wpdb->prefix . "posts";
-        $this->_new_meta_table = $wpdb->prefix . "esp_event_meta";
-        $this->_new_datetime_table = $wpdb->prefix . "esp_datetime";
+        $this->_old_table = $wpdb->prefix."events_detail";
+        $this->_old_start_end_table = $wpdb->prefix."events_start_end";
+        $this->_new_table = $wpdb->prefix."posts";
+        $this->_new_meta_table = $wpdb->prefix."esp_event_meta";
+        $this->_new_datetime_table = $wpdb->prefix."esp_datetime";
         $this->_pretty_name = __("Events", "event_espresso");
         parent::__construct();
     }
@@ -194,7 +194,7 @@ 
     public function _count_records_to_migrate()
     {
         global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(*) FROM " . $this->_old_table . ' WHERE event_status !="D"');
+        $count = $wpdb->get_var("SELECT COUNT(*) FROM ".$this->_old_table.' WHERE event_status !="D"');
         return intval($count);
     }
 
@@ -261,17 +261,17 @@ 
     private function _add_post_metas($old_event, $post_id)
     {
         $event_meta = maybe_unserialize($old_event['event_meta']);
-        if (! $event_meta || ! is_array($event_meta)) {
+        if ( ! $event_meta || ! is_array($event_meta)) {
             return;
         }
-        unset($event_meta['date_submitted']);// factored into CPT
-        unset($event_meta['additional_attendee_reg_info']);// factored into event meta table
-        unset($event_meta['default_payment_status']);// dido
-        unset($event_meta['event_thumbnail_url']);// used to find post featured image
+        unset($event_meta['date_submitted']); // factored into CPT
+        unset($event_meta['additional_attendee_reg_info']); // factored into event meta table
+        unset($event_meta['default_payment_status']); // dido
+        unset($event_meta['event_thumbnail_url']); // used to find post featured image
         foreach ($event_meta as $meta_key => $meta_value) {
             if ($meta_key) {// if the meta key is just an empty string, ignore it
                 $success = add_post_meta($post_id, $meta_key, $meta_value, true);
-                if (! $success) {
+                if ( ! $success) {
                     $this->add_error(sprintf(__("Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s", "event_espresso"), $post_id, $meta_key, $meta_value, implode(",", $old_event)));
                 }
             }
@@ -342,68 +342,68 @@ 
 //      and 3 custom ones: cancelled,postponed,sold_out
         $status_conversions = array(
             'R' => 'draft',
-            'X' => 'draft',// 4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
+            'X' => 'draft', // 4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
             'P' => 'pending',
-            'IA' => 'draft',// draft and in the past
+            'IA' => 'draft', // draft and in the past
 // IA=inactive in 3.1: events were switched to this when they expired. in 4.1 that's just calculated
-            'O' => 'publish',// @todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
+            'O' => 'publish', // @todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
             'A' => 'publish',
-            'S' => 'draft',// @todo: is it ok to just mark secondary/waitlist events as DRAFTS?
+            'S' => 'draft', // @todo: is it ok to just mark secondary/waitlist events as DRAFTS?
             'D' => 'trash',
         );
-        $post_status = $status_conversions[ $old_event['event_status'] ];
+        $post_status = $status_conversions[$old_event['event_status']];
         // check if we've sold out
         if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])) {
             $post_status = 'sold_out';
         }
 //      FYI postponed and cancelled don't exist in 3.1
         $cols_n_values = array(
-            'post_title' => stripslashes($old_event['event_name']),// EVT_name
-            'post_content' => stripslashes($old_event['event_desc']),// EVT_desc
-            'post_name' => $this->_find_unique_slug($old_event['event_name'], $old_event['event_identifier'], $post_status),// EVT_slug
-            'post_date' => $old_event['submitted'],// EVT_created NOT
+            'post_title' => stripslashes($old_event['event_name']), // EVT_name
+            'post_content' => stripslashes($old_event['event_desc']), // EVT_desc
+            'post_name' => $this->_find_unique_slug($old_event['event_name'], $old_event['event_identifier'], $post_status), // EVT_slug
+            'post_date' => $old_event['submitted'], // EVT_created NOT
             'post_date_gmt' => get_gmt_from_date($old_event['submitted']),
-            'post_excerpt' => '',// EVT_short_desc
-            'post_modified' => $old_event['submitted'],// EVT_modified
+            'post_excerpt' => '', // EVT_short_desc
+            'post_modified' => $old_event['submitted'], // EVT_modified
             'post_modified_gmt' => get_gmt_from_date($old_event['submitted']),
-            'post_author' => $old_event['wp_user'],// EVT_wp_user
-            'post_parent' => 0,// parent maybe get this from some REM field?
-            'menu_order' => 0,// EVT_order
-            'post_type' => 'espresso_events',// post_type
-            'post_status' => $post_status,// status
+            'post_author' => $old_event['wp_user'], // EVT_wp_user
+            'post_parent' => 0, // parent maybe get this from some REM field?
+            'menu_order' => 0, // EVT_order
+            'post_type' => 'espresso_events', // post_type
+            'post_status' => $post_status, // status
         );
         $cols_n_values_with_no_invalid_text = array();
         foreach ($cols_n_values as $col => $value) {
             $value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column($this->_new_table, $col, $value);
-            if (! is_wp_error($value_sans_invalid_chars)) {
-                $cols_n_values_with_no_invalid_text[ $col ] = $value_sans_invalid_chars;
+            if ( ! is_wp_error($value_sans_invalid_chars)) {
+                $cols_n_values_with_no_invalid_text[$col] = $value_sans_invalid_chars;
             } else {
                 // otherwise leave it as-is. It will blow everything up and stop the migration
-                $cols_n_values_with_no_invalid_text[ $col ] = $value;
+                $cols_n_values_with_no_invalid_text[$col] = $value;
             }
         }
         $cols_n_values = $cols_n_values_with_no_invalid_text;
         $datatypes = array(
-            '%s',// EVT_name
-            '%s',// EVT_desc
-            '%s',// EVT_slug
-            '%s',// EVT_created
+            '%s', // EVT_name
+            '%s', // EVT_desc
+            '%s', // EVT_slug
+            '%s', // EVT_created
             '%s',
-            '%s',// EVT_short_desc
-            '%s',// EVT_modified
+            '%s', // EVT_short_desc
+            '%s', // EVT_modified
             '%s',
-            '%s',// EVT_wp_user
-            '%d',// post_parent
-            '%d',// EVT_order
-            '%s',// post_type
-            '%s',// status
+            '%s', // EVT_wp_user
+            '%d', // post_parent
+            '%d', // EVT_order
+            '%s', // post_type
+            '%s', // status
         );
         $success = $wpdb->insert(
             $this->_new_table,
             $cols_n_values,
             $datatypes
         );
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_table, $cols_n_values, $datatypes));
             return 0;
         }
@@ -442,10 +442,10 @@ 
 // );
         $default_reg_status = $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(isset($event_meta['default_payment_status']) ? $event_meta['default_payment_status'] : '', intval($old_event['require_pre_approval']));
         $cols_n_values = array(
-            'EVT_ID' => $new_cpt_id,// EVT_ID_fk
+            'EVT_ID' => $new_cpt_id, // EVT_ID_fk
             'EVT_display_desc' => 'Y' == $old_event['display_desc'],
             'EVT_display_ticket_selector' => 'Y' == $old_event['display_reg_form'],
-            'EVT_visible_on' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_event, current_time('mysql'), $old_event['timezone_string']),// don't use the old 'visible_on', as it wasn't ever used
+            'EVT_visible_on' => $this->get_migration_script()->convert_date_string_to_utc($this, $old_event, current_time('mysql'), $old_event['timezone_string']), // don't use the old 'visible_on', as it wasn't ever used
             'EVT_additional_limit' => $old_event['allow_multiple'] == 'N' ? 1 : $old_event['additional_limit'],
             'EVT_default_registration_status' => $default_reg_status,
             'EVT_member_only' => $old_event['member_only'],
@@ -457,25 +457,25 @@ 
 
         );
         $datatypes = array(
-            '%s',// EVT_ID
-            '%d',// EVT_display_desc
-            '%d',// EVT_display_ticket_selector
-            '%s',// EVT_visible_on
-            '%d',// EVT_additional_limit
-            '%s',// EVT_default_registration_status
-            '%d',// EVT_member_only
-            '%s',// EVT_phone
-            '%d',// EVT_allow_overflow
-            '%s',// EVT_timezone_string
-            '%s',// EVT_external_URL
-            '%d',// EVT_donations
+            '%s', // EVT_ID
+            '%d', // EVT_display_desc
+            '%d', // EVT_display_ticket_selector
+            '%s', // EVT_visible_on
+            '%d', // EVT_additional_limit
+            '%s', // EVT_default_registration_status
+            '%d', // EVT_member_only
+            '%s', // EVT_phone
+            '%d', // EVT_allow_overflow
+            '%s', // EVT_timezone_string
+            '%s', // EVT_external_URL
+            '%d', // EVT_donations
         );
         $success = $wpdb->insert(
             $this->_new_meta_table,
             $cols_n_values,
             $datatypes
         );
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $cols_n_values, $datatypes));
             return 0;
         }
@@ -510,7 +510,7 @@ 
             $new_id = $this->_insert_venue_into_posts($old_event);
             if ($new_id) {
                 $this->_insert_venue_into_meta_table($new_id, $old_event);
-                $guid = isset($old_event['venue_image']) ? $old_event['venue_image']  : null;
+                $guid = isset($old_event['venue_image']) ? $old_event['venue_image'] : null;
                 $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id, $this);
             }
             // we don't bother recording the conversion from old events to venues as that
@@ -536,10 +536,10 @@ 
             'VNU_city' => $old_event['city'],
             'VNU_zip' => $old_event['zip'],
             'post_title' => $this->_get_venue_title_for_event($old_event),
-            'VNU_phone' => $old_event['venue_phone'],// VNU_phone
-            'VNU_url' => $old_event['venue_url'],// VNU_url
-            'VNU_virtual_phone' => $old_event['virtual_phone'],// VNU_virtual_phone
-            'VNU_virtual_url' => $old_event['virtual_url'],// VNU_virtual_url
+            'VNU_phone' => $old_event['venue_phone'], // VNU_phone
+            'VNU_url' => $old_event['venue_url'], // VNU_url
+            'VNU_virtual_phone' => $old_event['virtual_phone'], // VNU_virtual_phone
+            'VNU_virtual_url' => $old_event['virtual_url'], // VNU_virtual_url
         );
         $sql_conditions = array();
         foreach ($conditions as $column => $value) {
@@ -549,7 +549,7 @@ 
 					FROM
 		{$wpdb->posts} as p INNER JOIN
 		{$wpdb->prefix}esp_venue_meta as v ON p.ID = v.VNU_ID
-			WHERE " . implode(" AND ", $sql_conditions) . " LIMIT 1";
+			WHERE ".implode(" AND ", $sql_conditions)." LIMIT 1";
         $id = $wpdb->get_var($query);
         return $id;
     }
@@ -574,39 +574,39 @@ 
     {
         global $wpdb;
         $insertion_array = array(
-                    'post_title' => $this->_get_venue_title_for_event($old_event),// VNU_name
-                    'post_content' => '',// VNU_desc
-                    'post_name' => $this->_find_unique_slug($old_event['venue_title'], sanitize_title('venue-of-' . $old_event['event_name'])),// VNU_identifier
-                    'post_date' => current_time('mysql'),// VNU_created
+                    'post_title' => $this->_get_venue_title_for_event($old_event), // VNU_name
+                    'post_content' => '', // VNU_desc
+                    'post_name' => $this->_find_unique_slug($old_event['venue_title'], sanitize_title('venue-of-'.$old_event['event_name'])), // VNU_identifier
+                    'post_date' => current_time('mysql'), // VNU_created
                     'post_date_gmt' => get_gmt_from_date(current_time('mysql')),
-                    'post_excerpt' => '',// VNU_short_desc arbitrary only 50 characters
-                    'post_modified' => current_time('mysql'),// VNU_modified
+                    'post_excerpt' => '', // VNU_short_desc arbitrary only 50 characters
+                    'post_modified' => current_time('mysql'), // VNU_modified
                     'post_modified_gmt' => get_gmt_from_date(current_time('mysql')),
-                    'post_author' => $old_event['wp_user'],// VNU_wp_user
-                    'post_parent' => 0,// parent
-                    'menu_order' => 0,// VNU_order
+                    'post_author' => $old_event['wp_user'], // VNU_wp_user
+                    'post_parent' => 0, // parent
+                    'menu_order' => 0, // VNU_order
                     'post_type' => 'espresso_venues'// post_type
                 );
         $datatypes_array = array(
-                    '%s',// VNU_name
-                    '%s',// VNU_desc
-                    '%s',// VNU_identifier
-                    '%s',// VNU_created
+                    '%s', // VNU_name
+                    '%s', // VNU_desc
+                    '%s', // VNU_identifier
+                    '%s', // VNU_created
                     '%s',
-                    '%s',// VNU_short_desc
-                    '%s',// VNU_modified
+                    '%s', // VNU_short_desc
+                    '%s', // VNU_modified
                     '%s',
-                    '%d',// VNU_wp_user
-                    '%d',// parent
-                    '%d',// VNU_order
-                    '%s',// post_type
+                    '%d', // VNU_wp_user
+                    '%d', // parent
+                    '%d', // VNU_order
+                    '%s', // post_type
                 );
         $success = $wpdb->insert(
             $wpdb->posts,
             $insertion_array,
             $datatypes_array
         );
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -634,13 +634,13 @@ 
         // assume the country is the same as the organization's old settings
         $country_iso = $this->get_migration_script()->get_default_country_iso();
         // find the state from the venue, or the organization, or just guess california
-        if (! $old_event['state']) {
+        if ( ! $old_event['state']) {
             $old_org_options = get_option('events_organization_settings');
             $state_name = stripslashes($old_org_options['organization_state']);
         } else {
             $state_name = $old_event['state'];
         }
-        if (! $state_name) {
+        if ( ! $state_name) {
             $state_name = 'CA';
         }
         // get a state ID with the same name, if possible
@@ -653,39 +653,39 @@ 
         }
         // now insert into meta table
         $insertion_array = array(
-            'VNU_ID' => $cpt_id,// VNU_ID_fk
-            'VNU_address' => stripslashes($old_event['address']),// VNU_address
-            'VNU_address2' => stripslashes($old_event['address2']),// VNU_address2
-            'VNU_city' => stripslashes($old_event['city']),// VNU_city
-            'STA_ID' => $state_id,// STA_ID
-            'CNT_ISO' => $country_iso,// CNT_ISO
-            'VNU_zip' => $old_event['zip'],// VNU_zip
-            'VNU_phone' => $old_event['venue_phone'],// VNU_phone
-            'VNU_capacity' => -1,// VNU_capacity
-            'VNU_url' => $old_event['venue_url'],// VNU_url
-            'VNU_virtual_phone' => $old_event['virtual_phone'],// VNU_virtual_phone
-            'VNU_virtual_url' => $old_event['virtual_url'],// VNU_virtual_url
-            'VNU_google_map_link' => '',// VNU_google_map_link
+            'VNU_ID' => $cpt_id, // VNU_ID_fk
+            'VNU_address' => stripslashes($old_event['address']), // VNU_address
+            'VNU_address2' => stripslashes($old_event['address2']), // VNU_address2
+            'VNU_city' => stripslashes($old_event['city']), // VNU_city
+            'STA_ID' => $state_id, // STA_ID
+            'CNT_ISO' => $country_iso, // CNT_ISO
+            'VNU_zip' => $old_event['zip'], // VNU_zip
+            'VNU_phone' => $old_event['venue_phone'], // VNU_phone
+            'VNU_capacity' => -1, // VNU_capacity
+            'VNU_url' => $old_event['venue_url'], // VNU_url
+            'VNU_virtual_phone' => $old_event['virtual_phone'], // VNU_virtual_phone
+            'VNU_virtual_url' => $old_event['virtual_url'], // VNU_virtual_url
+            'VNU_google_map_link' => '', // VNU_google_map_link
             'VNU_enable_for_gmap' => true // VNU_enable_for_gmap
         );
         $datatypes = array(
-            '%d',// VNU_ID_fk
-            '%s',// VNU_address
-            '%s',// VNU_address2
-            '%s',// VNU_city
-            '%d',// STA_ID
-            '%s',// CNT_ISO
-            '%s',// VNU_zip
-            '%s',// VNU_phone
-            '%d',// VNU_capacity
-            '%s',// VNU_url
-            '%s',// VNU_virtual_phone
-            '%s',// VNU_virtual_url
-            '%s',// VNU_google_map_link
-            '%d',// VNU_enable_for_gmap
+            '%d', // VNU_ID_fk
+            '%s', // VNU_address
+            '%s', // VNU_address2
+            '%s', // VNU_city
+            '%d', // STA_ID
+            '%s', // CNT_ISO
+            '%s', // VNU_zip
+            '%s', // VNU_phone
+            '%d', // VNU_capacity
+            '%s', // VNU_url
+            '%s', // VNU_virtual_phone
+            '%s', // VNU_virtual_url
+            '%s', // VNU_google_map_link
+            '%d', // VNU_enable_for_gmap
         );
-        $success = $wpdb->insert($wpdb->prefix . "esp_venue_meta", $insertion_array, $datatypes);
-        if (! $success) {
+        $success = $wpdb->insert($wpdb->prefix."esp_venue_meta", $insertion_array, $datatypes);
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $insertion_array, $datatypes));
             return 0;
         }
@@ -702,11 +702,11 @@ 
     private function _insert_new_venue_to_event($new_event_id, $new_venue_id)
     {
         global $wpdb;
-        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"), $new_event_id));
             return 0;
         }
-        if (! $new_venue_id) {
+        if ( ! $new_venue_id) {
             $this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $new_venue_id));
             return 0;
         }
@@ -716,12 +716,12 @@ 
             'EVV_primary' => true
         );
         $datatypes = array(
-            '%d',// EVT_ID
-            '%d',// VNU_ID
-            '%d',// EVT_primary
+            '%d', // EVT_ID
+            '%d', // VNU_ID
+            '%d', // EVT_primary
         );
-        $success = $wpdb->insert($wpdb->prefix . "esp_event_venue", $cols_n_values, $datatypes);
-        if (! $success) {
+        $success = $wpdb->insert($wpdb->prefix."esp_event_venue", $cols_n_values, $datatypes);
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -781,29 +781,29 @@ 
         $start_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$start_date $start_time:00", $old_event_row['timezone_string']);
         $end_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$end_date $end_time:00", $old_event_row['timezone_string']);
         $cols_n_values = array(
-            'EVT_ID' => $new_cpt_id,// EVT_ID
-            'DTT_EVT_start' => $start_datetime_utc,// DTT_EVT_start
-            'DTT_EVT_end' => $end_datetime_utc,// DTT_EVT_end
-            'DTT_reg_limit' => intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit'] : $old_event_row['reg_limit'],// DTT_reg_limit
-            'DTT_sold' => 0,// note: we will increment this as registrations are added during the migration
+            'EVT_ID' => $new_cpt_id, // EVT_ID
+            'DTT_EVT_start' => $start_datetime_utc, // DTT_EVT_start
+            'DTT_EVT_end' => $end_datetime_utc, // DTT_EVT_end
+            'DTT_reg_limit' => intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit'] : $old_event_row['reg_limit'], // DTT_reg_limit
+            'DTT_sold' => 0, // note: we will increment this as registrations are added during the migration
 //          'DTT_is_primary'=> 0 == $existing_datetimes ,//DTT_is_primary... if count==0, then we'll call it the 'primary'
-            'DTT_order' => $existing_datetimes,// DTT_order, just give it the same order as the count of how many datetimes already exist
+            'DTT_order' => $existing_datetimes, // DTT_order, just give it the same order as the count of how many datetimes already exist
             'DTT_parent' => 0,
             'DTT_deleted' => false
         );
         $datatypes = array(
-            '%d',// EVT_Id
-            '%s',// DTT_EVT_start
-            '%s',// DTT_EVT_end
-            '%d',// DTT_reg_limit
-            '%d',// DTT_sold
+            '%d', // EVT_Id
+            '%s', // DTT_EVT_start
+            '%s', // DTT_EVT_end
+            '%d', // DTT_reg_limit
+            '%d', // DTT_sold
 //          '%d',//DTT_is_primary
-            '%d',// DTT_order
-            '%d',// DTT_parent
-            '%d',// DTT_deleted
+            '%d', // DTT_order
+            '%d', // DTT_parent
+            '%d', // DTT_deleted
         );
         $success = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_start_end_table, array_merge($old_event_row, $start_end_time_row), $this->_new_datetime_table, $cols_n_values, $datatypes));
             return 0;
         }

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

Doc Comments -1 removed lines

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

Indentation +270 added lines, -270 removed lines

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

Spacing +31 added lines, -31 removed lines

@@ -110,8 +110,8 @@ 
         $old_org_options = get_option('events_organization_settings');
         foreach ($this->_org_options_we_know_how_to_migrate as $option_name) {
             // only bother migrating if there's a setting to migrate. Otherwise we'll just use the default
-            if (isset($old_org_options[ $option_name ])) {
-                $this->_handle_org_option($option_name, $old_org_options[ $option_name ]);
+            if (isset($old_org_options[$option_name])) {
+                $this->_handle_org_option($option_name, $old_org_options[$option_name]);
             }
             if ($option_name == 'surcharge') {
                 $this->_insert_new_global_surcharge_price($old_org_options);
@@ -120,7 +120,7 @@ 
         }
 
         $success = EE_Config::instance()->update_espresso_config(false, true);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(sprintf(__('Could not save EE Config during org options stage. Reason: %s', 'event_espresso'), EE_Error::get_notices(false)));
             EE_Error::overwrite_errors();
         }
@@ -176,24 +176,24 @@ 
                 $c->organization->email = $value;
                 break;
             case 'default_payment_status':
-                $c->registration->default_STS_ID =  $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value);
+                $c->registration->default_STS_ID = $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID($value);
                 break;
             case 'organization_country':
                 $iso = $this->get_migration_script()->get_iso_from_3_1_country_id($value);
                 $c->organization->CNT_ISO = $iso;
                 $country_row = $this->get_migration_script()->get_or_create_country($iso);
-                if (! $country_row) {
+                if ( ! $country_row) {
                     $this->add_error(sprintf(__("Could not set country's currency config because no country exists for ISO %s", "event_espresso"), $iso));
                 }
                 // can't use EE_Currency_Config's handy constructor because the models are off-limits right now (and it uses them)
-                $c->currency->code = $country_row['CNT_cur_code'];          // currency code: USD, CAD, EUR
-                $c->currency->name = $country_row['CNT_cur_single'];    // Dollar
-                $c->currency->plural = $country_row['CNT_cur_plural'];  // Dollars
-                $c->currency->sign =  $country_row['CNT_cur_sign'];             // currency sign: $
-                $c->currency->sign_b4 = filter_var($country_row['CNT_cur_sign_b4'], FILTER_VALIDATE_BOOLEAN);        // currency sign before or after: $TRUE  or  FALSE$
-                $c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc'];    // decimal places: 2 = 0.00  3 = 0.000
-                $c->currency->dec_mrk = $country_row['CNT_cur_dec_mrk'];    // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
-                $c->currency->thsnds = $country_row['CNT_cur_thsnds'];  // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
+                $c->currency->code = $country_row['CNT_cur_code']; // currency code: USD, CAD, EUR
+                $c->currency->name = $country_row['CNT_cur_single']; // Dollar
+                $c->currency->plural = $country_row['CNT_cur_plural']; // Dollars
+                $c->currency->sign = $country_row['CNT_cur_sign']; // currency sign: $
+                $c->currency->sign_b4 = filter_var($country_row['CNT_cur_sign_b4'], FILTER_VALIDATE_BOOLEAN); // currency sign before or after: $TRUE  or  FALSE$
+                $c->currency->dec_plc = (int) $country_row['CNT_cur_dec_plc']; // decimal places: 2 = 0.00  3 = 0.000
+                $c->currency->dec_mrk = $country_row['CNT_cur_dec_mrk']; // decimal mark: (comma) ',' = 0,01   or (decimal) '.' = 0.01
+                $c->currency->thsnds = $country_row['CNT_cur_thsnds']; // thousands separator: (comma) ',' = 1,000   or (decimal) '.' = 1.000
   //            $c->currency = new EE_Currency_Config($c->organization->CNT_ISO);break;
   //        case 'currency_symbol': ignore the currency symbol. we'll just go by their country.
   //            $c->currency->sign = $value;break;
@@ -298,18 +298,18 @@ 
 
         );
         $datatypes = array(
-            '%d',// PRT_ID
-            '%f',// PRT_amount
-            '%s',// PRC_name
-            '%d',// PRC_is_default
-            '%d',// PRC_overrides
-            '%d',// PRC_order
-            '%d',// PRC_deleted
-            '%d',// PRC_parent
+            '%d', // PRT_ID
+            '%f', // PRT_amount
+            '%s', // PRC_name
+            '%d', // PRC_is_default
+            '%d', // PRC_overrides
+            '%d', // PRC_order
+            '%d', // PRC_deleted
+            '%d', // PRC_parent
         );
-        $price_table = $wpdb->prefix . "esp_price";
+        $price_table = $wpdb->prefix."esp_price";
         $success = $wpdb->insert($price_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion(
                 'org_options',
                 array(
@@ -339,8 +339,8 @@ 
       'payment_message',
       'message',
       'default_payment_status',
-      'surcharge',// unused?
-      'country_id',// unused?
+      'surcharge', // unused?
+      'country_id', // unused?
       'organization_country',
 //    'currency_symbol',
       'expire_on_registration_end',
@@ -352,13 +352,13 @@ 
       'show_pending_payment_options',
       'show_reg_footer',
       'skip_confirmation_page',
-      'allow_mer_discounts',// no equiv
-      'allow_mer_vouchers',// no equiv
+      'allow_mer_discounts', // no equiv
+      'allow_mer_vouchers', // no equiv
       'display_short_description_in_event_list',
       'display_description_on_multi_reg_page',
       'display_address_in_event_list',
       'display_address_in_regform',
-      'use_custom_post_types',// no equiv
+      'use_custom_post_types', // no equiv
       'display_ical_download',
       'display_featured_image',
       'themeroller',
@@ -377,11 +377,11 @@ 
       'espresso_dashboard_widget',
       'time_reg_limit',
 //    'use_attendee_pre_approval', removed in 4.1- instead this is factored into the default reg status
-      'use_personnel_manager',// no equiv
+      'use_personnel_manager', // no equiv
       'use_event_timezones',
       'full_logging',
-      'surcharge_type',// unused
-      'surcharge_text',// unused
+      'surcharge_type', // unused
+      'surcharge_text', // unused
       'affiliate_id',
       'site_license_key',
     );

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

Doc Comments +3 added lines, -4 removed lines

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

Indentation +292 added lines, -292 removed lines

@@ -87,57 +87,57 @@ 
  */
 class EE_DMS_4_1_0_prices extends EE_Data_Migration_Script_Stage_Table
 {
-    private $_new_price_table;
-    private $_new_ticket_table;
-    private $_new_ticket_price_table;
-    private $_new_datetime_ticket_table;
-    /**
-     * A count of all the different tickets created, used for setting the new ones' TKT_Order
-     * @var int
-     */
-    private $_ticket_count = 0;
-    const price_type_base = 1;
-    const price_type_member_discount = 3;
-    const price_type_percent_surcharge = 4;
-    const price_type_flat_surcharge = 5;
+	private $_new_price_table;
+	private $_new_ticket_table;
+	private $_new_ticket_price_table;
+	private $_new_datetime_ticket_table;
+	/**
+	 * A count of all the different tickets created, used for setting the new ones' TKT_Order
+	 * @var int
+	 */
+	private $_ticket_count = 0;
+	const price_type_base = 1;
+	const price_type_member_discount = 3;
+	const price_type_percent_surcharge = 4;
+	const price_type_flat_surcharge = 5;
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __("Prices", "event_espresso");
-        $this->_old_table = $wpdb->prefix . "events_prices";
-        $this->select_expression = 'p.*, e.event_status';
-        $this->_extra_where_sql = ' AS p 
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __("Prices", "event_espresso");
+		$this->_old_table = $wpdb->prefix . "events_prices";
+		$this->select_expression = 'p.*, e.event_status';
+		$this->_extra_where_sql = ' AS p 
             INNER JOIN ' . $wpdb->prefix . 'events_detail AS e ON p.event_id=e.id
             WHERE e.event_status!="D"';
-        $this->_new_price_table = $wpdb->prefix . "esp_price";
-        $this->_new_ticket_table = $wpdb->prefix . "esp_ticket";
-        $this->_new_ticket_price_table = $wpdb->prefix . "esp_ticket_price";
-        $this->_new_datetime_ticket_table = $wpdb->prefix . "esp_datetime_ticket";
-        parent::__construct();
-    }
-    protected function _migrate_old_row($old_row)
-    {
-        // create the base price
-        $new_price_id = $this->_insert_new_price($old_row);
-        // create the member discount if there is any
-        // commented-out because we may actually NOT be supporting this in 4.1
+		$this->_new_price_table = $wpdb->prefix . "esp_price";
+		$this->_new_ticket_table = $wpdb->prefix . "esp_ticket";
+		$this->_new_ticket_price_table = $wpdb->prefix . "esp_ticket_price";
+		$this->_new_datetime_ticket_table = $wpdb->prefix . "esp_datetime_ticket";
+		parent::__construct();
+	}
+	protected function _migrate_old_row($old_row)
+	{
+		// create the base price
+		$new_price_id = $this->_insert_new_price($old_row);
+		// create the member discount if there is any
+		// commented-out because we may actually NOT be supporting this in 4.1
 //      if($old_row['event_cost'] != $old_row['member_price']){
 //          $member_price_discount_id = $this->_insert_new_member_price($old_row);
 //      }else{
 //          $member_price_discount_id = 0;
 //      }
-        // create the surcharge if there is any
-        if (floatval($old_row['surcharge']) >= 0.01) {
-            $surcharge_price_id = $this->_insert_new_surcharge_price($old_row);
-            $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id,$surcharge_price_id));
-        } else {
-            $surcharge_price_id = 0;
-            $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id));
-        }
-        // associate the ticket to all datetimes for event (ie, this ONE ticket grants access to ALL datetimes, not just one of the attendee's choice.
-        // if the latter were the case, then we'd create a separate ticket for each datetime and ahve their association be one-to-one)
-        // create ticket
+		// create the surcharge if there is any
+		if (floatval($old_row['surcharge']) >= 0.01) {
+			$surcharge_price_id = $this->_insert_new_surcharge_price($old_row);
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id,$surcharge_price_id));
+		} else {
+			$surcharge_price_id = 0;
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id));
+		}
+		// associate the ticket to all datetimes for event (ie, this ONE ticket grants access to ALL datetimes, not just one of the attendee's choice.
+		// if the latter were the case, then we'd create a separate ticket for each datetime and ahve their association be one-to-one)
+		// create ticket
 //      $ticket_id = $this->_insert_new_ticket($old_row);
 //      if($ticket_id){
 //          $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_ticket_table, $ticket_id);
@@ -149,62 +149,62 @@ 
 //              $this->_insert_datetime_ticket_relation($new_datetime_id, $ticket_id);
 //          }
 //      }
-        // create a ticket for each old price -old datetime combo
-        $tickets_for_old_price = array();
-        foreach ($this->_get_datetime_ids_for_old_event_id($old_row['event_id']) as $new_datetime_id) {
-            $ticket_id = $this->_insert_new_ticket($old_row);
-            $tickets_for_old_price[] = $ticket_id;
-            // associate to old prices
-            $this->_insert_ticket_price_relation($ticket_id, $new_price_id);
-            $this->_insert_ticket_price_relation($ticket_id, $surcharge_price_id);
-            $this->_insert_datetime_ticket_relation($new_datetime_id, $ticket_id);
-        }
-        $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_ticket_table, $tickets_for_old_price);
-    }
-    /**
-     * Creates a 4.1 price base type
-     * @global type $wpdb
-     * @param type $old_price
-     * @return int
-     */
-    private function _insert_new_price($old_price)
-    {
-        global $wpdb;
-        $cols_n_values = array(
-            'PRT_ID' => self::price_type_base,
-            'PRC_amount' => floatval($old_price['event_cost']),
-            'PRC_name' => $old_price['price_type'],
-            'PRC_is_default' => false,
-            'PRC_overrides' => false,
-            'PRC_order' => 0,
-            'PRC_deleted' => false,
-            'PRC_parent' => null
+		// create a ticket for each old price -old datetime combo
+		$tickets_for_old_price = array();
+		foreach ($this->_get_datetime_ids_for_old_event_id($old_row['event_id']) as $new_datetime_id) {
+			$ticket_id = $this->_insert_new_ticket($old_row);
+			$tickets_for_old_price[] = $ticket_id;
+			// associate to old prices
+			$this->_insert_ticket_price_relation($ticket_id, $new_price_id);
+			$this->_insert_ticket_price_relation($ticket_id, $surcharge_price_id);
+			$this->_insert_datetime_ticket_relation($new_datetime_id, $ticket_id);
+		}
+		$this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_ticket_table, $tickets_for_old_price);
+	}
+	/**
+	 * Creates a 4.1 price base type
+	 * @global type $wpdb
+	 * @param type $old_price
+	 * @return int
+	 */
+	private function _insert_new_price($old_price)
+	{
+		global $wpdb;
+		$cols_n_values = array(
+			'PRT_ID' => self::price_type_base,
+			'PRC_amount' => floatval($old_price['event_cost']),
+			'PRC_name' => $old_price['price_type'],
+			'PRC_is_default' => false,
+			'PRC_overrides' => false,
+			'PRC_order' => 0,
+			'PRC_deleted' => false,
+			'PRC_parent' => null
 
-        );
-        $datatypes = array(
-            '%d',// PRT_ID
-            '%f',// PRT_amount
-            '%s',// PRC_name
-            '%d',// PRC_is_default
-            '%d',// PRC_overrides
-            '%d',// PRC_order
-            '%d',// PRC_deleted
-            '%d',// PRC_parent
-        );
-        $success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
-    /**
-     * Creates a 4.1 member price discount
-     * @global type $wpdb
-     * @param type $old_price
-     * @return int
-     */
+		);
+		$datatypes = array(
+			'%d',// PRT_ID
+			'%f',// PRT_amount
+			'%s',// PRC_name
+			'%d',// PRC_is_default
+			'%d',// PRC_overrides
+			'%d',// PRC_order
+			'%d',// PRC_deleted
+			'%d',// PRC_parent
+		);
+		$success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
+	/**
+	 * Creates a 4.1 member price discount
+	 * @global type $wpdb
+	 * @param type $old_price
+	 * @return int
+	 */
 //  private function _insert_new_member_price($old_price){
 //      $discount_amount = floatval($old_price['event_cost']) - floatval($old_price['member_price']);
 //      global $wpdb;
@@ -237,207 +237,207 @@ 
 //      $new_id = $wpdb->insert_id;
 //      return $new_id;
 //  }
-    /**
-     * Creates a 4.1 member price discount
-     * @global type $wpdb
-     * @param type $old_price
-     * @return int
-     */
-    private function _insert_new_surcharge_price($old_price)
-    {
+	/**
+	 * Creates a 4.1 member price discount
+	 * @global type $wpdb
+	 * @param type $old_price
+	 * @return int
+	 */
+	private function _insert_new_surcharge_price($old_price)
+	{
 
-        if ($old_price['surcharge_type'] == 'flat_rate') {
-            $price_type = self::price_type_flat_surcharge;
-        } else {
-            $price_type = self::price_type_percent_surcharge;
-        }
-        global $wpdb;
-        $cols_n_values = array(
-            'PRT_ID' => $price_type,
-            'PRC_amount' => floatval($old_price['surcharge']),
-            'PRC_name' =>  __("Surcharge", "event_espresso"),
-            'PRC_is_default' => false,
-            'PRC_overrides' => false,
-            'PRC_order' => 20,
-            'PRC_deleted' => false,
-            'PRC_parent' => null
+		if ($old_price['surcharge_type'] == 'flat_rate') {
+			$price_type = self::price_type_flat_surcharge;
+		} else {
+			$price_type = self::price_type_percent_surcharge;
+		}
+		global $wpdb;
+		$cols_n_values = array(
+			'PRT_ID' => $price_type,
+			'PRC_amount' => floatval($old_price['surcharge']),
+			'PRC_name' =>  __("Surcharge", "event_espresso"),
+			'PRC_is_default' => false,
+			'PRC_overrides' => false,
+			'PRC_order' => 20,
+			'PRC_deleted' => false,
+			'PRC_parent' => null
 
-        );
-        $datatypes = array(
-            '%d',// PRT_ID
-            '%f',// PRT_amount
-            '%s',// PRC_name
-            '%d',// PRC_is_default
-            '%d',// PRC_overrides
-            '%d',// PRC_order
-            '%d',// PRC_deleted
-            '%d',// PRC_parent
-        );
-        $success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
-    /**
-     * Inserts a 4.1 ticket based off the 3.1 price, and the price IDs we've already made from the 3.1 price
-     * @param $old_price_row array where keys are columns
-     * @param $new_base_price_id int
-     * @param $new_member_discount_id int
-     * @param $new_surcharge_id int
-     * @return int new ticket id
-     */
-    private function _insert_new_ticket($old_price_row)
-    {
-        global $wpdb;
-        $event_row = $this->_get_event_row($old_price_row['event_id']);
-        if ($old_price_row['surcharge_type'] == 'flat_rate') {
-            $final_ticket_price = floatval($old_price_row['event_cost']) + floatval($old_price_row['surcharge']);
-        } else {// percent surcharge
-            $final_ticket_price = floatval($old_price_row['event_cost']) * (1 + floatval($old_price_row['surcharge']) / 100);
-        }
-        $start_date = $event_row['registration_start'] . " " . $this->get_migration_script()->convertTimeFromAMPM($event_row['registration_startT']);
-        $start_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $start_date, $event_row['timezone_string']);
-        $end_date = $event_row['registration_end'] . " " . $this->get_migration_script()->convertTimeFromAMPM($event_row['registration_endT']);
-        $end_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $end_date, $event_row['timezone_string']);
-        $cols_n_values = array(
-            'TTM_ID' => 0,
-            'TKT_name' => $old_price_row['price_type'],
-            'TKT_description' => '',
-            'TKT_start_date' => $start_date_utc,
-            'TKT_end_date' => $end_date_utc,
-            'TKT_min' => 0,
-            'TKT_max' => -1,
-            'TKT_price' => $final_ticket_price,
-            'TKT_sold' => 0,// note: this will get calculated as we actually add registrations during the migration
-            'TKT_qty' => -1,
-            'TKT_uses' => 1,
-            'TKT_taxable' => false,// so by default, old prices are NOT taxable. This way they don't suddenly have a sudden spike in prices
-            'TKT_is_default' => false,
-            'TKT_order' => $this->_get_ticket_count(),
-            'TKT_row' => 0,// doesn't matter because UI reset this on first save anyways
-            'TKT_deleted' => false,
-            'TKT_parent' => 0
+		);
+		$datatypes = array(
+			'%d',// PRT_ID
+			'%f',// PRT_amount
+			'%s',// PRC_name
+			'%d',// PRC_is_default
+			'%d',// PRC_overrides
+			'%d',// PRC_order
+			'%d',// PRC_deleted
+			'%d',// PRC_parent
+		);
+		$success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
+	/**
+	 * Inserts a 4.1 ticket based off the 3.1 price, and the price IDs we've already made from the 3.1 price
+	 * @param $old_price_row array where keys are columns
+	 * @param $new_base_price_id int
+	 * @param $new_member_discount_id int
+	 * @param $new_surcharge_id int
+	 * @return int new ticket id
+	 */
+	private function _insert_new_ticket($old_price_row)
+	{
+		global $wpdb;
+		$event_row = $this->_get_event_row($old_price_row['event_id']);
+		if ($old_price_row['surcharge_type'] == 'flat_rate') {
+			$final_ticket_price = floatval($old_price_row['event_cost']) + floatval($old_price_row['surcharge']);
+		} else {// percent surcharge
+			$final_ticket_price = floatval($old_price_row['event_cost']) * (1 + floatval($old_price_row['surcharge']) / 100);
+		}
+		$start_date = $event_row['registration_start'] . " " . $this->get_migration_script()->convertTimeFromAMPM($event_row['registration_startT']);
+		$start_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $start_date, $event_row['timezone_string']);
+		$end_date = $event_row['registration_end'] . " " . $this->get_migration_script()->convertTimeFromAMPM($event_row['registration_endT']);
+		$end_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $end_date, $event_row['timezone_string']);
+		$cols_n_values = array(
+			'TTM_ID' => 0,
+			'TKT_name' => $old_price_row['price_type'],
+			'TKT_description' => '',
+			'TKT_start_date' => $start_date_utc,
+			'TKT_end_date' => $end_date_utc,
+			'TKT_min' => 0,
+			'TKT_max' => -1,
+			'TKT_price' => $final_ticket_price,
+			'TKT_sold' => 0,// note: this will get calculated as we actually add registrations during the migration
+			'TKT_qty' => -1,
+			'TKT_uses' => 1,
+			'TKT_taxable' => false,// so by default, old prices are NOT taxable. This way they don't suddenly have a sudden spike in prices
+			'TKT_is_default' => false,
+			'TKT_order' => $this->_get_ticket_count(),
+			'TKT_row' => 0,// doesn't matter because UI reset this on first save anyways
+			'TKT_deleted' => false,
+			'TKT_parent' => 0
 
-        );
-        $datatypes = array(
-            '%d',// TTM_ID
-            '%s',// TKT_name
-            '%s',// TKT_description
-            '%s',// TKT_start_date
-            '%s',// TKT_end_date
-            '%d',// TKT_min
-            '%d',// TKT_max
-            '%f',// TKT_price
-            '%d',// TKT_sold
-            '%d',// TKT_qty
-            '%d',// TKT_uses
-            '%d',// TKT_taxable
-            '%d',// TKT_is_default
-            '%d',// TKT_order
-            '%d',// TKT_row
-            '%d',// TKT_deleted
-            '%d',// TKT_parent
-        );
-        $success = $wpdb->insert($this->_new_ticket_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price_row, $this->_new_ticket_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
+		);
+		$datatypes = array(
+			'%d',// TTM_ID
+			'%s',// TKT_name
+			'%s',// TKT_description
+			'%s',// TKT_start_date
+			'%s',// TKT_end_date
+			'%d',// TKT_min
+			'%d',// TKT_max
+			'%f',// TKT_price
+			'%d',// TKT_sold
+			'%d',// TKT_qty
+			'%d',// TKT_uses
+			'%d',// TKT_taxable
+			'%d',// TKT_is_default
+			'%d',// TKT_order
+			'%d',// TKT_row
+			'%d',// TKT_deleted
+			'%d',// TKT_parent
+		);
+		$success = $wpdb->insert($this->_new_ticket_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price_row, $this->_new_ticket_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
 
-    /**
-     * Adds a join between a ticket and a price
-     * @global type $wpdb
-     * @param type $new_ticket_id
-     * @param type $new_price_id
-     * @return int
-     */
-    private function _insert_ticket_price_relation($new_ticket_id, $new_price_id)
-    {
-        global $wpdb;
-        $cols_n_values = array(
-            'TKT_ID' => $new_ticket_id,
-            'PRC_ID' => $new_price_id,
-        );
-        $datatypes = array(
-            '%d',// TKT_ID
-            '%d',// PRC_ID
-        );
-        $success = $wpdb->insert($this->_new_ticket_price_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id' => $new_ticket_id,'price id' => $new_price_id), $this->_new_ticket_price_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
+	/**
+	 * Adds a join between a ticket and a price
+	 * @global type $wpdb
+	 * @param type $new_ticket_id
+	 * @param type $new_price_id
+	 * @return int
+	 */
+	private function _insert_ticket_price_relation($new_ticket_id, $new_price_id)
+	{
+		global $wpdb;
+		$cols_n_values = array(
+			'TKT_ID' => $new_ticket_id,
+			'PRC_ID' => $new_price_id,
+		);
+		$datatypes = array(
+			'%d',// TKT_ID
+			'%d',// PRC_ID
+		);
+		$success = $wpdb->insert($this->_new_ticket_price_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id' => $new_ticket_id,'price id' => $new_price_id), $this->_new_ticket_price_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
 
-    /**
-     * Adds a join between a ticket and a datetime
-     * @global type $wpdb
-     * @param type $new_ticket_id
-     * @param type $new_price_id
-     * @return int
-     */
-    private function _insert_datetime_ticket_relation($new_datetime_id, $new_ticket_id)
-    {
-        global $wpdb;
-        $cols_n_values = array(
-            'TKT_ID' => $new_ticket_id,
-            'DTT_ID' => $new_datetime_id,
-        );
-        $datatypes = array(
-            '%d',// TKT_ID
-            '%d',// DTT_ID
-        );
-        $success = $wpdb->insert($this->_new_datetime_ticket_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id' => $new_ticket_id,'datetime id' => $new_datetime_id), $this->_new_datetime_ticket_table, $cols_n_values, $datatypes));
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        return $new_id;
-    }
+	/**
+	 * Adds a join between a ticket and a datetime
+	 * @global type $wpdb
+	 * @param type $new_ticket_id
+	 * @param type $new_price_id
+	 * @return int
+	 */
+	private function _insert_datetime_ticket_relation($new_datetime_id, $new_ticket_id)
+	{
+		global $wpdb;
+		$cols_n_values = array(
+			'TKT_ID' => $new_ticket_id,
+			'DTT_ID' => $new_datetime_id,
+		);
+		$datatypes = array(
+			'%d',// TKT_ID
+			'%d',// DTT_ID
+		);
+		$success = $wpdb->insert($this->_new_datetime_ticket_table, $cols_n_values, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id' => $new_ticket_id,'datetime id' => $new_datetime_id), $this->_new_datetime_ticket_table, $cols_n_values, $datatypes));
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		return $new_id;
+	}
 
-    /**
-     * Simply gets the 3.1 event row data
-     * @global type $wpdb
-     * @param type $event_id
-     * @return array
-     */
-    private function _get_event_row($event_id)
-    {
-        global $wpdb;
-        $old_event_table = $wpdb->prefix . "events_detail";
-        return $wpdb->get_row($wpdb->prepare("SELECT * FROM $old_event_table WHERE id=%d", $event_id), ARRAY_A);
-    }
-    /**
-     * Gets a higher ticket count than last time it was called (and is persisted between HTTP requests).
-     * Yes we COULD run a query joining events->datetimes->ticket_datetimes->tickets, but this should work fine too
-     * @return int
-     */
-    private function _get_ticket_count()
-    {
-        return $this->_ticket_count++;
-    }
+	/**
+	 * Simply gets the 3.1 event row data
+	 * @global type $wpdb
+	 * @param type $event_id
+	 * @return array
+	 */
+	private function _get_event_row($event_id)
+	{
+		global $wpdb;
+		$old_event_table = $wpdb->prefix . "events_detail";
+		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $old_event_table WHERE id=%d", $event_id), ARRAY_A);
+	}
+	/**
+	 * Gets a higher ticket count than last time it was called (and is persisted between HTTP requests).
+	 * Yes we COULD run a query joining events->datetimes->ticket_datetimes->tickets, but this should work fine too
+	 * @return int
+	 */
+	private function _get_ticket_count()
+	{
+		return $this->_ticket_count++;
+	}
 
-    /**
-     * Using the 3.1 event id, gets the 4.1 datetimes for it
-     * @param int $old_event_id
-     * @return array where values are datetime ids
-     */
-    private function _get_datetime_ids_for_old_event_id($old_event_id)
-    {
-        global $wpdb;
-        $new_cpt_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_detail", $old_event_id, $wpdb->posts);
-        $datetime_ids = $wpdb->get_col($wpdb->prepare("SELECT DTT_ID FROM {$wpdb->prefix}esp_datetime WHERE EVT_ID=%d", $new_cpt_id));
-        return $datetime_ids;
-    }
+	/**
+	 * Using the 3.1 event id, gets the 4.1 datetimes for it
+	 * @param int $old_event_id
+	 * @return array where values are datetime ids
+	 */
+	private function _get_datetime_ids_for_old_event_id($old_event_id)
+	{
+		global $wpdb;
+		$new_cpt_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_detail", $old_event_id, $wpdb->posts);
+		$datetime_ids = $wpdb->get_col($wpdb->prepare("SELECT DTT_ID FROM {$wpdb->prefix}esp_datetime WHERE EVT_ID=%d", $new_cpt_id));
+		return $datetime_ids;
+	}
 }
 // @todo: tell users that in 3.1 the limit was on registration PER event,in 4.1 it's limit PER TICKET... SO, if they sell 2 different types of tickets
 //

Spacing +58 added lines, -58 removed lines

@@ -105,15 +105,15 @@ 
     {
         global $wpdb;
         $this->_pretty_name = __("Prices", "event_espresso");
-        $this->_old_table = $wpdb->prefix . "events_prices";
+        $this->_old_table = $wpdb->prefix."events_prices";
         $this->select_expression = 'p.*, e.event_status';
         $this->_extra_where_sql = ' AS p 
-            INNER JOIN ' . $wpdb->prefix . 'events_detail AS e ON p.event_id=e.id
+            INNER JOIN ' . $wpdb->prefix.'events_detail AS e ON p.event_id=e.id
             WHERE e.event_status!="D"';
-        $this->_new_price_table = $wpdb->prefix . "esp_price";
-        $this->_new_ticket_table = $wpdb->prefix . "esp_ticket";
-        $this->_new_ticket_price_table = $wpdb->prefix . "esp_ticket_price";
-        $this->_new_datetime_ticket_table = $wpdb->prefix . "esp_datetime_ticket";
+        $this->_new_price_table = $wpdb->prefix."esp_price";
+        $this->_new_ticket_table = $wpdb->prefix."esp_ticket";
+        $this->_new_ticket_price_table = $wpdb->prefix."esp_ticket_price";
+        $this->_new_datetime_ticket_table = $wpdb->prefix."esp_datetime_ticket";
         parent::__construct();
     }
     protected function _migrate_old_row($old_row)
@@ -130,7 +130,7 @@ 
         // create the surcharge if there is any
         if (floatval($old_row['surcharge']) >= 0.01) {
             $surcharge_price_id = $this->_insert_new_surcharge_price($old_row);
-            $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id,$surcharge_price_id));
+            $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id, $surcharge_price_id));
         } else {
             $surcharge_price_id = 0;
             $this->get_migration_script()->set_mapping($this->_old_table, $old_row['id'], $this->_new_price_table, array($new_price_id));
@@ -182,17 +182,17 @@ 
 
         );
         $datatypes = array(
-            '%d',// PRT_ID
-            '%f',// PRT_amount
-            '%s',// PRC_name
-            '%d',// PRC_is_default
-            '%d',// PRC_overrides
-            '%d',// PRC_order
-            '%d',// PRC_deleted
-            '%d',// PRC_parent
+            '%d', // PRT_ID
+            '%f', // PRT_amount
+            '%s', // PRC_name
+            '%d', // PRC_is_default
+            '%d', // PRC_overrides
+            '%d', // PRC_order
+            '%d', // PRC_deleted
+            '%d', // PRC_parent
         );
         $success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
             return 0;
         }
@@ -264,17 +264,17 @@ 
 
         );
         $datatypes = array(
-            '%d',// PRT_ID
-            '%f',// PRT_amount
-            '%s',// PRC_name
-            '%d',// PRC_is_default
-            '%d',// PRC_overrides
-            '%d',// PRC_order
-            '%d',// PRC_deleted
-            '%d',// PRC_parent
+            '%d', // PRT_ID
+            '%f', // PRT_amount
+            '%s', // PRC_name
+            '%d', // PRC_is_default
+            '%d', // PRC_overrides
+            '%d', // PRC_order
+            '%d', // PRC_deleted
+            '%d', // PRC_parent
         );
         $success = $wpdb->insert($this->_new_price_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price, $this->_new_price_table, $cols_n_values, $datatypes));
             return 0;
         }
@@ -298,9 +298,9 @@ 
         } else {// percent surcharge
             $final_ticket_price = floatval($old_price_row['event_cost']) * (1 + floatval($old_price_row['surcharge']) / 100);
         }
-        $start_date = $event_row['registration_start'] . " " . $this->get_migration_script()->convertTimeFromAMPM($event_row['registration_startT']);
+        $start_date = $event_row['registration_start']." ".$this->get_migration_script()->convertTimeFromAMPM($event_row['registration_startT']);
         $start_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $start_date, $event_row['timezone_string']);
-        $end_date = $event_row['registration_end'] . " " . $this->get_migration_script()->convertTimeFromAMPM($event_row['registration_endT']);
+        $end_date = $event_row['registration_end']." ".$this->get_migration_script()->convertTimeFromAMPM($event_row['registration_endT']);
         $end_date_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $old_price_row, $end_date, $event_row['timezone_string']);
         $cols_n_values = array(
             'TTM_ID' => 0,
@@ -311,38 +311,38 @@ 
             'TKT_min' => 0,
             'TKT_max' => -1,
             'TKT_price' => $final_ticket_price,
-            'TKT_sold' => 0,// note: this will get calculated as we actually add registrations during the migration
+            'TKT_sold' => 0, // note: this will get calculated as we actually add registrations during the migration
             'TKT_qty' => -1,
             'TKT_uses' => 1,
-            'TKT_taxable' => false,// so by default, old prices are NOT taxable. This way they don't suddenly have a sudden spike in prices
+            'TKT_taxable' => false, // so by default, old prices are NOT taxable. This way they don't suddenly have a sudden spike in prices
             'TKT_is_default' => false,
             'TKT_order' => $this->_get_ticket_count(),
-            'TKT_row' => 0,// doesn't matter because UI reset this on first save anyways
+            'TKT_row' => 0, // doesn't matter because UI reset this on first save anyways
             'TKT_deleted' => false,
             'TKT_parent' => 0
 
         );
         $datatypes = array(
-            '%d',// TTM_ID
-            '%s',// TKT_name
-            '%s',// TKT_description
-            '%s',// TKT_start_date
-            '%s',// TKT_end_date
-            '%d',// TKT_min
-            '%d',// TKT_max
-            '%f',// TKT_price
-            '%d',// TKT_sold
-            '%d',// TKT_qty
-            '%d',// TKT_uses
-            '%d',// TKT_taxable
-            '%d',// TKT_is_default
-            '%d',// TKT_order
-            '%d',// TKT_row
-            '%d',// TKT_deleted
-            '%d',// TKT_parent
+            '%d', // TTM_ID
+            '%s', // TKT_name
+            '%s', // TKT_description
+            '%s', // TKT_start_date
+            '%s', // TKT_end_date
+            '%d', // TKT_min
+            '%d', // TKT_max
+            '%f', // TKT_price
+            '%d', // TKT_sold
+            '%d', // TKT_qty
+            '%d', // TKT_uses
+            '%d', // TKT_taxable
+            '%d', // TKT_is_default
+            '%d', // TKT_order
+            '%d', // TKT_row
+            '%d', // TKT_deleted
+            '%d', // TKT_parent
         );
         $success = $wpdb->insert($this->_new_ticket_table, $cols_n_values, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_price_row, $this->_new_ticket_table, $cols_n_values, $datatypes));
             return 0;
         }
@@ -365,12 +365,12 @@ 
             'PRC_ID' => $new_price_id,
         );
         $datatypes = array(
-            '%d',// TKT_ID
-            '%d',// PRC_ID
+            '%d', // TKT_ID
+            '%d', // PRC_ID
         );
         $success = $wpdb->insert($this->_new_ticket_price_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id' => $new_ticket_id,'price id' => $new_price_id), $this->_new_ticket_price_table, $cols_n_values, $datatypes));
+        if ( ! $success) {
+            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id' => $new_ticket_id, 'price id' => $new_price_id), $this->_new_ticket_price_table, $cols_n_values, $datatypes));
             return 0;
         }
         $new_id = $wpdb->insert_id;
@@ -392,12 +392,12 @@ 
             'DTT_ID' => $new_datetime_id,
         );
         $datatypes = array(
-            '%d',// TKT_ID
-            '%d',// DTT_ID
+            '%d', // TKT_ID
+            '%d', // DTT_ID
         );
         $success = $wpdb->insert($this->_new_datetime_ticket_table, $cols_n_values, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id' => $new_ticket_id,'datetime id' => $new_datetime_id), $this->_new_datetime_ticket_table, $cols_n_values, $datatypes));
+        if ( ! $success) {
+            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('ticket id' => $new_ticket_id, 'datetime id' => $new_datetime_id), $this->_new_datetime_ticket_table, $cols_n_values, $datatypes));
             return 0;
         }
         $new_id = $wpdb->insert_id;
@@ -413,7 +413,7 @@ 
     private function _get_event_row($event_id)
     {
         global $wpdb;
-        $old_event_table = $wpdb->prefix . "events_detail";
+        $old_event_table = $wpdb->prefix."events_detail";
         return $wpdb->get_row($wpdb->prepare("SELECT * FROM $old_event_table WHERE id=%d", $event_id), ARRAY_A);
     }
     /**
@@ -434,7 +434,7 @@ 
     private function _get_datetime_ids_for_old_event_id($old_event_id)
     {
         global $wpdb;
-        $new_cpt_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_detail", $old_event_id, $wpdb->posts);
+        $new_cpt_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", $old_event_id, $wpdb->posts);
         $datetime_ids = $wpdb->get_col($wpdb->prepare("SELECT DTT_ID FROM {$wpdb->prefix}esp_datetime WHERE EVT_ID=%d", $new_cpt_id));
         return $datetime_ids;
     }

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

Doc Comments +1 added lines, -1 removed lines

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

Indentation +106 added lines, -108 removed lines

@@ -12,8 +12,6 @@ 
   KEY `group_id` (`group_id`),
   KEY `question_id` (`question_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8$$
-
-
  * 4.1 question group question model's tables and fields:
  $this->_tables = array(
             'Question_Group_Question'=>new EE_Primary_Table('esp_question_group_question','QGQ_ID')
@@ -29,114 +27,114 @@ 
  */
 class EE_DMS_4_1_0_question_group_question extends EE_Data_Migration_Script_Stage
 {
-    private $_old_table;
-    private $_new_table;
-    public function _migration_step($num_items = 50)
-    {
+	private $_old_table;
+	private $_new_table;
+	public function _migration_step($num_items = 50)
+	{
 
-        global $wpdb;
-        $start_at_record = $this->count_records_migrated();
-        $rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
-        $items_actually_migrated = 0;
-        foreach ($rows as $question_group_question) {
-            $this->_insert_new_question_group_question($question_group_question);
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $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_rel";
-        $this->_new_table = $wpdb->prefix . "esp_question_group_question";
-        $this->_pretty_name = __("Question Group to Question Relations", "event_espresso");
-        parent::__construct();
-    }
+		global $wpdb;
+		$start_at_record = $this->count_records_migrated();
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
+		$items_actually_migrated = 0;
+		foreach ($rows as $question_group_question) {
+			$this->_insert_new_question_group_question($question_group_question);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$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_rel";
+		$this->_new_table = $wpdb->prefix . "esp_question_group_question";
+		$this->_pretty_name = __("Question Group to Question Relations", "event_espresso");
+		parent::__construct();
+	}
 
-    /**
-     * Attempts to insert a new question group inthe new format given an old one
-     * @global type $wpdb
-     * @param array $old_question_group_question
-     * @return int
-     */
-    private function _insert_new_question_group_question($old_question_group_question)
-    {
-        global $wpdb;
-        $new_question_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_question", $old_question_group_question['question_id'], $wpdb->prefix . "esp_question");
-        $new_question_group_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_qst_group", $old_question_group_question['group_id'], $wpdb->prefix . "esp_question_group");
-        if (! $new_question_id) {
-            $this->add_error(sprintf(__("Could not find 4.1 question id for 3.1 question #%d.", "event_espresso"), $old_question_group_question['question_id']));
-            return 0;
-        }
-        if (! $new_question_group_id) {
-            $this->add_error(sprintf(__("Could not find 4.1 question group id for 3.1 question group #%d.", "event_espresso"), $old_question_group_question['group_id']));
-            return 0;
-        }
-        // if it's a system question, it needs to be in the right system group. otherwise no dice!
-        if (
-            ($this->_is_system_question_group($new_question_group_id) == $this->_is_system_question_for_question_group($new_question_id) )
-                ||
-                ! $this->_is_system_question_for_question_group($new_question_id)
-        ) {
-            $cols_n_values = array(
-                'QSG_ID' => $new_question_group_id,
-                'QST_ID' => $new_question_id
-            );
-            $datatypes = array(
-                '%d',// QSG_ID
-                '%d',// QST_ID
-            );
-            $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-            if (! $success) {
-                $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group_question, $this->_new_table, $cols_n_values, $datatypes));
-                return 0;
-            }
-            return $wpdb->insert_id;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * Attempts to insert a new question group inthe new format given an old one
+	 * @global type $wpdb
+	 * @param array $old_question_group_question
+	 * @return int
+	 */
+	private function _insert_new_question_group_question($old_question_group_question)
+	{
+		global $wpdb;
+		$new_question_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_question", $old_question_group_question['question_id'], $wpdb->prefix . "esp_question");
+		$new_question_group_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_qst_group", $old_question_group_question['group_id'], $wpdb->prefix . "esp_question_group");
+		if (! $new_question_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 question id for 3.1 question #%d.", "event_espresso"), $old_question_group_question['question_id']));
+			return 0;
+		}
+		if (! $new_question_group_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 question group id for 3.1 question group #%d.", "event_espresso"), $old_question_group_question['group_id']));
+			return 0;
+		}
+		// if it's a system question, it needs to be in the right system group. otherwise no dice!
+		if (
+			($this->_is_system_question_group($new_question_group_id) == $this->_is_system_question_for_question_group($new_question_id) )
+				||
+				! $this->_is_system_question_for_question_group($new_question_id)
+		) {
+			$cols_n_values = array(
+				'QSG_ID' => $new_question_group_id,
+				'QST_ID' => $new_question_id
+			);
+			$datatypes = array(
+				'%d',// QSG_ID
+				'%d',// QST_ID
+			);
+			$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
+			if (! $success) {
+				$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group_question, $this->_new_table, $cols_n_values, $datatypes));
+				return 0;
+			}
+			return $wpdb->insert_id;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * If this question is a system question, returns the QSG_system number that
-     * indicates the question group its permitted in.
-     * @global type $wpdb
-     * @param type $new_question_id
-     * @return int
-     */
-    private function _is_system_question_for_question_group($new_question_id)
-    {
-        global $wpdb;
-        $system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM " . $wpdb->prefix . "esp_question WHERE QST_ID=%d", $new_question_id));
-        if (in_array($system_id, array('fname','lname','email'))) {
-            return 1;
-        } elseif ($system_id != '' && $system_id) {
-            return 2;
-        } else {
-            return 0;
-        }
-    }
+	/**
+	 * If this question is a system question, returns the QSG_system number that
+	 * indicates the question group its permitted in.
+	 * @global type $wpdb
+	 * @param type $new_question_id
+	 * @return int
+	 */
+	private function _is_system_question_for_question_group($new_question_id)
+	{
+		global $wpdb;
+		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM " . $wpdb->prefix . "esp_question WHERE QST_ID=%d", $new_question_id));
+		if (in_array($system_id, array('fname','lname','email'))) {
+			return 1;
+		} elseif ($system_id != '' && $system_id) {
+			return 2;
+		} else {
+			return 0;
+		}
+	}
 
-    /**
-     * Returns the questino group's QSG_system value (1 meaning personal info, 2
-     * being address info, and 0 being neither)
-     * @global type $wpdb
-     * @param type $new_question_group_id
-     * @return boolean
-     */
-    private function _is_system_question_group($new_question_group_id)
-    {
-        global $wpdb;
-        $system_id = $wpdb->get_var($wpdb->prepare("SELECT QSG_system FROM " . $wpdb->prefix . "esp_question_group WHERE QSG_ID=%d", $new_question_group_id));
-        return intval($system_id);
-    }
+	/**
+	 * Returns the questino group's QSG_system value (1 meaning personal info, 2
+	 * being address info, and 0 being neither)
+	 * @global type $wpdb
+	 * @param type $new_question_group_id
+	 * @return boolean
+	 */
+	private function _is_system_question_group($new_question_group_id)
+	{
+		global $wpdb;
+		$system_id = $wpdb->get_var($wpdb->prepare("SELECT QSG_system FROM " . $wpdb->prefix . "esp_question_group WHERE QSG_ID=%d", $new_question_group_id));
+		return intval($system_id);
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -50,14 +50,14 @@ 
     public function _count_records_to_migrate()
     {
         global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
+        $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_rel";
-        $this->_new_table = $wpdb->prefix . "esp_question_group_question";
+        $this->_old_table = $wpdb->prefix."events_qst_group_rel";
+        $this->_new_table = $wpdb->prefix."esp_question_group_question";
         $this->_pretty_name = __("Question Group to Question Relations", "event_espresso");
         parent::__construct();
     }
@@ -71,19 +71,19 @@ 
     private function _insert_new_question_group_question($old_question_group_question)
     {
         global $wpdb;
-        $new_question_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_question", $old_question_group_question['question_id'], $wpdb->prefix . "esp_question");
-        $new_question_group_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix . "events_qst_group", $old_question_group_question['group_id'], $wpdb->prefix . "esp_question_group");
-        if (! $new_question_id) {
+        $new_question_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_question", $old_question_group_question['question_id'], $wpdb->prefix."esp_question");
+        $new_question_group_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_qst_group", $old_question_group_question['group_id'], $wpdb->prefix."esp_question_group");
+        if ( ! $new_question_id) {
             $this->add_error(sprintf(__("Could not find 4.1 question id for 3.1 question #%d.", "event_espresso"), $old_question_group_question['question_id']));
             return 0;
         }
-        if (! $new_question_group_id) {
+        if ( ! $new_question_group_id) {
             $this->add_error(sprintf(__("Could not find 4.1 question group id for 3.1 question group #%d.", "event_espresso"), $old_question_group_question['group_id']));
             return 0;
         }
         // if it's a system question, it needs to be in the right system group. otherwise no dice!
         if (
-            ($this->_is_system_question_group($new_question_group_id) == $this->_is_system_question_for_question_group($new_question_id) )
+            ($this->_is_system_question_group($new_question_group_id) == $this->_is_system_question_for_question_group($new_question_id))
                 ||
                 ! $this->_is_system_question_for_question_group($new_question_id)
         ) {
@@ -92,11 +92,11 @@ 
                 'QST_ID' => $new_question_id
             );
             $datatypes = array(
-                '%d',// QSG_ID
-                '%d',// QST_ID
+                '%d', // QSG_ID
+                '%d', // QST_ID
             );
             $success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
-            if (! $success) {
+            if ( ! $success) {
                 $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question_group_question, $this->_new_table, $cols_n_values, $datatypes));
                 return 0;
             }
@@ -116,8 +116,8 @@ 
     private function _is_system_question_for_question_group($new_question_id)
     {
         global $wpdb;
-        $system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM " . $wpdb->prefix . "esp_question WHERE QST_ID=%d", $new_question_id));
-        if (in_array($system_id, array('fname','lname','email'))) {
+        $system_id = $wpdb->get_var($wpdb->prepare("SELECT QST_system FROM ".$wpdb->prefix."esp_question WHERE QST_ID=%d", $new_question_id));
+        if (in_array($system_id, array('fname', 'lname', 'email'))) {
             return 1;
         } elseif ($system_id != '' && $system_id) {
             return 2;
@@ -136,7 +136,7 @@ 
     private function _is_system_question_group($new_question_group_id)
     {
         global $wpdb;
-        $system_id = $wpdb->get_var($wpdb->prepare("SELECT QSG_system FROM " . $wpdb->prefix . "esp_question_group WHERE QSG_ID=%d", $new_question_group_id));
+        $system_id = $wpdb->get_var($wpdb->prepare("SELECT QSG_system FROM ".$wpdb->prefix."esp_question_group WHERE QSG_ID=%d", $new_question_group_id));
         return intval($system_id);
     }
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -205,7 +205,7 @@
 
     /**
      * Inserts into the venue_meta table
-     * @param type $cpt_id
+     * @param integer $cpt_id
      * @param type $old_venue
      * @return int
      */

Indentation +202 added lines, -202 removed lines

@@ -63,210 +63,210 @@
  */
 class EE_DMS_4_1_0_venues extends EE_Data_Migration_Script_Stage
 {
-    private $_old_table;
-    private $_new_table;
-    private $_new_meta_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 $old_venue) {
-            if (! $new_id = $this->_insert_into_posts($old_venue)) {
-                $items_actually_migrated++;
-                continue;
-            }
-            $this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_table, $new_id);
-            if (! $new_meta_id = $this->_insert_into_meta_table($new_id, $old_venue)) {
-                $items_actually_migrated++;
-                continue;
-            }
-            $this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_meta_table, $new_meta_id);
-            // lastly, save the 'contact' as post meta, because it doesn't exist anywhere else but someone may still want it
-            $venue_meta = maybe_unserialize($old_venue['meta']);
-            if (isset($venue_meta['contact']) && $venue_meta['contact']) {
-                add_post_meta($new_id, 'contact', $venue_meta['contact']);
-            }
-            // is there an image on this venue?
-            $guid = isset($venue_meta['image']) && $venue_meta['image'] ? $venue_meta['image'] : null;
-            if ($guid) {
-                $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id, $this);
-            }
-            $items_actually_migrated++;
-            if ($guid) {
-                // if there was an image, we may have had to download it etc and it may have taken
-                // longer, then let's not bother migrating anymore on this step
-                break;
-            }
-        }
-        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 = __("Venues", "event_espresso");
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_venue";
-        $this->_new_table = $wpdb->posts;
-        $this->_new_meta_table = $wpdb->prefix . "esp_venue_meta";
-        parent::__construct();
-    }
+	private $_old_table;
+	private $_new_table;
+	private $_new_meta_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 $old_venue) {
+			if (! $new_id = $this->_insert_into_posts($old_venue)) {
+				$items_actually_migrated++;
+				continue;
+			}
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_table, $new_id);
+			if (! $new_meta_id = $this->_insert_into_meta_table($new_id, $old_venue)) {
+				$items_actually_migrated++;
+				continue;
+			}
+			$this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_meta_table, $new_meta_id);
+			// lastly, save the 'contact' as post meta, because it doesn't exist anywhere else but someone may still want it
+			$venue_meta = maybe_unserialize($old_venue['meta']);
+			if (isset($venue_meta['contact']) && $venue_meta['contact']) {
+				add_post_meta($new_id, 'contact', $venue_meta['contact']);
+			}
+			// is there an image on this venue?
+			$guid = isset($venue_meta['image']) && $venue_meta['image'] ? $venue_meta['image'] : null;
+			if ($guid) {
+				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id, $this);
+			}
+			$items_actually_migrated++;
+			if ($guid) {
+				// if there was an image, we may have had to download it etc and it may have taken
+				// longer, then let's not bother migrating anymore on this step
+				break;
+			}
+		}
+		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 = __("Venues", "event_espresso");
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix . "events_venue";
+		$this->_new_table = $wpdb->posts;
+		$this->_new_meta_table = $wpdb->prefix . "esp_venue_meta";
+		parent::__construct();
+	}
 
-    /**
-     * Inserts the CPT
-     * @param array $old_venue keys are cols, values are col values
-     * @return int
-     */
-    private function _insert_into_posts($old_venue)
-    {
-        global $wpdb;
-        $meta = maybe_unserialize($old_venue['meta']);
-        $slug = $this->_find_unique_slug($old_venue['name'], $old_venue['identifier']);
-        $insertion_array = array(
-                    'post_title' => stripslashes($old_venue['name']),// VNU_name
-                    'post_content' => isset($meta['description']) ? stripslashes(strip_tags($meta['description'])) : '',// VNU_desc
-                    'post_name' => $slug,// VNU_identifier
-                    'post_date' => current_time('mysql'),// VNU_created
-                    'post_date_gmt' =>  current_time('mysql', true),
-                    'post_excerpt' => '',// wp_trim_words($meta['description'] ? $meta['description'] : '',50),//VNU_short_desc arbitraty only 50 characters
-                    'post_modified' => current_time('mysql'),// VNU_modified
-                    'post_modified_gmt' => current_time('mysql', true),
-                    'post_author' => $old_venue['wp_user'],// VNU_wp_user
-                    'post_parent' => 0,// parent
-                    'menu_order' => 0,// VNU_order
-                    'post_type' => 'espresso_venues'// post_type
-                );
-        $datatypes_array = array(
-                    '%s',// VNU_name
-                    '%s',// VNU_desc
-                    '%s',// VNU_identifier
-                    '%s',// VNU_created
-                    '%s',
-                    '%s',// VNU_short_desc
-                    '%s',// VNU_modified
-                    '%s',
-                    '%d',// VNU_wp_user
-                    '%d',// parent
-                    '%d',// VNU_order
-                    '%s',// post_type
-                );
-        $success = $wpdb->insert(
-            $this->_new_table,
-            $insertion_array,
-            $datatypes_array
-        );
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_venue, $this->_new_table, $insertion_array, $datatypes_array));
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
+	/**
+	 * Inserts the CPT
+	 * @param array $old_venue keys are cols, values are col values
+	 * @return int
+	 */
+	private function _insert_into_posts($old_venue)
+	{
+		global $wpdb;
+		$meta = maybe_unserialize($old_venue['meta']);
+		$slug = $this->_find_unique_slug($old_venue['name'], $old_venue['identifier']);
+		$insertion_array = array(
+					'post_title' => stripslashes($old_venue['name']),// VNU_name
+					'post_content' => isset($meta['description']) ? stripslashes(strip_tags($meta['description'])) : '',// VNU_desc
+					'post_name' => $slug,// VNU_identifier
+					'post_date' => current_time('mysql'),// VNU_created
+					'post_date_gmt' =>  current_time('mysql', true),
+					'post_excerpt' => '',// wp_trim_words($meta['description'] ? $meta['description'] : '',50),//VNU_short_desc arbitraty only 50 characters
+					'post_modified' => current_time('mysql'),// VNU_modified
+					'post_modified_gmt' => current_time('mysql', true),
+					'post_author' => $old_venue['wp_user'],// VNU_wp_user
+					'post_parent' => 0,// parent
+					'menu_order' => 0,// VNU_order
+					'post_type' => 'espresso_venues'// post_type
+				);
+		$datatypes_array = array(
+					'%s',// VNU_name
+					'%s',// VNU_desc
+					'%s',// VNU_identifier
+					'%s',// VNU_created
+					'%s',
+					'%s',// VNU_short_desc
+					'%s',// VNU_modified
+					'%s',
+					'%d',// VNU_wp_user
+					'%d',// parent
+					'%d',// VNU_order
+					'%s',// post_type
+				);
+		$success = $wpdb->insert(
+			$this->_new_table,
+			$insertion_array,
+			$datatypes_array
+		);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_venue, $this->_new_table, $insertion_array, $datatypes_array));
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
 
-    /**
-     * Finds a unique slug for this venue, given its name (we could have simply used
-     * the old unique_identifier column, but it added a long string of seemingly random characters onto the end
-     * and really wasn't that pretty for a slug, so we decided we'd make our own slug again)
-     * @param string $post_name
-     * @return string
-     */
-    private function _find_unique_slug($post_name, $old_identifier = '')
-    {
-        $count = 0;
-        $original_name = $post_name ? sanitize_title($post_name) : $old_identifier;
-        $event_slug = $original_name;
-        while ($this->_other_post_exists_with_that_slug($event_slug) && $count < 50) {
-            $event_slug = sanitize_title($original_name . "-" . ++$count);
-        }
-        return $event_slug;
-    }
+	/**
+	 * Finds a unique slug for this venue, given its name (we could have simply used
+	 * the old unique_identifier column, but it added a long string of seemingly random characters onto the end
+	 * and really wasn't that pretty for a slug, so we decided we'd make our own slug again)
+	 * @param string $post_name
+	 * @return string
+	 */
+	private function _find_unique_slug($post_name, $old_identifier = '')
+	{
+		$count = 0;
+		$original_name = $post_name ? sanitize_title($post_name) : $old_identifier;
+		$event_slug = $original_name;
+		while ($this->_other_post_exists_with_that_slug($event_slug) && $count < 50) {
+			$event_slug = sanitize_title($original_name . "-" . ++$count);
+		}
+		return $event_slug;
+	}
 
-    /**
-     * returns whether or not there is a post that has this same slug (post_title)
-     * @global type $wpdb
-     * @param type $slug
-     * @return boolean
-     */
-    private function _other_post_exists_with_that_slug($slug)
-    {
-        global $wpdb;
-        $query = $wpdb->prepare("SELECT COUNT(ID) FROM " . $this->_new_table . " WHERE post_name = %s", $slug);
-        $count = $wpdb->get_var($query);
-        return (bool) intval($count);
-    }
+	/**
+	 * returns whether or not there is a post that has this same slug (post_title)
+	 * @global type $wpdb
+	 * @param type $slug
+	 * @return boolean
+	 */
+	private function _other_post_exists_with_that_slug($slug)
+	{
+		global $wpdb;
+		$query = $wpdb->prepare("SELECT COUNT(ID) FROM " . $this->_new_table . " WHERE post_name = %s", $slug);
+		$count = $wpdb->get_var($query);
+		return (bool) intval($count);
+	}
 
-    /**
-     * Inserts into the venue_meta table
-     * @param type $cpt_id
-     * @param type $old_venue
-     * @return int
-     */
-    private function _insert_into_meta_table($cpt_id, $old_venue)
-    {
-        global $wpdb;
-        // get a country with the same name, or insert one
-        try {
-            $country = $this->get_migration_script()->get_or_create_country(stripslashes($old_venue['country']));
-            $country_iso = $country['CNT_ISO'];
-        } catch (EE_Error $e) {
-            $this->add_error(sprintf(__("%s for venue %s", "event_espresso"), $e->getMessage(), $this->_json_encode($old_venue)));
-            $country_iso = null;
-        }
-        // get a state with the same name, if possible
-        try {
-            $state = $this->get_migration_script()->get_or_create_state(stripslashes($old_venue['state']), isset($country['CNT_name']) ? $country['CNT_name'] : strip_tags($old_venue['country']));
-            $state_id = $state['STA_ID'];
-        } catch (EE_Error $e) {
-            $this->add_error(sprintf(__("%s for venue %s", "event_espresso"), $e->getMessage(), $this->_json_encode($old_venue)));
-            $state_id = 0;
-        }
-        $meta = maybe_unserialize($old_venue['meta']);
-        // now insert into meta table
-        $insertion_array = array(
-            'VNU_ID' => $cpt_id,// VNU_ID_fk
-            'VNU_address' => stripslashes($old_venue['address']),// VNU_address
-            'VNU_address2' => stripslashes($old_venue['address2']),// VNU_address2
-            'VNU_city' => stripslashes($old_venue['city']),// VNU_city
-            'STA_ID' => $state_id,// STA_ID
-            'CNT_ISO' => $country_iso,// CNT_ISO
-            'VNU_zip' => stripslashes($old_venue['zip']),// VNU_zip
-            'VNU_phone' => isset($meta['phone']) ? stripslashes($meta['phone']) : '',// VNU_phone
-            'VNU_capacity' => -1,// VNU_capacity
-            'VNU_url' => isset($meta['website']) ? stripslashes($meta['website']) : '',// VNU_url
-            'VNU_virtual_phone' => '',// VNU_virtual_phone
-            'VNU_virtual_url' => '',// VNU_virtual_url
-            'VNU_google_map_link' => '',// VNU_google_map_link
-            'VNU_enable_for_gmap' => true // VNU_enable_for_gmap
-        );
-        $datatypes = array(
-            '%d',// VNU_ID_fk
-            '%s',// VNU_address
-            '%s',// VNU_address2
-            '%s',// VNU_city
-            '%d',// STA_ID
-            '%s',// CNT_ISO
-            '%s',// VNU_zip
-            '%s',// VNU_phone
-            '%d',// VNU_capacity
-            '%s',// VNU_url
-            '%s',// VNU_virtual_phone
-            '%s',// VNU_virtual_url
-            '%s',// VNU_google_map_link
-            '%d',// VNU_enable_for_gmap
-        );
-        $success = $wpdb->insert($this->_new_meta_table, $insertion_array, $datatypes);
-        if (! $success) {
-            $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_venue, $this->_new_meta_table, $insertion_array, $datatypes));
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
+	/**
+	 * Inserts into the venue_meta table
+	 * @param type $cpt_id
+	 * @param type $old_venue
+	 * @return int
+	 */
+	private function _insert_into_meta_table($cpt_id, $old_venue)
+	{
+		global $wpdb;
+		// get a country with the same name, or insert one
+		try {
+			$country = $this->get_migration_script()->get_or_create_country(stripslashes($old_venue['country']));
+			$country_iso = $country['CNT_ISO'];
+		} catch (EE_Error $e) {
+			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"), $e->getMessage(), $this->_json_encode($old_venue)));
+			$country_iso = null;
+		}
+		// get a state with the same name, if possible
+		try {
+			$state = $this->get_migration_script()->get_or_create_state(stripslashes($old_venue['state']), isset($country['CNT_name']) ? $country['CNT_name'] : strip_tags($old_venue['country']));
+			$state_id = $state['STA_ID'];
+		} catch (EE_Error $e) {
+			$this->add_error(sprintf(__("%s for venue %s", "event_espresso"), $e->getMessage(), $this->_json_encode($old_venue)));
+			$state_id = 0;
+		}
+		$meta = maybe_unserialize($old_venue['meta']);
+		// now insert into meta table
+		$insertion_array = array(
+			'VNU_ID' => $cpt_id,// VNU_ID_fk
+			'VNU_address' => stripslashes($old_venue['address']),// VNU_address
+			'VNU_address2' => stripslashes($old_venue['address2']),// VNU_address2
+			'VNU_city' => stripslashes($old_venue['city']),// VNU_city
+			'STA_ID' => $state_id,// STA_ID
+			'CNT_ISO' => $country_iso,// CNT_ISO
+			'VNU_zip' => stripslashes($old_venue['zip']),// VNU_zip
+			'VNU_phone' => isset($meta['phone']) ? stripslashes($meta['phone']) : '',// VNU_phone
+			'VNU_capacity' => -1,// VNU_capacity
+			'VNU_url' => isset($meta['website']) ? stripslashes($meta['website']) : '',// VNU_url
+			'VNU_virtual_phone' => '',// VNU_virtual_phone
+			'VNU_virtual_url' => '',// VNU_virtual_url
+			'VNU_google_map_link' => '',// VNU_google_map_link
+			'VNU_enable_for_gmap' => true // VNU_enable_for_gmap
+		);
+		$datatypes = array(
+			'%d',// VNU_ID_fk
+			'%s',// VNU_address
+			'%s',// VNU_address2
+			'%s',// VNU_city
+			'%d',// STA_ID
+			'%s',// CNT_ISO
+			'%s',// VNU_zip
+			'%s',// VNU_phone
+			'%d',// VNU_capacity
+			'%s',// VNU_url
+			'%s',// VNU_virtual_phone
+			'%s',// VNU_virtual_url
+			'%s',// VNU_google_map_link
+			'%d',// VNU_enable_for_gmap
+		);
+		$success = $wpdb->insert($this->_new_meta_table, $insertion_array, $datatypes);
+		if (! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_venue, $this->_new_meta_table, $insertion_array, $datatypes));
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
 }

Spacing +56 added lines, -56 removed lines

@@ -70,15 +70,15 @@ 
     {
         global $wpdb;
         $start_at_record = $this->count_records_migrated();
-        $rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $this->_old_table . " LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
+        $rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$this->_old_table." LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
         $items_actually_migrated = 0;
         foreach ($rows as $old_venue) {
-            if (! $new_id = $this->_insert_into_posts($old_venue)) {
+            if ( ! $new_id = $this->_insert_into_posts($old_venue)) {
                 $items_actually_migrated++;
                 continue;
             }
             $this->get_migration_script()->set_mapping($this->_old_table, $old_venue['id'], $this->_new_table, $new_id);
-            if (! $new_meta_id = $this->_insert_into_meta_table($new_id, $old_venue)) {
+            if ( ! $new_meta_id = $this->_insert_into_meta_table($new_id, $old_venue)) {
                 $items_actually_migrated++;
                 continue;
             }
@@ -108,16 +108,16 @@ 
     public function _count_records_to_migrate()
     {
         global $wpdb;
-        $count = $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
+        $count = $wpdb->get_var("SELECT COUNT(id) FROM ".$this->_old_table);
         return $count;
     }
     public function __construct()
     {
         $this->_pretty_name = __("Venues", "event_espresso");
         global $wpdb;
-        $this->_old_table = $wpdb->prefix . "events_venue";
+        $this->_old_table = $wpdb->prefix."events_venue";
         $this->_new_table = $wpdb->posts;
-        $this->_new_meta_table = $wpdb->prefix . "esp_venue_meta";
+        $this->_new_meta_table = $wpdb->prefix."esp_venue_meta";
         parent::__construct();
     }
 
@@ -132,39 +132,39 @@ 
         $meta = maybe_unserialize($old_venue['meta']);
         $slug = $this->_find_unique_slug($old_venue['name'], $old_venue['identifier']);
         $insertion_array = array(
-                    'post_title' => stripslashes($old_venue['name']),// VNU_name
-                    'post_content' => isset($meta['description']) ? stripslashes(strip_tags($meta['description'])) : '',// VNU_desc
-                    'post_name' => $slug,// VNU_identifier
-                    'post_date' => current_time('mysql'),// VNU_created
+                    'post_title' => stripslashes($old_venue['name']), // VNU_name
+                    'post_content' => isset($meta['description']) ? stripslashes(strip_tags($meta['description'])) : '', // VNU_desc
+                    'post_name' => $slug, // VNU_identifier
+                    'post_date' => current_time('mysql'), // VNU_created
                     'post_date_gmt' =>  current_time('mysql', true),
-                    'post_excerpt' => '',// wp_trim_words($meta['description'] ? $meta['description'] : '',50),//VNU_short_desc arbitraty only 50 characters
-                    'post_modified' => current_time('mysql'),// VNU_modified
+                    'post_excerpt' => '', // wp_trim_words($meta['description'] ? $meta['description'] : '',50),//VNU_short_desc arbitraty only 50 characters
+                    'post_modified' => current_time('mysql'), // VNU_modified
                     'post_modified_gmt' => current_time('mysql', true),
-                    'post_author' => $old_venue['wp_user'],// VNU_wp_user
-                    'post_parent' => 0,// parent
-                    'menu_order' => 0,// VNU_order
+                    'post_author' => $old_venue['wp_user'], // VNU_wp_user
+                    'post_parent' => 0, // parent
+                    'menu_order' => 0, // VNU_order
                     'post_type' => 'espresso_venues'// post_type
                 );
         $datatypes_array = array(
-                    '%s',// VNU_name
-                    '%s',// VNU_desc
-                    '%s',// VNU_identifier
-                    '%s',// VNU_created
+                    '%s', // VNU_name
+                    '%s', // VNU_desc
+                    '%s', // VNU_identifier
+                    '%s', // VNU_created
                     '%s',
-                    '%s',// VNU_short_desc
-                    '%s',// VNU_modified
+                    '%s', // VNU_short_desc
+                    '%s', // VNU_modified
                     '%s',
-                    '%d',// VNU_wp_user
-                    '%d',// parent
-                    '%d',// VNU_order
-                    '%s',// post_type
+                    '%d', // VNU_wp_user
+                    '%d', // parent
+                    '%d', // VNU_order
+                    '%s', // post_type
                 );
         $success = $wpdb->insert(
             $this->_new_table,
             $insertion_array,
             $datatypes_array
         );
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_venue, $this->_new_table, $insertion_array, $datatypes_array));
             return 0;
         }
@@ -184,7 +184,7 @@ 
         $original_name = $post_name ? sanitize_title($post_name) : $old_identifier;
         $event_slug = $original_name;
         while ($this->_other_post_exists_with_that_slug($event_slug) && $count < 50) {
-            $event_slug = sanitize_title($original_name . "-" . ++$count);
+            $event_slug = sanitize_title($original_name."-".++$count);
         }
         return $event_slug;
     }
@@ -198,7 +198,7 @@ 
     private function _other_post_exists_with_that_slug($slug)
     {
         global $wpdb;
-        $query = $wpdb->prepare("SELECT COUNT(ID) FROM " . $this->_new_table . " WHERE post_name = %s", $slug);
+        $query = $wpdb->prepare("SELECT COUNT(ID) FROM ".$this->_new_table." WHERE post_name = %s", $slug);
         $count = $wpdb->get_var($query);
         return (bool) intval($count);
     }
@@ -231,39 +231,39 @@ 
         $meta = maybe_unserialize($old_venue['meta']);
         // now insert into meta table
         $insertion_array = array(
-            'VNU_ID' => $cpt_id,// VNU_ID_fk
-            'VNU_address' => stripslashes($old_venue['address']),// VNU_address
-            'VNU_address2' => stripslashes($old_venue['address2']),// VNU_address2
-            'VNU_city' => stripslashes($old_venue['city']),// VNU_city
-            'STA_ID' => $state_id,// STA_ID
-            'CNT_ISO' => $country_iso,// CNT_ISO
-            'VNU_zip' => stripslashes($old_venue['zip']),// VNU_zip
-            'VNU_phone' => isset($meta['phone']) ? stripslashes($meta['phone']) : '',// VNU_phone
-            'VNU_capacity' => -1,// VNU_capacity
-            'VNU_url' => isset($meta['website']) ? stripslashes($meta['website']) : '',// VNU_url
-            'VNU_virtual_phone' => '',// VNU_virtual_phone
-            'VNU_virtual_url' => '',// VNU_virtual_url
-            'VNU_google_map_link' => '',// VNU_google_map_link
+            'VNU_ID' => $cpt_id, // VNU_ID_fk
+            'VNU_address' => stripslashes($old_venue['address']), // VNU_address
+            'VNU_address2' => stripslashes($old_venue['address2']), // VNU_address2
+            'VNU_city' => stripslashes($old_venue['city']), // VNU_city
+            'STA_ID' => $state_id, // STA_ID
+            'CNT_ISO' => $country_iso, // CNT_ISO
+            'VNU_zip' => stripslashes($old_venue['zip']), // VNU_zip
+            'VNU_phone' => isset($meta['phone']) ? stripslashes($meta['phone']) : '', // VNU_phone
+            'VNU_capacity' => -1, // VNU_capacity
+            'VNU_url' => isset($meta['website']) ? stripslashes($meta['website']) : '', // VNU_url
+            'VNU_virtual_phone' => '', // VNU_virtual_phone
+            'VNU_virtual_url' => '', // VNU_virtual_url
+            'VNU_google_map_link' => '', // VNU_google_map_link
             'VNU_enable_for_gmap' => true // VNU_enable_for_gmap
         );
         $datatypes = array(
-            '%d',// VNU_ID_fk
-            '%s',// VNU_address
-            '%s',// VNU_address2
-            '%s',// VNU_city
-            '%d',// STA_ID
-            '%s',// CNT_ISO
-            '%s',// VNU_zip
-            '%s',// VNU_phone
-            '%d',// VNU_capacity
-            '%s',// VNU_url
-            '%s',// VNU_virtual_phone
-            '%s',// VNU_virtual_url
-            '%s',// VNU_google_map_link
-            '%d',// VNU_enable_for_gmap
+            '%d', // VNU_ID_fk
+            '%s', // VNU_address
+            '%s', // VNU_address2
+            '%s', // VNU_city
+            '%d', // STA_ID
+            '%s', // CNT_ISO
+            '%s', // VNU_zip
+            '%s', // VNU_phone
+            '%d', // VNU_capacity
+            '%s', // VNU_url
+            '%s', // VNU_virtual_phone
+            '%s', // VNU_virtual_url
+            '%s', // VNU_google_map_link
+            '%d', // VNU_enable_for_gmap
         );
         $success = $wpdb->insert($this->_new_meta_table, $insertion_array, $datatypes);
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_venue, $this->_new_meta_table, $insertion_array, $datatypes));
             return 0;
         }

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

Doc Comments +3 added lines, -2 removed lines

@@ -128,6 +128,9 @@ 
         return $items_actually_migrated;
     }
 
+    /**
+     * @param integer $num_items_to_migrate
+     */
     private function _gather_relations_to_add($num_items_to_migrate)
     {
         $relations_to_add_this_step = array();
@@ -160,8 +163,6 @@ 
 
     /**
      * Adds teh relation between the payment method and the currencies it can be used for
-     * @param int $id
-     * @param string $gateway_slug
      */
     private function _add_currency_relations($pm_id, $currency_code)
     {

Indentation +166 added lines, -166 removed lines

@@ -12,176 +12,176 @@
  */
 class EE_DMS_4_6_0_payment_method_currencies extends EE_Data_Migration_Script_Stage
 {
-    protected $_currency_table_name;
-    protected $_currency_payment_method_table_name;
-    protected $_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_currencies = array(
-        'Aim' => array(
-            'AUD',
-            'USD',
-            'CAD',
-            'EUR',
-            'GBP',
-            'NZD',
-        ),
-        'Bank' => 'all',
-        'Check' => 'all',
-        'Invoice' => 'all',
-        'Mijireh' => 'all',
-        'Paypal_Pro' => array(
-            'USD',
-            'GBP',
-            'CAD',
-            'AUD',
-            'BRL',
-            'CHF',
-            'CZK',
-            'DKK',
-            'EUR',
-            'HKD',
-            'HUF',
-            'ILS',
-            'JPY',
-            'MXN',
-            'MYR',
-            'NOK',
-            'NZD',
-            'PHP',
-            'PLN',
-            'SEK',
-            'SGD',
-            'THB',
-            'TRY',
-            'TWD',
-        ),
-        'Paypal_Standard' => array(
-            'USD',
-            'GBP',
-            'CAD',
-            'AUD',
-            'BRL',
-            'CHF',
-            'CZK',
-            'DKK',
-            'EUR',
-            'HKD',
-            'HUF',
-            'ILS',
-            'JPY',
-            'MXN',
-            'MYR',
-            'NOK',
-            'NZD',
-            'PHP',
-            'PLN',
-            'SEK',
-            'SGD',
-            'THB',
-            'TRY',
-            'TWD'
-        )
-    );
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = __('Payment Method Currencies', 'event_espresso');
-        $this->_payment_method_table_name = $wpdb->prefix . 'esp_payment_method';
-        $this->_currency_payment_method_table_name = $wpdb->prefix . 'esp_currency_payment_method';
-        $this->_currency_table_name = $wpdb->prefix . 'esp_currency';
-        parent::__construct();
-    }
+	protected $_currency_table_name;
+	protected $_currency_payment_method_table_name;
+	protected $_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_currencies = array(
+		'Aim' => array(
+			'AUD',
+			'USD',
+			'CAD',
+			'EUR',
+			'GBP',
+			'NZD',
+		),
+		'Bank' => 'all',
+		'Check' => 'all',
+		'Invoice' => 'all',
+		'Mijireh' => 'all',
+		'Paypal_Pro' => array(
+			'USD',
+			'GBP',
+			'CAD',
+			'AUD',
+			'BRL',
+			'CHF',
+			'CZK',
+			'DKK',
+			'EUR',
+			'HKD',
+			'HUF',
+			'ILS',
+			'JPY',
+			'MXN',
+			'MYR',
+			'NOK',
+			'NZD',
+			'PHP',
+			'PLN',
+			'SEK',
+			'SGD',
+			'THB',
+			'TRY',
+			'TWD',
+		),
+		'Paypal_Standard' => array(
+			'USD',
+			'GBP',
+			'CAD',
+			'AUD',
+			'BRL',
+			'CHF',
+			'CZK',
+			'DKK',
+			'EUR',
+			'HKD',
+			'HUF',
+			'ILS',
+			'JPY',
+			'MXN',
+			'MYR',
+			'NOK',
+			'NZD',
+			'PHP',
+			'PLN',
+			'SEK',
+			'SGD',
+			'THB',
+			'TRY',
+			'TWD'
+		)
+	);
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = __('Payment Method Currencies', 'event_espresso');
+		$this->_payment_method_table_name = $wpdb->prefix . 'esp_payment_method';
+		$this->_currency_payment_method_table_name = $wpdb->prefix . 'esp_currency_payment_method';
+		$this->_currency_table_name = $wpdb->prefix . 'esp_currency';
+		parent::__construct();
+	}
 
-    protected function _count_records_to_migrate()
-    {
-        $count = 0;
-        foreach ($this->_gateway_currencies as $currencies) {
-            if ($currencies == 'all') {
-                $currencies = $this->_get_all_currencies();
-            }
-            $count += count($currencies);
-        }
-        return $count;
-    }
+	protected function _count_records_to_migrate()
+	{
+		$count = 0;
+		foreach ($this->_gateway_currencies as $currencies) {
+			if ($currencies == 'all') {
+				$currencies = $this->_get_all_currencies();
+			}
+			$count += count($currencies);
+		}
+		return $count;
+	}
 
 
 
-    protected function _migration_step($num_items_to_migrate = 50)
-    {
-        $items_actually_migrated = 0;
-        $relations_to_add_this_step = $this->_gather_relations_to_add($num_items_to_migrate);
-        foreach ($relations_to_add_this_step as $pm_slug => $currencies) {
-            $id = $this->get_migration_script()->get_mapping_new_pk('EE_Gateway_Config', $pm_slug, $this->_payment_method_table_name);
-            foreach ($currencies as $currency) {
-                if ($id) {
-                    $this->_add_currency_relations($id, $currency);
-                }
-                $items_actually_migrated++;
-            }
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
+	protected function _migration_step($num_items_to_migrate = 50)
+	{
+		$items_actually_migrated = 0;
+		$relations_to_add_this_step = $this->_gather_relations_to_add($num_items_to_migrate);
+		foreach ($relations_to_add_this_step as $pm_slug => $currencies) {
+			$id = $this->get_migration_script()->get_mapping_new_pk('EE_Gateway_Config', $pm_slug, $this->_payment_method_table_name);
+			foreach ($currencies as $currency) {
+				if ($id) {
+					$this->_add_currency_relations($id, $currency);
+				}
+				$items_actually_migrated++;
+			}
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
 
-    private function _gather_relations_to_add($num_items_to_migrate)
-    {
-        $relations_to_add_this_step = array();
-        $migrate_up_to_count = $this->count_records_migrated() + $num_items_to_migrate;
-        $iterator = 0;
-        foreach ($this->_gateway_currencies as $pm_slug => $currencies) {
-            if ($currencies == 'all') {
-                $currencies = $this->_get_all_currencies();
-            }
-            foreach ($currencies as $currency_code) {
-                if (
-                    $this->count_records_migrated() <= $iterator &&
-                        $iterator < $migrate_up_to_count
-                ) {
-                    $relations_to_add_this_step[ $pm_slug ] [] = $currency_code;
-                }
-                $iterator++;
-            }
-        }
-        return $relations_to_add_this_step;
-    }
-    /**
-     * Gets all the currency codes in the database
-     * @return array
-     */
-    private function _get_all_currencies()
-    {
-        global $wpdb;
-        $currencies = $wpdb->get_col("SELECT CUR_code FROM {$this->_currency_table_name}");
-        return $currencies;
-    }
+	private function _gather_relations_to_add($num_items_to_migrate)
+	{
+		$relations_to_add_this_step = array();
+		$migrate_up_to_count = $this->count_records_migrated() + $num_items_to_migrate;
+		$iterator = 0;
+		foreach ($this->_gateway_currencies as $pm_slug => $currencies) {
+			if ($currencies == 'all') {
+				$currencies = $this->_get_all_currencies();
+			}
+			foreach ($currencies as $currency_code) {
+				if (
+					$this->count_records_migrated() <= $iterator &&
+						$iterator < $migrate_up_to_count
+				) {
+					$relations_to_add_this_step[ $pm_slug ] [] = $currency_code;
+				}
+				$iterator++;
+			}
+		}
+		return $relations_to_add_this_step;
+	}
+	/**
+	 * Gets all the currency codes in the database
+	 * @return array
+	 */
+	private function _get_all_currencies()
+	{
+		global $wpdb;
+		$currencies = $wpdb->get_col("SELECT CUR_code FROM {$this->_currency_table_name}");
+		return $currencies;
+	}
 
-    /**
-     * Adds teh relation between the payment method and the currencies it can be used for
-     * @param int $id
-     * @param string $gateway_slug
-     */
-    private function _add_currency_relations($pm_id, $currency_code)
-    {
-        global $wpdb;
-        $cur_pm_relation = array(
-                    'CUR_code' => $currency_code,
-                    'PMD_ID' => $pm_id,
-                );
-        $success = $wpdb->insert(
-            $this->_currency_payment_method_table_name,
-            $cur_pm_relation,
-            array(
-                    '%s',// CUR_code
-                    '%d',// PMD_ID
-                )
-        );
-        if (! $success) {
-            $this->add_error(sprintf(__('Could not add currency relation %s because %s', "event_espresso"), wp_json_encode($cur_pm_relation), $wpdb->last_error));
-        }
-    }
+	/**
+	 * Adds teh relation between the payment method and the currencies it can be used for
+	 * @param int $id
+	 * @param string $gateway_slug
+	 */
+	private function _add_currency_relations($pm_id, $currency_code)
+	{
+		global $wpdb;
+		$cur_pm_relation = array(
+					'CUR_code' => $currency_code,
+					'PMD_ID' => $pm_id,
+				);
+		$success = $wpdb->insert(
+			$this->_currency_payment_method_table_name,
+			$cur_pm_relation,
+			array(
+					'%s',// CUR_code
+					'%d',// PMD_ID
+				)
+		);
+		if (! $success) {
+			$this->add_error(sprintf(__('Could not add currency relation %s because %s', "event_espresso"), wp_json_encode($cur_pm_relation), $wpdb->last_error));
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -89,9 +89,9 @@ 
     {
         global $wpdb;
         $this->_pretty_name = __('Payment Method Currencies', 'event_espresso');
-        $this->_payment_method_table_name = $wpdb->prefix . 'esp_payment_method';
-        $this->_currency_payment_method_table_name = $wpdb->prefix . 'esp_currency_payment_method';
-        $this->_currency_table_name = $wpdb->prefix . 'esp_currency';
+        $this->_payment_method_table_name = $wpdb->prefix.'esp_payment_method';
+        $this->_currency_payment_method_table_name = $wpdb->prefix.'esp_currency_payment_method';
+        $this->_currency_table_name = $wpdb->prefix.'esp_currency';
         parent::__construct();
     }
 
@@ -142,7 +142,7 @@ 
                     $this->count_records_migrated() <= $iterator &&
                         $iterator < $migrate_up_to_count
                 ) {
-                    $relations_to_add_this_step[ $pm_slug ] [] = $currency_code;
+                    $relations_to_add_this_step[$pm_slug] [] = $currency_code;
                 }
                 $iterator++;
             }
@@ -176,11 +176,11 @@ 
             $this->_currency_payment_method_table_name,
             $cur_pm_relation,
             array(
-                    '%s',// CUR_code
-                    '%d',// PMD_ID
+                    '%s', // CUR_code
+                    '%d', // PMD_ID
                 )
         );
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(sprintf(__('Could not add currency relation %s because %s', "event_espresso"), wp_json_encode($cur_pm_relation), $wpdb->last_error));
         }
     }

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

Doc Comments -1 removed lines

@@ -58,7 +58,6 @@
             'IV'=>  __("Invoice", 'event_espresso'),
             'MO'=>  __("Money Order", 'event_espresso'),
      * @global type $wpdb
-     * @param int $id
      * @return string
      */
     protected function _get_payment_method_id_by_gateway_name($gateway_name, $old_pay_method_column)

Indentation +78 added lines, -78 removed lines

@@ -11,44 +11,44 @@ 
  */
 class EE_DMS_4_6_0_payments extends EE_Data_Migration_Script_Stage_Table
 {
-    protected $_payment_method_table;
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix . 'esp_payment';
-        $this->_payment_method_table = $wpdb->prefix . 'esp_payment_method';
-        $this->_pretty_name = __('Payment-Payment Method Relations', 'event_espresso');
-        parent::__construct();
-    }
-    protected function _migrate_old_row($payment_row)
-    {
-        global $wpdb;
-        // get the payment method's ID
-        $PMD_ID = apply_filters('FHEE__EE_DMS_4_6_0_payments__migrate_old_row__PMD_ID', $this->_get_payment_method_id_by_gateway_name($payment_row['PAY_gateway'], $payment_row['PAY_method']));
-        if (! $PMD_ID) {
-            $this->add_error(sprintf(__('Could not find payment method with PMD_type = \'%1$s\' when migrating payment row %2$s so just assigned it an unknown payment method', 'event_espresso'), $payment_row['PAY_gateway'], $this->_json_encode($payment_row)));
-            $PMD_ID = 0;
-        }
-        $new_values = array(
-            'PMD_ID' => $PMD_ID,
-            'PAY_source' => ( $payment_row['PAY_via_admin'] ? 'ADMIN' : 'CART' ) );
-        $wheres = array( 'PAY_ID' => $payment_row['PAY_ID'] );
-        $new_value_datatypes = array( '%d', '%s' );
-        $where_datatypes = array( '%d' );
-        $success = $wpdb->update(
-            $this->_old_table,
-            $new_values,
-            $wheres,
-            $new_value_datatypes,
-            $where_datatypes
-        );
-        if (! $success) {
-            $this->add_error(sprintf(__('Couldnt set %1$s row in table %2$s where %3$s', 'event_espresso'), $this->_json_encode($new_values), $this->_old_table, $this->_json_encode($wheres)));
-        }
-    }
-    /**
-     *
-     *  array(
+	protected $_payment_method_table;
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix . 'esp_payment';
+		$this->_payment_method_table = $wpdb->prefix . 'esp_payment_method';
+		$this->_pretty_name = __('Payment-Payment Method Relations', 'event_espresso');
+		parent::__construct();
+	}
+	protected function _migrate_old_row($payment_row)
+	{
+		global $wpdb;
+		// get the payment method's ID
+		$PMD_ID = apply_filters('FHEE__EE_DMS_4_6_0_payments__migrate_old_row__PMD_ID', $this->_get_payment_method_id_by_gateway_name($payment_row['PAY_gateway'], $payment_row['PAY_method']));
+		if (! $PMD_ID) {
+			$this->add_error(sprintf(__('Could not find payment method with PMD_type = \'%1$s\' when migrating payment row %2$s so just assigned it an unknown payment method', 'event_espresso'), $payment_row['PAY_gateway'], $this->_json_encode($payment_row)));
+			$PMD_ID = 0;
+		}
+		$new_values = array(
+			'PMD_ID' => $PMD_ID,
+			'PAY_source' => ( $payment_row['PAY_via_admin'] ? 'ADMIN' : 'CART' ) );
+		$wheres = array( 'PAY_ID' => $payment_row['PAY_ID'] );
+		$new_value_datatypes = array( '%d', '%s' );
+		$where_datatypes = array( '%d' );
+		$success = $wpdb->update(
+			$this->_old_table,
+			$new_values,
+			$wheres,
+			$new_value_datatypes,
+			$where_datatypes
+		);
+		if (! $success) {
+			$this->add_error(sprintf(__('Couldnt set %1$s row in table %2$s where %3$s', 'event_espresso'), $this->_json_encode($new_values), $this->_old_table, $this->_json_encode($wheres)));
+		}
+	}
+	/**
+	 *
+	 *  array(
             'PP' => __( 'PayPal', 'event_espresso' ),
             'CC' => __( 'Credit Card', 'event_espresso' ),
             'DB'=>  __("Debit Card", 'event_espresso'),
@@ -57,44 +57,44 @@ 
             'BK'=>  __("Bank", 'event_espresso'),
             'IV'=>  __("Invoice", 'event_espresso'),
             'MO'=>  __("Money Order", 'event_espresso'),
-     * @global type $wpdb
-     * @param int $id
-     * @return string
-     */
-    protected function _get_payment_method_id_by_gateway_name($gateway_name, $old_pay_method_column)
-    {
-        global $wpdb;
-        // convert from old known PAY_method values to their corresponding
-        // PMD_type or default PMD_name
-        switch ($old_pay_method_column) {
-            case 'PP':
-                $pmd_type = 'Paypal_Standard';
-                break;
-            case 'CC':
-                $pmd_type = 'Credit_Card';
-                break;
-            case 'DB':
-                $pmd_type = 'Debit_Card';
-                break;
-            case 'CHQ':
-                $pmd_type = 'Check';
-                break;
-            case 'CSH':
-                $pmd_type = 'Cash';
-                break;
-            case 'BK':
-                $pmd_type = 'Bank';
-                break;
-            case 'IV':
-                $pmd_type = 'Invoice';
-                break;
-            case 'MO':
-                $pmd_type = 'Money_Order';
-                break;
-            default:
-                $pmd_type = $gateway_name;
-        }
-        $pmd_name = str_replace("_", " ", $pmd_type);
-        return $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM " . $wpdb->prefix . "esp_payment_method WHERE PMD_type = %s OR PMD_name = %s", $pmd_type, $pmd_name));
-    }
+	 * @global type $wpdb
+	 * @param int $id
+	 * @return string
+	 */
+	protected function _get_payment_method_id_by_gateway_name($gateway_name, $old_pay_method_column)
+	{
+		global $wpdb;
+		// convert from old known PAY_method values to their corresponding
+		// PMD_type or default PMD_name
+		switch ($old_pay_method_column) {
+			case 'PP':
+				$pmd_type = 'Paypal_Standard';
+				break;
+			case 'CC':
+				$pmd_type = 'Credit_Card';
+				break;
+			case 'DB':
+				$pmd_type = 'Debit_Card';
+				break;
+			case 'CHQ':
+				$pmd_type = 'Check';
+				break;
+			case 'CSH':
+				$pmd_type = 'Cash';
+				break;
+			case 'BK':
+				$pmd_type = 'Bank';
+				break;
+			case 'IV':
+				$pmd_type = 'Invoice';
+				break;
+			case 'MO':
+				$pmd_type = 'Money_Order';
+				break;
+			default:
+				$pmd_type = $gateway_name;
+		}
+		$pmd_name = str_replace("_", " ", $pmd_type);
+		return $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM " . $wpdb->prefix . "esp_payment_method WHERE PMD_type = %s OR PMD_name = %s", $pmd_type, $pmd_name));
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -15,8 +15,8 @@ 
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table = $wpdb->prefix . 'esp_payment';
-        $this->_payment_method_table = $wpdb->prefix . 'esp_payment_method';
+        $this->_old_table = $wpdb->prefix.'esp_payment';
+        $this->_payment_method_table = $wpdb->prefix.'esp_payment_method';
         $this->_pretty_name = __('Payment-Payment Method Relations', 'event_espresso');
         parent::__construct();
     }
@@ -25,16 +25,16 @@ 
         global $wpdb;
         // get the payment method's ID
         $PMD_ID = apply_filters('FHEE__EE_DMS_4_6_0_payments__migrate_old_row__PMD_ID', $this->_get_payment_method_id_by_gateway_name($payment_row['PAY_gateway'], $payment_row['PAY_method']));
-        if (! $PMD_ID) {
+        if ( ! $PMD_ID) {
             $this->add_error(sprintf(__('Could not find payment method with PMD_type = \'%1$s\' when migrating payment row %2$s so just assigned it an unknown payment method', 'event_espresso'), $payment_row['PAY_gateway'], $this->_json_encode($payment_row)));
             $PMD_ID = 0;
         }
         $new_values = array(
             'PMD_ID' => $PMD_ID,
-            'PAY_source' => ( $payment_row['PAY_via_admin'] ? 'ADMIN' : 'CART' ) );
-        $wheres = array( 'PAY_ID' => $payment_row['PAY_ID'] );
-        $new_value_datatypes = array( '%d', '%s' );
-        $where_datatypes = array( '%d' );
+            'PAY_source' => ($payment_row['PAY_via_admin'] ? 'ADMIN' : 'CART') );
+        $wheres = array('PAY_ID' => $payment_row['PAY_ID']);
+        $new_value_datatypes = array('%d', '%s');
+        $where_datatypes = array('%d');
         $success = $wpdb->update(
             $this->_old_table,
             $new_values,
@@ -42,7 +42,7 @@ 
             $new_value_datatypes,
             $where_datatypes
         );
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(sprintf(__('Couldnt set %1$s row in table %2$s where %3$s', 'event_espresso'), $this->_json_encode($new_values), $this->_old_table, $this->_json_encode($wheres)));
         }
     }
@@ -95,6 +95,6 @@ 
                 $pmd_type = $gateway_name;
         }
         $pmd_name = str_replace("_", " ", $pmd_type);
-        return $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM " . $wpdb->prefix . "esp_payment_method WHERE PMD_type = %s OR PMD_name = %s", $pmd_type, $pmd_name));
+        return $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM ".$wpdb->prefix."esp_payment_method WHERE PMD_type = %s OR PMD_name = %s", $pmd_type, $pmd_name));
     }
 }

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

Doc Comments -1 removed lines

@@ -50,7 +50,6 @@
     /**
      *
      * @global type $wpdb
-     * @param int $id
      * @return string
      */
     protected function _get_payment_method_id_by_gateway_name($gateway_name)

Indentation +47 added lines, -47 removed lines

@@ -11,51 +11,51 @@
  */
 class EE_DMS_4_6_0_transactions extends EE_Data_Migration_Script_Stage_Table
 {
-    protected $_transaction_table;
-    protected $_payment_method_table;
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table = $wpdb->prefix . 'esp_extra_meta';
-        $this->_transaction_table = $wpdb->prefix . 'esp_transaction';
-        $this->_payment_method_table = $wpdb->prefix . 'esp_payment_method';
-        $this->_pretty_name = __('Transaction Payment Method Relations', 'event_espresso');
-        $this->_extra_where_sql = "WHERE EXM_key = 'gateway' AND EXM_type = 'Transaction'";
-        parent::__construct();
-    }
-    protected function _migrate_old_row($extra_meta_row)
-    {
-        global $wpdb;
-        // get the payment method's ID
-        $PMD_ID = $this->_get_payment_method_id_by_gateway_name($extra_meta_row['EXM_value']);
-        if (! $PMD_ID) {
-            $this->add_error(sprintf(__('Could not find payment method with PMD_type = \'%1$s\' when migrating extra meta row %2$s', 'event_espresso'), $extra_meta_row['EXM_value'], $this->_json_encode($extra_meta_row)));
-            return;
-        }
-        $new_values = array( 'PMD_ID' => $PMD_ID );
-        $wheres = array( 'TXN_ID' => $extra_meta_row['OBJ_ID'] );
-        $new_value_datatypes = array( '%d' );
-        $where_datatypes = array( '%d' );
-        $success = $wpdb->update(
-            $this->_transaction_table,
-            $new_values,
-            $wheres,
-            $new_value_datatypes,
-            $where_datatypes
-        );
-        if (! $success) {
-            $this->add_error(sprintf(__('Couldnt set %1$s row in table %2$s where %3$s', 'event_espresso'), $this->_json_encode($new_values), $this->_transaction_table, $this->_json_encode($wheres)));
-        }
-    }
-    /**
-     *
-     * @global type $wpdb
-     * @param int $id
-     * @return string
-     */
-    protected function _get_payment_method_id_by_gateway_name($gateway_name)
-    {
-        global $wpdb;
-        return $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM " . $wpdb->prefix . "esp_payment_method WHERE PMD_type = %s", $gateway_name));
-    }
+	protected $_transaction_table;
+	protected $_payment_method_table;
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table = $wpdb->prefix . 'esp_extra_meta';
+		$this->_transaction_table = $wpdb->prefix . 'esp_transaction';
+		$this->_payment_method_table = $wpdb->prefix . 'esp_payment_method';
+		$this->_pretty_name = __('Transaction Payment Method Relations', 'event_espresso');
+		$this->_extra_where_sql = "WHERE EXM_key = 'gateway' AND EXM_type = 'Transaction'";
+		parent::__construct();
+	}
+	protected function _migrate_old_row($extra_meta_row)
+	{
+		global $wpdb;
+		// get the payment method's ID
+		$PMD_ID = $this->_get_payment_method_id_by_gateway_name($extra_meta_row['EXM_value']);
+		if (! $PMD_ID) {
+			$this->add_error(sprintf(__('Could not find payment method with PMD_type = \'%1$s\' when migrating extra meta row %2$s', 'event_espresso'), $extra_meta_row['EXM_value'], $this->_json_encode($extra_meta_row)));
+			return;
+		}
+		$new_values = array( 'PMD_ID' => $PMD_ID );
+		$wheres = array( 'TXN_ID' => $extra_meta_row['OBJ_ID'] );
+		$new_value_datatypes = array( '%d' );
+		$where_datatypes = array( '%d' );
+		$success = $wpdb->update(
+			$this->_transaction_table,
+			$new_values,
+			$wheres,
+			$new_value_datatypes,
+			$where_datatypes
+		);
+		if (! $success) {
+			$this->add_error(sprintf(__('Couldnt set %1$s row in table %2$s where %3$s', 'event_espresso'), $this->_json_encode($new_values), $this->_transaction_table, $this->_json_encode($wheres)));
+		}
+	}
+	/**
+	 *
+	 * @global type $wpdb
+	 * @param int $id
+	 * @return string
+	 */
+	protected function _get_payment_method_id_by_gateway_name($gateway_name)
+	{
+		global $wpdb;
+		return $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM " . $wpdb->prefix . "esp_payment_method WHERE PMD_type = %s", $gateway_name));
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -16,9 +16,9 @@ 
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table = $wpdb->prefix . 'esp_extra_meta';
-        $this->_transaction_table = $wpdb->prefix . 'esp_transaction';
-        $this->_payment_method_table = $wpdb->prefix . 'esp_payment_method';
+        $this->_old_table = $wpdb->prefix.'esp_extra_meta';
+        $this->_transaction_table = $wpdb->prefix.'esp_transaction';
+        $this->_payment_method_table = $wpdb->prefix.'esp_payment_method';
         $this->_pretty_name = __('Transaction Payment Method Relations', 'event_espresso');
         $this->_extra_where_sql = "WHERE EXM_key = 'gateway' AND EXM_type = 'Transaction'";
         parent::__construct();
@@ -28,14 +28,14 @@ 
         global $wpdb;
         // get the payment method's ID
         $PMD_ID = $this->_get_payment_method_id_by_gateway_name($extra_meta_row['EXM_value']);
-        if (! $PMD_ID) {
+        if ( ! $PMD_ID) {
             $this->add_error(sprintf(__('Could not find payment method with PMD_type = \'%1$s\' when migrating extra meta row %2$s', 'event_espresso'), $extra_meta_row['EXM_value'], $this->_json_encode($extra_meta_row)));
             return;
         }
-        $new_values = array( 'PMD_ID' => $PMD_ID );
-        $wheres = array( 'TXN_ID' => $extra_meta_row['OBJ_ID'] );
-        $new_value_datatypes = array( '%d' );
-        $where_datatypes = array( '%d' );
+        $new_values = array('PMD_ID' => $PMD_ID);
+        $wheres = array('TXN_ID' => $extra_meta_row['OBJ_ID']);
+        $new_value_datatypes = array('%d');
+        $where_datatypes = array('%d');
         $success = $wpdb->update(
             $this->_transaction_table,
             $new_values,
@@ -43,7 +43,7 @@ 
             $new_value_datatypes,
             $where_datatypes
         );
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(sprintf(__('Couldnt set %1$s row in table %2$s where %3$s', 'event_espresso'), $this->_json_encode($new_values), $this->_transaction_table, $this->_json_encode($wheres)));
         }
     }
@@ -56,6 +56,6 @@ 
     protected function _get_payment_method_id_by_gateway_name($gateway_name)
     {
         global $wpdb;
-        return $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM " . $wpdb->prefix . "esp_payment_method WHERE PMD_type = %s", $gateway_name));
+        return $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM ".$wpdb->prefix."esp_payment_method WHERE PMD_type = %s", $gateway_name));
     }
 }