eventespresso / event-espresso-core

core/db_models/EEM_Ticket.model.php

Indentation +313 added lines, -313 removed lines

@@ -10,331 +10,331 @@
 class EEM_Ticket extends EEM_Soft_Delete_Base
 {
 
-    /**
-     * private instance of the EEM_Ticket object
-     *
-     * @var EEM_Ticket $_instance
-     */
-    protected static $_instance;
+	/**
+	 * private instance of the EEM_Ticket object
+	 *
+	 * @var EEM_Ticket $_instance
+	 */
+	protected static $_instance;
 
 
-    /**
-     * private constructor to prevent direct creation
-     *
-     * @Constructor
-     * @access private
-     * @param string $timezone string representing the timezone we want to set for returned Date Time Strings
-     *                         (and any incoming timezone data that gets saved).
-     *                         Note this just sends the timezone info to the date time model field objects.
-     *                         Default is NULL
-     *                         (and will be assumed using the set timezone in the 'timezone_string' wp option)
-     * @throws EE_Error
-     */
-    protected function __construct($timezone)
-    {
-        $this->singular_item = esc_html__('Ticket', 'event_espresso');
-        $this->plural_item = esc_html__('Tickets', 'event_espresso');
-        $this->_tables = array(
-            'Ticket' => new EE_Primary_Table('esp_ticket', 'TKT_ID'),
-        );
-        $this->_fields = array(
-            'Ticket' => array(
-                'TKT_ID'          => new EE_Primary_Key_Int_Field(
-                    'TKT_ID',
-                    esc_html__('Ticket ID', 'event_espresso')
-                ),
-                'TTM_ID'          => new EE_Foreign_Key_Int_Field(
-                    'TTM_ID',
-                    esc_html__('Ticket Template ID', 'event_espresso'),
-                    false,
-                    0,
-                    'Ticket_Template'
-                ),
-                'TKT_name'        => new EE_Plain_Text_Field(
-                    'TKT_name',
-                    esc_html__('Ticket Name', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'TKT_description' => new EE_Post_Content_Field(
-                    'TKT_description',
-                    esc_html__('Description of Ticket', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'TKT_start_date'  => new EE_Datetime_Field(
-                    'TKT_start_date',
-                    esc_html__('Start time/date of Ticket', 'event_espresso'),
-                    false,
-                    EE_Datetime_Field::now,
-                    $timezone
-                ),
-                'TKT_end_date'    => new EE_Datetime_Field(
-                    'TKT_end_date',
-                    esc_html__('End time/date of Ticket', 'event_espresso'),
-                    false,
-                    EE_Datetime_Field::now,
-                    $timezone
-                ),
-                'TKT_min'         => new EE_Integer_Field(
-                    'TKT_min',
-                    esc_html__('Minimum quantity of this ticket that must be purchased', 'event_espresso'),
-                    false,
-                    0
-                ),
-                'TKT_max'         => new EE_Infinite_Integer_Field(
-                    'TKT_max',
-                    esc_html__(
-                        'Maximum quantity of this ticket that can be purchased in one transaction',
-                        'event_espresso'
-                    ),
-                    false,
-                    EE_INF
-                ),
-                'TKT_price'       => new EE_Money_Field(
-                    'TKT_price',
-                    esc_html__('Final calculated price for ticket', 'event_espresso'),
-                    false,
-                    0
-                ),
-                'TKT_sold'        => new EE_Integer_Field(
-                    'TKT_sold',
-                    esc_html__('Number of this ticket sold', 'event_espresso'),
-                    false,
-                    0
-                ),
-                'TKT_qty'         => new EE_Infinite_Integer_Field(
-                    'TKT_qty',
-                    esc_html__('Quantity of this ticket that is available', 'event_espresso'),
-                    false,
-                    EE_INF
-                ),
-                'TKT_reserved'    => new EE_Integer_Field(
-                    'TKT_reserved',
-                    esc_html__(
-                        'Quantity of this ticket that is reserved, but not yet fully purchased',
-                        'event_espresso'
-                    ),
-                    false,
-                    0
-                ),
-                'TKT_uses'        => new EE_Infinite_Integer_Field(
-                    'TKT_uses',
-                    esc_html__('Number of datetimes this ticket can be used at', 'event_espresso'),
-                    false,
-                    EE_INF
-                ),
-                'TKT_required'    => new EE_Boolean_Field(
-                    'TKT_required',
-                    esc_html__(
-                        'Flag indicating whether this ticket must be purchased with a transaction',
-                        'event_espresso'
-                    ),
-                    false,
-                    false
-                ),
-                'TKT_taxable'     => new EE_Boolean_Field(
-                    'TKT_taxable',
-                    esc_html__(
-                        'Flag indicating whether there is tax applied on this ticket',
-                        'event_espresso'
-                    ),
-                    false,
-                    false
-                ),
-                'TKT_is_default'  => new EE_Boolean_Field(
-                    'TKT_is_default',
-                    esc_html__('Flag indicating that this ticket is a default ticket', 'event_espresso'),
-                    false,
-                    false
-                ),
-                'TKT_order'       => new EE_Integer_Field(
-                    'TKT_order',
-                    esc_html__(
-                        'The order in which the Ticket is displayed in the editor (used for autosaves when the form doesn\'t have the ticket ID yet)',
-                        'event_espresso'
-                    ),
-                    false,
-                    0
-                ),
-                'TKT_row'         => new EE_Integer_Field(
-                    'TKT_row',
-                    esc_html__('How tickets are displayed in the ui', 'event_espresso'),
-                    false,
-                    0
-                ),
-                'TKT_deleted'     => new EE_Trashed_Flag_Field(
-                    'TKT_deleted',
-                    esc_html__('Flag indicating if this has been archived or not', 'event_espresso'),
-                    false,
-                    false
-                ),
-                'TKT_wp_user'     => new EE_WP_User_Field(
-                    'TKT_wp_user',
-                    esc_html__('Ticket Creator ID', 'event_espresso'),
-                    false
-                ),
-                'TKT_parent'      => new EE_Integer_Field(
-                    'TKT_parent',
-                    esc_html__(
-                        'Indicates what TKT_ID is the parent of this TKT_ID (used in autosaves/revisions)',
-                        'event_espresso'
-                    ),
-                    true,
-                    0
-                ),
-                'TKT_reverse_calculate' => new EE_Boolean_Field(
-                    'TKT_reverse_calculate',
-                    esc_html__(
-                        'Flag indicating whether ticket calculations should run in reverse and calculate the base ticket price from the provided ticket total.',
-                        'event_espresso'
-                    ),
-                    false,
-                    false
-                ),
-            ),
-        );
-        $this->_model_relations = array(
-            'Datetime'        => new EE_HABTM_Relation('Datetime_Ticket'),
-            'Datetime_Ticket' => new EE_Has_Many_Relation(),
-            'Price'           => new EE_HABTM_Relation('Ticket_Price'),
-            'Ticket_Template' => new EE_Belongs_To_Relation(),
-            'Registration'    => new EE_Has_Many_Relation(),
-            'WP_User'         => new EE_Belongs_To_Relation(),
-        );
-        // this model is generally available for reading
-        $path_to_event = 'Datetime.Event';
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public(
-            'TKT_is_default',
-            $path_to_event
-        );
-        // account for default tickets in the caps
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected(
-            'TKT_is_default',
-            $path_to_event
-        );
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected(
-            'TKT_is_default',
-            $path_to_event
-        );
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected(
-            'TKT_is_default',
-            $path_to_event
-        );
-        $this->model_chain_to_password = $path_to_event;
-        parent::__construct($timezone);
-    }
+	/**
+	 * private constructor to prevent direct creation
+	 *
+	 * @Constructor
+	 * @access private
+	 * @param string $timezone string representing the timezone we want to set for returned Date Time Strings
+	 *                         (and any incoming timezone data that gets saved).
+	 *                         Note this just sends the timezone info to the date time model field objects.
+	 *                         Default is NULL
+	 *                         (and will be assumed using the set timezone in the 'timezone_string' wp option)
+	 * @throws EE_Error
+	 */
+	protected function __construct($timezone)
+	{
+		$this->singular_item = esc_html__('Ticket', 'event_espresso');
+		$this->plural_item = esc_html__('Tickets', 'event_espresso');
+		$this->_tables = array(
+			'Ticket' => new EE_Primary_Table('esp_ticket', 'TKT_ID'),
+		);
+		$this->_fields = array(
+			'Ticket' => array(
+				'TKT_ID'          => new EE_Primary_Key_Int_Field(
+					'TKT_ID',
+					esc_html__('Ticket ID', 'event_espresso')
+				),
+				'TTM_ID'          => new EE_Foreign_Key_Int_Field(
+					'TTM_ID',
+					esc_html__('Ticket Template ID', 'event_espresso'),
+					false,
+					0,
+					'Ticket_Template'
+				),
+				'TKT_name'        => new EE_Plain_Text_Field(
+					'TKT_name',
+					esc_html__('Ticket Name', 'event_espresso'),
+					false,
+					''
+				),
+				'TKT_description' => new EE_Post_Content_Field(
+					'TKT_description',
+					esc_html__('Description of Ticket', 'event_espresso'),
+					false,
+					''
+				),
+				'TKT_start_date'  => new EE_Datetime_Field(
+					'TKT_start_date',
+					esc_html__('Start time/date of Ticket', 'event_espresso'),
+					false,
+					EE_Datetime_Field::now,
+					$timezone
+				),
+				'TKT_end_date'    => new EE_Datetime_Field(
+					'TKT_end_date',
+					esc_html__('End time/date of Ticket', 'event_espresso'),
+					false,
+					EE_Datetime_Field::now,
+					$timezone
+				),
+				'TKT_min'         => new EE_Integer_Field(
+					'TKT_min',
+					esc_html__('Minimum quantity of this ticket that must be purchased', 'event_espresso'),
+					false,
+					0
+				),
+				'TKT_max'         => new EE_Infinite_Integer_Field(
+					'TKT_max',
+					esc_html__(
+						'Maximum quantity of this ticket that can be purchased in one transaction',
+						'event_espresso'
+					),
+					false,
+					EE_INF
+				),
+				'TKT_price'       => new EE_Money_Field(
+					'TKT_price',
+					esc_html__('Final calculated price for ticket', 'event_espresso'),
+					false,
+					0
+				),
+				'TKT_sold'        => new EE_Integer_Field(
+					'TKT_sold',
+					esc_html__('Number of this ticket sold', 'event_espresso'),
+					false,
+					0
+				),
+				'TKT_qty'         => new EE_Infinite_Integer_Field(
+					'TKT_qty',
+					esc_html__('Quantity of this ticket that is available', 'event_espresso'),
+					false,
+					EE_INF
+				),
+				'TKT_reserved'    => new EE_Integer_Field(
+					'TKT_reserved',
+					esc_html__(
+						'Quantity of this ticket that is reserved, but not yet fully purchased',
+						'event_espresso'
+					),
+					false,
+					0
+				),
+				'TKT_uses'        => new EE_Infinite_Integer_Field(
+					'TKT_uses',
+					esc_html__('Number of datetimes this ticket can be used at', 'event_espresso'),
+					false,
+					EE_INF
+				),
+				'TKT_required'    => new EE_Boolean_Field(
+					'TKT_required',
+					esc_html__(
+						'Flag indicating whether this ticket must be purchased with a transaction',
+						'event_espresso'
+					),
+					false,
+					false
+				),
+				'TKT_taxable'     => new EE_Boolean_Field(
+					'TKT_taxable',
+					esc_html__(
+						'Flag indicating whether there is tax applied on this ticket',
+						'event_espresso'
+					),
+					false,
+					false
+				),
+				'TKT_is_default'  => new EE_Boolean_Field(
+					'TKT_is_default',
+					esc_html__('Flag indicating that this ticket is a default ticket', 'event_espresso'),
+					false,
+					false
+				),
+				'TKT_order'       => new EE_Integer_Field(
+					'TKT_order',
+					esc_html__(
+						'The order in which the Ticket is displayed in the editor (used for autosaves when the form doesn\'t have the ticket ID yet)',
+						'event_espresso'
+					),
+					false,
+					0
+				),
+				'TKT_row'         => new EE_Integer_Field(
+					'TKT_row',
+					esc_html__('How tickets are displayed in the ui', 'event_espresso'),
+					false,
+					0
+				),
+				'TKT_deleted'     => new EE_Trashed_Flag_Field(
+					'TKT_deleted',
+					esc_html__('Flag indicating if this has been archived or not', 'event_espresso'),
+					false,
+					false
+				),
+				'TKT_wp_user'     => new EE_WP_User_Field(
+					'TKT_wp_user',
+					esc_html__('Ticket Creator ID', 'event_espresso'),
+					false
+				),
+				'TKT_parent'      => new EE_Integer_Field(
+					'TKT_parent',
+					esc_html__(
+						'Indicates what TKT_ID is the parent of this TKT_ID (used in autosaves/revisions)',
+						'event_espresso'
+					),
+					true,
+					0
+				),
+				'TKT_reverse_calculate' => new EE_Boolean_Field(
+					'TKT_reverse_calculate',
+					esc_html__(
+						'Flag indicating whether ticket calculations should run in reverse and calculate the base ticket price from the provided ticket total.',
+						'event_espresso'
+					),
+					false,
+					false
+				),
+			),
+		);
+		$this->_model_relations = array(
+			'Datetime'        => new EE_HABTM_Relation('Datetime_Ticket'),
+			'Datetime_Ticket' => new EE_Has_Many_Relation(),
+			'Price'           => new EE_HABTM_Relation('Ticket_Price'),
+			'Ticket_Template' => new EE_Belongs_To_Relation(),
+			'Registration'    => new EE_Has_Many_Relation(),
+			'WP_User'         => new EE_Belongs_To_Relation(),
+		);
+		// this model is generally available for reading
+		$path_to_event = 'Datetime.Event';
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Default_Public(
+			'TKT_is_default',
+			$path_to_event
+		);
+		// account for default tickets in the caps
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Default_Protected(
+			'TKT_is_default',
+			$path_to_event
+		);
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Default_Protected(
+			'TKT_is_default',
+			$path_to_event
+		);
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Default_Protected(
+			'TKT_is_default',
+			$path_to_event
+		);
+		$this->model_chain_to_password = $path_to_event;
+		parent::__construct($timezone);
+	}
 
 
-    /**
-     * This returns all tickets that are defaults from the db
-     *
-     * @return EE_Ticket[]
-     * @throws EE_Error
-     */
-    public function get_all_default_tickets()
-    {
-        /** @type EE_Ticket[] $tickets */
-        $tickets = $this->get_all(array(array('TKT_is_default' => 1), 'order_by' => array('TKT_ID' => 'ASC')));
-        // we need to set the start date and end date to today's date and the start of the default dtt
-        return $this->_set_default_dates($tickets);
-    }
+	/**
+	 * This returns all tickets that are defaults from the db
+	 *
+	 * @return EE_Ticket[]
+	 * @throws EE_Error
+	 */
+	public function get_all_default_tickets()
+	{
+		/** @type EE_Ticket[] $tickets */
+		$tickets = $this->get_all(array(array('TKT_is_default' => 1), 'order_by' => array('TKT_ID' => 'ASC')));
+		// we need to set the start date and end date to today's date and the start of the default dtt
+		return $this->_set_default_dates($tickets);
+	}
 
 
-    /**
-     * sets up relevant start and end date for EE_Ticket (s)
-     *
-     * @param EE_Ticket[] $tickets
-     * @return EE_Ticket[]
-     * @throws EE_Error
-     */
-    private function _set_default_dates($tickets)
-    {
-        foreach ($tickets as $ticket) {
-            $ticket->set(
-                'TKT_start_date',
-                (int) $this->current_time_for_query('TKT_start_date', true)
-            );
-            $ticket->set(
-                'TKT_end_date',
-                (int) $this->current_time_for_query('TKT_end_date', true) + MONTH_IN_SECONDS
-            );
-            $ticket->set_end_time(
-                $this->convert_datetime_for_query(
-                    'TKT_end_date',
-                    '11:59 pm',
-                    'g:i a',
-                    $this->_timezone
-                )
-            );
-        }
-        return $tickets;
-    }
+	/**
+	 * sets up relevant start and end date for EE_Ticket (s)
+	 *
+	 * @param EE_Ticket[] $tickets
+	 * @return EE_Ticket[]
+	 * @throws EE_Error
+	 */
+	private function _set_default_dates($tickets)
+	{
+		foreach ($tickets as $ticket) {
+			$ticket->set(
+				'TKT_start_date',
+				(int) $this->current_time_for_query('TKT_start_date', true)
+			);
+			$ticket->set(
+				'TKT_end_date',
+				(int) $this->current_time_for_query('TKT_end_date', true) + MONTH_IN_SECONDS
+			);
+			$ticket->set_end_time(
+				$this->convert_datetime_for_query(
+					'TKT_end_date',
+					'11:59 pm',
+					'g:i a',
+					$this->_timezone
+				)
+			);
+		}
+		return $tickets;
+	}
 
 
-    /**
-     * Gets the total number of tickets available at a particular datetime (does
-     * NOT take int account the datetime's spaces available)
-     *
-     * @param int   $DTT_ID
-     * @param array $query_params
-     * @return int
-     */
-    public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array())
-    {
-        return EEM_Datetime::instance()->sum_tickets_currently_available_at_datetime($DTT_ID, $query_params);
-    }
+	/**
+	 * Gets the total number of tickets available at a particular datetime (does
+	 * NOT take int account the datetime's spaces available)
+	 *
+	 * @param int   $DTT_ID
+	 * @param array $query_params
+	 * @return int
+	 */
+	public function sum_tickets_currently_available_at_datetime($DTT_ID, $query_params = array())
+	{
+		return EEM_Datetime::instance()->sum_tickets_currently_available_at_datetime($DTT_ID, $query_params);
+	}
 
 
-    /**
-     * Updates the TKT_sold quantity on all the tickets matching $query_params
-     *
-     * @param EE_Ticket[] $tickets
-     * @return void
-     * @throws EE_Error
-     */
-    public function update_tickets_sold($tickets)
-    {
-        foreach ($tickets as $ticket) {
-            /* @var  $ticket EE_Ticket */
-            $ticket->update_tickets_sold();
-        }
-    }
+	/**
+	 * Updates the TKT_sold quantity on all the tickets matching $query_params
+	 *
+	 * @param EE_Ticket[] $tickets
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function update_tickets_sold($tickets)
+	{
+		foreach ($tickets as $ticket) {
+			/* @var  $ticket EE_Ticket */
+			$ticket->update_tickets_sold();
+		}
+	}
 
 
-    /**
-     * returns an array of EE_Ticket objects with a non-zero value for TKT_reserved
-     *
-     * @return EE_Base_Class[]|EE_Ticket[]
-     * @throws EE_Error
-     */
-    public function get_tickets_with_reservations()
-    {
-        return $this->get_all(
-            array(
-                array(
-                    'TKT_reserved' => array('>', 0),
-                ),
-            )
-        );
-    }
+	/**
+	 * returns an array of EE_Ticket objects with a non-zero value for TKT_reserved
+	 *
+	 * @return EE_Base_Class[]|EE_Ticket[]
+	 * @throws EE_Error
+	 */
+	public function get_tickets_with_reservations()
+	{
+		return $this->get_all(
+			array(
+				array(
+					'TKT_reserved' => array('>', 0),
+				),
+			)
+		);
+	}
 
 
-    /**
-     * returns an array of EE_Ticket objects matching the supplied list of IDs
-     *
-     * @param array $ticket_IDs
-     * @return EE_Base_Class[]|EE_Ticket[]
-     * @throws EE_Error
-     */
-    public function get_tickets_with_IDs(array $ticket_IDs)
-    {
-        return $this->get_all(
-            array(
-                array(
-                    'TKT_ID' => array('IN', $ticket_IDs),
-                ),
-            )
-        );
-    }
+	/**
+	 * returns an array of EE_Ticket objects matching the supplied list of IDs
+	 *
+	 * @param array $ticket_IDs
+	 * @return EE_Base_Class[]|EE_Ticket[]
+	 * @throws EE_Error
+	 */
+	public function get_tickets_with_IDs(array $ticket_IDs)
+	{
+		return $this->get_all(
+			array(
+				array(
+					'TKT_ID' => array('IN', $ticket_IDs),
+				),
+			)
+		);
+	}
 }

core/db_models/EEM_Transaction.model.php

Indentation +450 added lines, -450 removed lines

@@ -16,230 +16,230 @@ 
 class EEM_Transaction extends EEM_Base
 {
 
-    // private instance of the Transaction object
-    protected static $_instance;
-
-    /**
-     * Status ID(STS_ID on esp_status table) to indicate the transaction is complete,
-     * but payment is pending. This is the state for transactions where payment is promised
-     * from an offline gateway.
-     */
-    //  const open_status_code = 'TPN';
-
-    /**
-     * Status ID(STS_ID on esp_status table) to indicate the transaction failed,
-     * either due to a technical reason (server or computer crash during registration),
-     *  or some other reason that prevent the collection of any useful contact information from any of the registrants
-     */
-    const failed_status_code = 'TFL';
-
-    /**
-     * Status ID(STS_ID on esp_status table) to indicate the transaction was abandoned,
-     * either due to a technical reason (server or computer crash during registration),
-     * or due to an abandoned cart after registrant chose not to complete the registration process
-     * HOWEVER...
-     * an abandoned TXN differs from a failed TXN in that it was able to capture contact information for at least one
-     * registrant
-     */
-    const abandoned_status_code = 'TAB';
-
-    /**
-     * Status ID(STS_ID on esp_status table) to indicate an incomplete transaction,
-     * meaning that monies are still owing: TXN_paid < TXN_total
-     */
-    const incomplete_status_code = 'TIN';
-
-    /**
-     * Status ID (STS_ID on esp_status table) to indicate a complete transaction.
-     * meaning that NO monies are owing: TXN_paid == TXN_total
-     */
-    const complete_status_code = 'TCM';
-
-    /**
-     *  Status ID(STS_ID on esp_status table) to indicate the transaction is overpaid.
-     *  This is the same as complete, but site admins actually owe clients the moneys!  TXN_paid > TXN_total
-     */
-    const overpaid_status_code = 'TOP';
-
-
-    /**
-     *    private constructor to prevent direct creation
-     *
-     * @Constructor
-     * @access protected
-     *
-     * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any
-     *                         incoming timezone data that gets saved). Note this just sends the timezone info to the
-     *                         date time model field objects.  Default is NULL (and will be assumed using the set
-     *                         timezone in the 'timezone_string' wp option)
-     *
-     * @return EEM_Transaction
-     * @throws \EE_Error
-     */
-    protected function __construct($timezone)
-    {
-        $this->singular_item = __('Transaction', 'event_espresso');
-        $this->plural_item   = __('Transactions', 'event_espresso');
-
-        $this->_tables                 = array(
-            'TransactionTable' => new EE_Primary_Table('esp_transaction', 'TXN_ID')
-        );
-        $this->_fields                 = array(
-            'TransactionTable' => array(
-                'TXN_ID'           => new EE_Primary_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso')),
-                'TXN_timestamp'    => new EE_Datetime_Field(
-                    'TXN_timestamp',
-                    __('date when transaction was created', 'event_espresso'),
-                    false,
-                    EE_Datetime_Field::now,
-                    $timezone
-                ),
-                'TXN_total'        => new EE_Money_Field(
-                    'TXN_total',
-                    __('Total value of Transaction', 'event_espresso'),
-                    false,
-                    0
-                ),
-                'TXN_paid'         => new EE_Money_Field(
-                    'TXN_paid',
-                    __('Amount paid towards transaction to date', 'event_espresso'),
-                    false,
-                    0
-                ),
-                'STS_ID'           => new EE_Foreign_Key_String_Field(
-                    'STS_ID',
-                    __('Status ID', 'event_espresso'),
-                    false,
-                    EEM_Transaction::failed_status_code,
-                    'Status'
-                ),
-                'TXN_session_data' => new EE_Serialized_Text_Field(
-                    'TXN_session_data',
-                    __('Serialized session data', 'event_espresso'),
-                    true,
-                    ''
-                ),
-                'TXN_hash_salt'    => new EE_Plain_Text_Field(
-                    'TXN_hash_salt',
-                    __('Transaction Hash Salt', 'event_espresso'),
-                    true,
-                    ''
-                ),
-                'PMD_ID'           => new EE_Foreign_Key_Int_Field(
-                    'PMD_ID',
-                    __("Last Used Payment Method", 'event_espresso'),
-                    true,
-                    null,
-                    'Payment_Method'
-                ),
-                'TXN_reg_steps'    => new EE_Serialized_Text_Field(
-                    'TXN_reg_steps',
-                    __('Registration Steps', 'event_espresso'),
-                    false,
-                    array()
-                ),
-            )
-        );
-        $this->_model_relations        = array(
-            'Registration'   => new EE_Has_Many_Relation(),
-            'Payment'        => new EE_Has_Many_Relation(),
-            'Status'         => new EE_Belongs_To_Relation(),
-            'Line_Item'      => new EE_Has_Many_Relation(false),
-            // you can delete a transaction without needing to delete its line items
-            'Payment_Method' => new EE_Belongs_To_Relation(),
-            'Message'        => new EE_Has_Many_Relation()
-        );
-        $this->_model_chain_to_wp_user = 'Registration.Event';
-        parent::__construct($timezone);
-    }
-
-
-    /**
-     *    txn_status_array
-     * get list of transaction statuses
-     *
-     * @access public
-     * @return array
-     */
-    public static function txn_status_array()
-    {
-        return apply_filters(
-            'FHEE__EEM_Transaction__txn_status_array',
-            array(
-                EEM_Transaction::overpaid_status_code,
-                EEM_Transaction::complete_status_code,
-                EEM_Transaction::incomplete_status_code,
-                EEM_Transaction::abandoned_status_code,
-                EEM_Transaction::failed_status_code,
-            )
-        );
-    }
-
-    /**
-     *        get the revenue per day  for the Transaction Admin page Reports Tab
-     *
-     * @access        public
-     *
-     * @param string $period
-     *
-     * @return \stdClass[]
-     */
-    public function get_revenue_per_day_report($period = '-1 month')
-    {
-        $sql_date = $this->convert_datetime_for_query(
-            'TXN_timestamp',
-            date('Y-m-d H:i:s', strtotime($period)),
-            'Y-m-d H:i:s',
-            'UTC'
-        );
-
-        $query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'TXN_timestamp');
-
-        return $this->_get_all_wpdb_results(
-            array(
-                array(
-                    'TXN_timestamp' => array('>=', $sql_date)
-                ),
-                'group_by' => 'txnDate',
-                'order_by' => array('TXN_timestamp' => 'ASC')
-            ),
-            OBJECT,
-            array(
-                'txnDate' => array('DATE(' . $query_interval . ')', '%s'),
-                'revenue' => array('SUM(TransactionTable.TXN_paid)', '%d')
-            )
-        );
-    }
-
-
-    /**
-     *        get the revenue per event  for the Transaction Admin page Reports Tab
-     *
-     * @access        public
-     *
-     * @param string $period
-     *
-     * @throws \EE_Error
-     * @return mixed
-     */
-    public function get_revenue_per_event_report($period = '-1 month')
-    {
-        global $wpdb;
-        $transaction_table          = $wpdb->prefix . 'esp_transaction';
-        $registration_table         = $wpdb->prefix . 'esp_registration';
-        $registration_payment_table = $wpdb->prefix . 'esp_registration_payment';
-        $event_table                = $wpdb->posts;
-        $payment_table              = $wpdb->prefix . 'esp_payment';
-        $sql_date                   = date('Y-m-d H:i:s', strtotime($period));
-        $approved_payment_status    = EEM_Payment::status_id_approved;
-        $extra_event_on_join        = '';
-        // exclude events not authored by user if permissions in effect
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
-            $extra_event_on_join = ' AND Event.post_author = ' . get_current_user_id();
-        }
-
-        return $wpdb->get_results(
-            "SELECT
+	// private instance of the Transaction object
+	protected static $_instance;
+
+	/**
+	 * Status ID(STS_ID on esp_status table) to indicate the transaction is complete,
+	 * but payment is pending. This is the state for transactions where payment is promised
+	 * from an offline gateway.
+	 */
+	//  const open_status_code = 'TPN';
+
+	/**
+	 * Status ID(STS_ID on esp_status table) to indicate the transaction failed,
+	 * either due to a technical reason (server or computer crash during registration),
+	 *  or some other reason that prevent the collection of any useful contact information from any of the registrants
+	 */
+	const failed_status_code = 'TFL';
+
+	/**
+	 * Status ID(STS_ID on esp_status table) to indicate the transaction was abandoned,
+	 * either due to a technical reason (server or computer crash during registration),
+	 * or due to an abandoned cart after registrant chose not to complete the registration process
+	 * HOWEVER...
+	 * an abandoned TXN differs from a failed TXN in that it was able to capture contact information for at least one
+	 * registrant
+	 */
+	const abandoned_status_code = 'TAB';
+
+	/**
+	 * Status ID(STS_ID on esp_status table) to indicate an incomplete transaction,
+	 * meaning that monies are still owing: TXN_paid < TXN_total
+	 */
+	const incomplete_status_code = 'TIN';
+
+	/**
+	 * Status ID (STS_ID on esp_status table) to indicate a complete transaction.
+	 * meaning that NO monies are owing: TXN_paid == TXN_total
+	 */
+	const complete_status_code = 'TCM';
+
+	/**
+	 *  Status ID(STS_ID on esp_status table) to indicate the transaction is overpaid.
+	 *  This is the same as complete, but site admins actually owe clients the moneys!  TXN_paid > TXN_total
+	 */
+	const overpaid_status_code = 'TOP';
+
+
+	/**
+	 *    private constructor to prevent direct creation
+	 *
+	 * @Constructor
+	 * @access protected
+	 *
+	 * @param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any
+	 *                         incoming timezone data that gets saved). Note this just sends the timezone info to the
+	 *                         date time model field objects.  Default is NULL (and will be assumed using the set
+	 *                         timezone in the 'timezone_string' wp option)
+	 *
+	 * @return EEM_Transaction
+	 * @throws \EE_Error
+	 */
+	protected function __construct($timezone)
+	{
+		$this->singular_item = __('Transaction', 'event_espresso');
+		$this->plural_item   = __('Transactions', 'event_espresso');
+
+		$this->_tables                 = array(
+			'TransactionTable' => new EE_Primary_Table('esp_transaction', 'TXN_ID')
+		);
+		$this->_fields                 = array(
+			'TransactionTable' => array(
+				'TXN_ID'           => new EE_Primary_Key_Int_Field('TXN_ID', __('Transaction ID', 'event_espresso')),
+				'TXN_timestamp'    => new EE_Datetime_Field(
+					'TXN_timestamp',
+					__('date when transaction was created', 'event_espresso'),
+					false,
+					EE_Datetime_Field::now,
+					$timezone
+				),
+				'TXN_total'        => new EE_Money_Field(
+					'TXN_total',
+					__('Total value of Transaction', 'event_espresso'),
+					false,
+					0
+				),
+				'TXN_paid'         => new EE_Money_Field(
+					'TXN_paid',
+					__('Amount paid towards transaction to date', 'event_espresso'),
+					false,
+					0
+				),
+				'STS_ID'           => new EE_Foreign_Key_String_Field(
+					'STS_ID',
+					__('Status ID', 'event_espresso'),
+					false,
+					EEM_Transaction::failed_status_code,
+					'Status'
+				),
+				'TXN_session_data' => new EE_Serialized_Text_Field(
+					'TXN_session_data',
+					__('Serialized session data', 'event_espresso'),
+					true,
+					''
+				),
+				'TXN_hash_salt'    => new EE_Plain_Text_Field(
+					'TXN_hash_salt',
+					__('Transaction Hash Salt', 'event_espresso'),
+					true,
+					''
+				),
+				'PMD_ID'           => new EE_Foreign_Key_Int_Field(
+					'PMD_ID',
+					__("Last Used Payment Method", 'event_espresso'),
+					true,
+					null,
+					'Payment_Method'
+				),
+				'TXN_reg_steps'    => new EE_Serialized_Text_Field(
+					'TXN_reg_steps',
+					__('Registration Steps', 'event_espresso'),
+					false,
+					array()
+				),
+			)
+		);
+		$this->_model_relations        = array(
+			'Registration'   => new EE_Has_Many_Relation(),
+			'Payment'        => new EE_Has_Many_Relation(),
+			'Status'         => new EE_Belongs_To_Relation(),
+			'Line_Item'      => new EE_Has_Many_Relation(false),
+			// you can delete a transaction without needing to delete its line items
+			'Payment_Method' => new EE_Belongs_To_Relation(),
+			'Message'        => new EE_Has_Many_Relation()
+		);
+		$this->_model_chain_to_wp_user = 'Registration.Event';
+		parent::__construct($timezone);
+	}
+
+
+	/**
+	 *    txn_status_array
+	 * get list of transaction statuses
+	 *
+	 * @access public
+	 * @return array
+	 */
+	public static function txn_status_array()
+	{
+		return apply_filters(
+			'FHEE__EEM_Transaction__txn_status_array',
+			array(
+				EEM_Transaction::overpaid_status_code,
+				EEM_Transaction::complete_status_code,
+				EEM_Transaction::incomplete_status_code,
+				EEM_Transaction::abandoned_status_code,
+				EEM_Transaction::failed_status_code,
+			)
+		);
+	}
+
+	/**
+	 *        get the revenue per day  for the Transaction Admin page Reports Tab
+	 *
+	 * @access        public
+	 *
+	 * @param string $period
+	 *
+	 * @return \stdClass[]
+	 */
+	public function get_revenue_per_day_report($period = '-1 month')
+	{
+		$sql_date = $this->convert_datetime_for_query(
+			'TXN_timestamp',
+			date('Y-m-d H:i:s', strtotime($period)),
+			'Y-m-d H:i:s',
+			'UTC'
+		);
+
+		$query_interval = EEH_DTT_Helper::get_sql_query_interval_for_offset($this->get_timezone(), 'TXN_timestamp');
+
+		return $this->_get_all_wpdb_results(
+			array(
+				array(
+					'TXN_timestamp' => array('>=', $sql_date)
+				),
+				'group_by' => 'txnDate',
+				'order_by' => array('TXN_timestamp' => 'ASC')
+			),
+			OBJECT,
+			array(
+				'txnDate' => array('DATE(' . $query_interval . ')', '%s'),
+				'revenue' => array('SUM(TransactionTable.TXN_paid)', '%d')
+			)
+		);
+	}
+
+
+	/**
+	 *        get the revenue per event  for the Transaction Admin page Reports Tab
+	 *
+	 * @access        public
+	 *
+	 * @param string $period
+	 *
+	 * @throws \EE_Error
+	 * @return mixed
+	 */
+	public function get_revenue_per_event_report($period = '-1 month')
+	{
+		global $wpdb;
+		$transaction_table          = $wpdb->prefix . 'esp_transaction';
+		$registration_table         = $wpdb->prefix . 'esp_registration';
+		$registration_payment_table = $wpdb->prefix . 'esp_registration_payment';
+		$event_table                = $wpdb->posts;
+		$payment_table              = $wpdb->prefix . 'esp_payment';
+		$sql_date                   = date('Y-m-d H:i:s', strtotime($period));
+		$approved_payment_status    = EEM_Payment::status_id_approved;
+		$extra_event_on_join        = '';
+		// exclude events not authored by user if permissions in effect
+		if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
+			$extra_event_on_join = ' AND Event.post_author = ' . get_current_user_id();
+		}
+
+		return $wpdb->get_results(
+			"SELECT
 			Transaction_Event.event_name AS event_name,
 			SUM(Transaction_Event.paid) AS revenue
 			FROM
@@ -267,231 +267,231 @@ 
 					$extra_event_on_join
 				) AS Transaction_Event
 			GROUP BY event_name",
-            OBJECT
-        );
-    }
-
-
-    /**
-     * Gets the current transaction given the reg_url_link, or assumes the reg_url_link is in the
-     * $_REQUEST global variable. Either way, tries to find the current transaction (through
-     * the registration pointed to by reg_url_link), if not returns null
-     *
-     * @param string $reg_url_link
-     *
-     * @return EE_Transaction
-     */
-    public function get_transaction_from_reg_url_link($reg_url_link = '')
-    {
-        return $this->get_one(array(
-            array(
-                'Registration.REG_url_link' => ! empty($reg_url_link) ? $reg_url_link : EE_Registry::instance()->REQ->get(
-                    'e_reg_url_link',
-                    ''
-                )
-            )
-        ));
-    }
-
-
-    /**
-     * Updates the provided EE_Transaction with all the applicable payments
-     * (or fetch the EE_Transaction from its ID)
-     *
-     * @deprecated
-     *
-     * @param EE_Transaction|int $transaction_obj_or_id
-     * @param boolean            $save_txn whether or not to save the transaction during this function call
-     *
-     * @return boolean
-     * @throws \EE_Error
-     */
-    public function update_based_on_payments($transaction_obj_or_id, $save_txn = true)
-    {
-        EE_Error::doing_it_wrong(
-            __CLASS__ . '::' . __FUNCTION__,
-            sprintf(
-                __('This method is deprecated. Please use "%s" instead', 'event_espresso'),
-                'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()'
-            ),
-            '4.6.0'
-        );
-        /** @type EE_Transaction_Processor $transaction_processor */
-        $transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
-
-        return $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment(
-            $this->ensure_is_obj($transaction_obj_or_id)
-        );
-    }
-
-    /**
-     * Deletes "junk" transactions that were probably added by bots. There might be TONS
-     * of these, so we are very careful to NOT select (which the models do even when deleting),
-     * and so we only use wpdb directly and only do minimal joins.
-     * Transactions are considered "junk" if they're failed for longer than a week.
-     * Also, there is an extra check for payments related to the transaction, because if a transaction has a payment on
-     * it, it's probably not junk (regardless of what status it has).
-     * The downside to this approach is that is addons are listening for object deletions
-     * on EEM_Base::delete() they won't be notified of this.  However, there is an action that plugins can hook into
-     * to catch these types of deletions.
-     *
-     * @global WPDB $wpdb
-     * @return mixed
-     */
-    public function delete_junk_transactions()
-    {
-        /** @type WPDB $wpdb */
-        global $wpdb;
-        $deleted             = false;
-        $time_to_leave_alone = apply_filters(
-            'FHEE__EEM_Transaction__delete_junk_transactions__time_to_leave_alone',
-            WEEK_IN_SECONDS
-        );
-
-
-        /**
-         * This allows code to filter the query arguments used for retrieving the transaction IDs to delete.
-         * Useful for plugins that want to exclude transactions matching certain query parameters.
-         * The query parameters should be in the format accepted by the EEM_Base model queries.
-         */
-        $ids_query = apply_filters(
-            'FHEE__EEM_Transaction__delete_junk_transactions__initial_query_args',
-            array(
-                0 => array(
-                    'STS_ID'        => EEM_Transaction::failed_status_code,
-                    'Payment.PAY_ID' => array( 'IS NULL' ),
-                    'TXN_timestamp' => array('<', time() - $time_to_leave_alone)
-                )
-            ),
-            $time_to_leave_alone
-        );
-
-
-        /**
-         * This filter is for when code needs to filter the list of transaction ids that represent transactions
-         * about to be deleted based on some other criteria that isn't easily done via the query args filter.
-         */
-        $txn_ids = apply_filters(
-            'FHEE__EEM_Transaction__delete_junk_transactions__transaction_ids_to_delete',
-            EEM_Transaction::instance()->get_col($ids_query, 'TXN_ID'),
-            $time_to_leave_alone
-        );
-        // now that we have the ids to delete
-        if (! empty($txn_ids) && is_array($txn_ids)) {
-            // first, make sure these TXN's are removed the "ee_locked_transactions" array
-            EEM_Transaction::unset_locked_transactions($txn_ids);
-
-            // Create IDs placeholder.
-            $placeholders = array_fill(0, count($txn_ids), '%d');
+			OBJECT
+		);
+	}
+
+
+	/**
+	 * Gets the current transaction given the reg_url_link, or assumes the reg_url_link is in the
+	 * $_REQUEST global variable. Either way, tries to find the current transaction (through
+	 * the registration pointed to by reg_url_link), if not returns null
+	 *
+	 * @param string $reg_url_link
+	 *
+	 * @return EE_Transaction
+	 */
+	public function get_transaction_from_reg_url_link($reg_url_link = '')
+	{
+		return $this->get_one(array(
+			array(
+				'Registration.REG_url_link' => ! empty($reg_url_link) ? $reg_url_link : EE_Registry::instance()->REQ->get(
+					'e_reg_url_link',
+					''
+				)
+			)
+		));
+	}
+
+
+	/**
+	 * Updates the provided EE_Transaction with all the applicable payments
+	 * (or fetch the EE_Transaction from its ID)
+	 *
+	 * @deprecated
+	 *
+	 * @param EE_Transaction|int $transaction_obj_or_id
+	 * @param boolean            $save_txn whether or not to save the transaction during this function call
+	 *
+	 * @return boolean
+	 * @throws \EE_Error
+	 */
+	public function update_based_on_payments($transaction_obj_or_id, $save_txn = true)
+	{
+		EE_Error::doing_it_wrong(
+			__CLASS__ . '::' . __FUNCTION__,
+			sprintf(
+				__('This method is deprecated. Please use "%s" instead', 'event_espresso'),
+				'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()'
+			),
+			'4.6.0'
+		);
+		/** @type EE_Transaction_Processor $transaction_processor */
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+
+		return $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment(
+			$this->ensure_is_obj($transaction_obj_or_id)
+		);
+	}
+
+	/**
+	 * Deletes "junk" transactions that were probably added by bots. There might be TONS
+	 * of these, so we are very careful to NOT select (which the models do even when deleting),
+	 * and so we only use wpdb directly and only do minimal joins.
+	 * Transactions are considered "junk" if they're failed for longer than a week.
+	 * Also, there is an extra check for payments related to the transaction, because if a transaction has a payment on
+	 * it, it's probably not junk (regardless of what status it has).
+	 * The downside to this approach is that is addons are listening for object deletions
+	 * on EEM_Base::delete() they won't be notified of this.  However, there is an action that plugins can hook into
+	 * to catch these types of deletions.
+	 *
+	 * @global WPDB $wpdb
+	 * @return mixed
+	 */
+	public function delete_junk_transactions()
+	{
+		/** @type WPDB $wpdb */
+		global $wpdb;
+		$deleted             = false;
+		$time_to_leave_alone = apply_filters(
+			'FHEE__EEM_Transaction__delete_junk_transactions__time_to_leave_alone',
+			WEEK_IN_SECONDS
+		);
+
+
+		/**
+		 * This allows code to filter the query arguments used for retrieving the transaction IDs to delete.
+		 * Useful for plugins that want to exclude transactions matching certain query parameters.
+		 * The query parameters should be in the format accepted by the EEM_Base model queries.
+		 */
+		$ids_query = apply_filters(
+			'FHEE__EEM_Transaction__delete_junk_transactions__initial_query_args',
+			array(
+				0 => array(
+					'STS_ID'        => EEM_Transaction::failed_status_code,
+					'Payment.PAY_ID' => array( 'IS NULL' ),
+					'TXN_timestamp' => array('<', time() - $time_to_leave_alone)
+				)
+			),
+			$time_to_leave_alone
+		);
+
+
+		/**
+		 * This filter is for when code needs to filter the list of transaction ids that represent transactions
+		 * about to be deleted based on some other criteria that isn't easily done via the query args filter.
+		 */
+		$txn_ids = apply_filters(
+			'FHEE__EEM_Transaction__delete_junk_transactions__transaction_ids_to_delete',
+			EEM_Transaction::instance()->get_col($ids_query, 'TXN_ID'),
+			$time_to_leave_alone
+		);
+		// now that we have the ids to delete
+		if (! empty($txn_ids) && is_array($txn_ids)) {
+			// first, make sure these TXN's are removed the "ee_locked_transactions" array
+			EEM_Transaction::unset_locked_transactions($txn_ids);
+
+			// Create IDs placeholder.
+			$placeholders = array_fill(0, count($txn_ids), '%d');
             
-            // Glue it together to use inside $wpdb->prepare.
-            $format = implode(', ', $placeholders);
-
-            // let's get deletin'...
-            // We got the ids from the original query to get them FROM
-            // the db (which is sanitized) so no need to prepare them again.
-            $query   = $wpdb->prepare("DELETE FROM " . $this->table() . " WHERE TXN_ID IN ( $format )", $txn_ids);
-            $deleted = $wpdb->query($query);
-        }
-        if ($deleted) {
-            /**
-             * Allows code to do something after the transactions have been deleted.
-             */
-            do_action('AHEE__EEM_Transaction__delete_junk_transactions__successful_deletion', $txn_ids);
-        }
-
-        return $deleted;
-    }
-
-
-    /**
-     * @param array $transaction_IDs
-     *
-     * @return bool
-     */
-    public static function unset_locked_transactions(array $transaction_IDs)
-    {
-        $locked_transactions = get_option('ee_locked_transactions', array());
-        $update              = false;
-        foreach ($transaction_IDs as $TXN_ID) {
-            if (isset($locked_transactions[ $TXN_ID ])) {
-                unset($locked_transactions[ $TXN_ID ]);
-                $update = true;
-            }
-        }
-        if ($update) {
-            update_option('ee_locked_transactions', $locked_transactions);
-        }
-
-        return $update;
-    }
-
-
-
-    /**
-     * returns an array of EE_Transaction objects whose timestamp is greater than
-     * the current time minus the session lifespan, which defaults to 60 minutes
-     *
-     * @return EE_Base_Class[]|EE_Transaction[]
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function get_transactions_in_progress()
-    {
-        return $this->_get_transactions_in_progress();
-    }
-
-
-
-    /**
-     * returns an array of EE_Transaction objects whose timestamp is less than
-     * the current time minus the session lifespan, which defaults to 60 minutes
-     *
-     * @return EE_Base_Class[]|EE_Transaction[]
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function get_transactions_not_in_progress()
-    {
-        return $this->_get_transactions_in_progress('<=');
-    }
-
-
-
-    /**
-     * @param string $comparison
-     * @return EE_Base_Class[]|EE_Transaction[]
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function _get_transactions_in_progress($comparison = '>=')
-    {
-        $comparison = $comparison === '>=' || $comparison === '<='
-            ? $comparison
-            : '>=';
-        /** @var EventEspresso\core\domain\values\session\SessionLifespan $session_lifespan */
-        $session_lifespan = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\values\session\SessionLifespan'
-        );
-        return $this->get_all(
-            array(
-                array(
-                    'TXN_timestamp' => array(
-                        $comparison,
-                        $session_lifespan->expiration()
-                    ),
-                    'STS_ID' => array(
-                        '!=',
-                        EEM_Transaction::complete_status_code
-                    ),
-                )
-            )
-        );
-    }
+			// Glue it together to use inside $wpdb->prepare.
+			$format = implode(', ', $placeholders);
+
+			// let's get deletin'...
+			// We got the ids from the original query to get them FROM
+			// the db (which is sanitized) so no need to prepare them again.
+			$query   = $wpdb->prepare("DELETE FROM " . $this->table() . " WHERE TXN_ID IN ( $format )", $txn_ids);
+			$deleted = $wpdb->query($query);
+		}
+		if ($deleted) {
+			/**
+			 * Allows code to do something after the transactions have been deleted.
+			 */
+			do_action('AHEE__EEM_Transaction__delete_junk_transactions__successful_deletion', $txn_ids);
+		}
+
+		return $deleted;
+	}
+
+
+	/**
+	 * @param array $transaction_IDs
+	 *
+	 * @return bool
+	 */
+	public static function unset_locked_transactions(array $transaction_IDs)
+	{
+		$locked_transactions = get_option('ee_locked_transactions', array());
+		$update              = false;
+		foreach ($transaction_IDs as $TXN_ID) {
+			if (isset($locked_transactions[ $TXN_ID ])) {
+				unset($locked_transactions[ $TXN_ID ]);
+				$update = true;
+			}
+		}
+		if ($update) {
+			update_option('ee_locked_transactions', $locked_transactions);
+		}
+
+		return $update;
+	}
+
+
+
+	/**
+	 * returns an array of EE_Transaction objects whose timestamp is greater than
+	 * the current time minus the session lifespan, which defaults to 60 minutes
+	 *
+	 * @return EE_Base_Class[]|EE_Transaction[]
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function get_transactions_in_progress()
+	{
+		return $this->_get_transactions_in_progress();
+	}
+
+
+
+	/**
+	 * returns an array of EE_Transaction objects whose timestamp is less than
+	 * the current time minus the session lifespan, which defaults to 60 minutes
+	 *
+	 * @return EE_Base_Class[]|EE_Transaction[]
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function get_transactions_not_in_progress()
+	{
+		return $this->_get_transactions_in_progress('<=');
+	}
+
+
+
+	/**
+	 * @param string $comparison
+	 * @return EE_Base_Class[]|EE_Transaction[]
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function _get_transactions_in_progress($comparison = '>=')
+	{
+		$comparison = $comparison === '>=' || $comparison === '<='
+			? $comparison
+			: '>=';
+		/** @var EventEspresso\core\domain\values\session\SessionLifespan $session_lifespan */
+		$session_lifespan = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\values\session\SessionLifespan'
+		);
+		return $this->get_all(
+			array(
+				array(
+					'TXN_timestamp' => array(
+						$comparison,
+						$session_lifespan->expiration()
+					),
+					'STS_ID' => array(
+						'!=',
+						EEM_Transaction::complete_status_code
+					),
+				)
+			)
+		);
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -140,7 +140,7 @@ 
                 ),
             )
         );
-        $this->_model_relations        = array(
+        $this->_model_relations = array(
             'Registration'   => new EE_Has_Many_Relation(),
             'Payment'        => new EE_Has_Many_Relation(),
             'Status'         => new EE_Belongs_To_Relation(),
@@ -205,7 +205,7 @@ 
             ),
             OBJECT,
             array(
-                'txnDate' => array('DATE(' . $query_interval . ')', '%s'),
+                'txnDate' => array('DATE('.$query_interval.')', '%s'),
                 'revenue' => array('SUM(TransactionTable.TXN_paid)', '%d')
             )
         );
@@ -225,17 +225,17 @@ 
     public function get_revenue_per_event_report($period = '-1 month')
     {
         global $wpdb;
-        $transaction_table          = $wpdb->prefix . 'esp_transaction';
-        $registration_table         = $wpdb->prefix . 'esp_registration';
-        $registration_payment_table = $wpdb->prefix . 'esp_registration_payment';
+        $transaction_table          = $wpdb->prefix.'esp_transaction';
+        $registration_table         = $wpdb->prefix.'esp_registration';
+        $registration_payment_table = $wpdb->prefix.'esp_registration_payment';
         $event_table                = $wpdb->posts;
-        $payment_table              = $wpdb->prefix . 'esp_payment';
+        $payment_table              = $wpdb->prefix.'esp_payment';
         $sql_date                   = date('Y-m-d H:i:s', strtotime($period));
         $approved_payment_status    = EEM_Payment::status_id_approved;
         $extra_event_on_join        = '';
         // exclude events not authored by user if permissions in effect
-        if (! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
-            $extra_event_on_join = ' AND Event.post_author = ' . get_current_user_id();
+        if ( ! EE_Registry::instance()->CAP->current_user_can('ee_read_others_registrations', 'reg_per_event_report')) {
+            $extra_event_on_join = ' AND Event.post_author = '.get_current_user_id();
         }
 
         return $wpdb->get_results(
@@ -309,7 +309,7 @@ 
     public function update_based_on_payments($transaction_obj_or_id, $save_txn = true)
     {
         EE_Error::doing_it_wrong(
-            __CLASS__ . '::' . __FUNCTION__,
+            __CLASS__.'::'.__FUNCTION__,
             sprintf(
                 __('This method is deprecated. Please use "%s" instead', 'event_espresso'),
                 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()'
@@ -359,7 +359,7 @@ 
             array(
                 0 => array(
                     'STS_ID'        => EEM_Transaction::failed_status_code,
-                    'Payment.PAY_ID' => array( 'IS NULL' ),
+                    'Payment.PAY_ID' => array('IS NULL'),
                     'TXN_timestamp' => array('<', time() - $time_to_leave_alone)
                 )
             ),
@@ -377,7 +377,7 @@ 
             $time_to_leave_alone
         );
         // now that we have the ids to delete
-        if (! empty($txn_ids) && is_array($txn_ids)) {
+        if ( ! empty($txn_ids) && is_array($txn_ids)) {
             // first, make sure these TXN's are removed the "ee_locked_transactions" array
             EEM_Transaction::unset_locked_transactions($txn_ids);
 
@@ -390,7 +390,7 @@ 
             // let's get deletin'...
             // We got the ids from the original query to get them FROM
             // the db (which is sanitized) so no need to prepare them again.
-            $query   = $wpdb->prepare("DELETE FROM " . $this->table() . " WHERE TXN_ID IN ( $format )", $txn_ids);
+            $query   = $wpdb->prepare("DELETE FROM ".$this->table()." WHERE TXN_ID IN ( $format )", $txn_ids);
             $deleted = $wpdb->query($query);
         }
         if ($deleted) {
@@ -414,8 +414,8 @@ 
         $locked_transactions = get_option('ee_locked_transactions', array());
         $update              = false;
         foreach ($transaction_IDs as $TXN_ID) {
-            if (isset($locked_transactions[ $TXN_ID ])) {
-                unset($locked_transactions[ $TXN_ID ]);
+            if (isset($locked_transactions[$TXN_ID])) {
+                unset($locked_transactions[$TXN_ID]);
                 $update = true;
             }
         }

core/EE_Log.core.php

Indentation +192 added lines, -192 removed lines

@@ -17,196 +17,196 @@
 class EE_Log
 {
 
-    /**
-     * @var string
-     */
-    private $_log = '';
-
-    /**
-     * Used for remote logging
-     *
-     * @var string
-     */
-    private $_remote_logging_url = '';
-
-    /**
-     * @var string
-     */
-    private $_remote_log = '';
-
-    /**
-     * @var EE_Log
-     */
-    private static $_instance;
-
-
-    /**
-     * @return EE_Log
-     */
-    public static function instance()
-    {
-        if (! self::$_instance instanceof EE_Log) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-    /**
-     * @access private
-     * @return EE_Log
-     */
-    private function __construct()
-    {
-
-        if (! EE_Registry::instance()->CFG->admin->use_remote_logging) {
-            return;
-        }
-
-        $this->_remote_logging_url = EE_Registry::instance()->CFG->admin->remote_logging_url;
-        $this->_remote_log = '';
-
-        if (EE_Registry::instance()->CFG->admin->use_remote_logging) {
-            add_action('shutdown', array($this, 'send_log'), 9999);
-        }
-    }
-
-
-    /**
-     *    verify_filesystem
-     * tests that the required files and folders exist and are writable
-     *
-     */
-    public function verify_filesystem()
-    {
-        $msg = esc_html__(
-            'The Local File Logging functionality was removed permanently. Remote Logging is recommended instead.',
-            'event_espresso'
-        );
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            $msg,
-            '$VID:$'
-        );
-    }
-
-
-    /**
-     *    _format_message
-     *    makes yer log entries look all purdy
-     *
-     * @param string $file
-     * @param string $function
-     * @param string $message
-     * @param string $type
-     * @return string
-     */
-    private function _format_message($file = '', $function = '', $message = '', $type = '')
-    {
-        $msg = '----------------------------------------------------------------------------------------' . PHP_EOL;
-        $msg .= '[' . current_time('mysql') . '] ';
-        $msg .= ! empty($file) ? basename($file) : '';
-        $msg .= ! empty($file) && ! empty($function) ? ' -> ' : '';
-        $msg .= ! empty($function) ? $function . '()' : '';
-        $msg .= PHP_EOL;
-        $type = ! empty($type) ? $type : 'log message';
-        $msg .= ! empty($message) ? "\t" . '[' . $type . '] ' . $message . PHP_EOL : '';
-        return $msg;
-    }
-
-
-    /**
-     *    log
-     * adds content to the EE_Log->_log property which gets written to file during the WP 'shutdown' hookpoint via the
-     * EE_Log::write_log() callback
-     *
-     * @param string $file
-     * @param string $function
-     * @param string $message
-     * @param string $type
-     */
-    public function log($file = '', $function = '', $message = '', $type = '')
-    {
-        $this->_log .= $this->_format_message($file, $function, $message, $type);
-    }
-
-
-    /**
-     * write_log
-     * appends the results of the 'AHEE_log' filter to the espresso log file
-     */
-    public function write_log()
-    {
-        $msg = esc_html__(
-            'The Local File Logging functionality was removed permanently. Remote Logging is recommended instead.',
-            'event_espresso'
-        );
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            $msg,
-            '$VID:$'
-        );
-    }
-
-
-    /**
-     * send_log
-     * sends the espresso log to a remote URL via a PHP cURL request
-     */
-    public function send_log()
-    {
-
-        if (empty($this->_remote_logging_url)) {
-            return;
-        }
-
-        $data = 'domain=' . $_SERVER['HTTP_HOST'];
-        $data .= '&ip=' . $_SERVER['SERVER_ADDR'];
-        $data .= '&server_type=' . $_SERVER['SERVER_SOFTWARE'];
-        $data .= '&time=' . time();
-        $data .= '&remote_log=' . $this->_log;
-        $data .= '&request_array=' . json_encode($_REQUEST);
-        $data .= '&action=save';
-
-        if (defined('EELOGGING_PASS')) {
-            $data .= '&pass=' . EELOGGING_PASS;
-        }
-        if (defined('EELOGGING_KEY')) {
-            $data .= '&key=' . EELOGGING_KEY;
-        }
-
-        $c = curl_init($this->_remote_logging_url);
-        curl_setopt($c, CURLOPT_POST, true);
-        curl_setopt($c, CURLOPT_POSTFIELDS, $data);
-        curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
-        curl_exec($c);
-        curl_close($c);
-    }
-
-
-    /**
-     * write_debug
-     * writes the contents of the current request's $_GET and $_POST arrays to a log file.
-     * previous entries are overwritten
-     */
-    public function write_debug()
-    {
-        $msg = esc_html__(
-            'The Local File Logging functionality was removed permanently. Remote Logging is recommended instead.',
-            'event_espresso'
-        );
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            $msg,
-            '$VID:$'
-        );
-    }
-
-
-    /**
-     * __clone
-     */
-    public function __clone()
-    {
-        trigger_error(__('Clone is not allowed.', 'event_espresso'), E_USER_ERROR);
-    }
+	/**
+	 * @var string
+	 */
+	private $_log = '';
+
+	/**
+	 * Used for remote logging
+	 *
+	 * @var string
+	 */
+	private $_remote_logging_url = '';
+
+	/**
+	 * @var string
+	 */
+	private $_remote_log = '';
+
+	/**
+	 * @var EE_Log
+	 */
+	private static $_instance;
+
+
+	/**
+	 * @return EE_Log
+	 */
+	public static function instance()
+	{
+		if (! self::$_instance instanceof EE_Log) {
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+	/**
+	 * @access private
+	 * @return EE_Log
+	 */
+	private function __construct()
+	{
+
+		if (! EE_Registry::instance()->CFG->admin->use_remote_logging) {
+			return;
+		}
+
+		$this->_remote_logging_url = EE_Registry::instance()->CFG->admin->remote_logging_url;
+		$this->_remote_log = '';
+
+		if (EE_Registry::instance()->CFG->admin->use_remote_logging) {
+			add_action('shutdown', array($this, 'send_log'), 9999);
+		}
+	}
+
+
+	/**
+	 *    verify_filesystem
+	 * tests that the required files and folders exist and are writable
+	 *
+	 */
+	public function verify_filesystem()
+	{
+		$msg = esc_html__(
+			'The Local File Logging functionality was removed permanently. Remote Logging is recommended instead.',
+			'event_espresso'
+		);
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			$msg,
+			'$VID:$'
+		);
+	}
+
+
+	/**
+	 *    _format_message
+	 *    makes yer log entries look all purdy
+	 *
+	 * @param string $file
+	 * @param string $function
+	 * @param string $message
+	 * @param string $type
+	 * @return string
+	 */
+	private function _format_message($file = '', $function = '', $message = '', $type = '')
+	{
+		$msg = '----------------------------------------------------------------------------------------' . PHP_EOL;
+		$msg .= '[' . current_time('mysql') . '] ';
+		$msg .= ! empty($file) ? basename($file) : '';
+		$msg .= ! empty($file) && ! empty($function) ? ' -> ' : '';
+		$msg .= ! empty($function) ? $function . '()' : '';
+		$msg .= PHP_EOL;
+		$type = ! empty($type) ? $type : 'log message';
+		$msg .= ! empty($message) ? "\t" . '[' . $type . '] ' . $message . PHP_EOL : '';
+		return $msg;
+	}
+
+
+	/**
+	 *    log
+	 * adds content to the EE_Log->_log property which gets written to file during the WP 'shutdown' hookpoint via the
+	 * EE_Log::write_log() callback
+	 *
+	 * @param string $file
+	 * @param string $function
+	 * @param string $message
+	 * @param string $type
+	 */
+	public function log($file = '', $function = '', $message = '', $type = '')
+	{
+		$this->_log .= $this->_format_message($file, $function, $message, $type);
+	}
+
+
+	/**
+	 * write_log
+	 * appends the results of the 'AHEE_log' filter to the espresso log file
+	 */
+	public function write_log()
+	{
+		$msg = esc_html__(
+			'The Local File Logging functionality was removed permanently. Remote Logging is recommended instead.',
+			'event_espresso'
+		);
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			$msg,
+			'$VID:$'
+		);
+	}
+
+
+	/**
+	 * send_log
+	 * sends the espresso log to a remote URL via a PHP cURL request
+	 */
+	public function send_log()
+	{
+
+		if (empty($this->_remote_logging_url)) {
+			return;
+		}
+
+		$data = 'domain=' . $_SERVER['HTTP_HOST'];
+		$data .= '&ip=' . $_SERVER['SERVER_ADDR'];
+		$data .= '&server_type=' . $_SERVER['SERVER_SOFTWARE'];
+		$data .= '&time=' . time();
+		$data .= '&remote_log=' . $this->_log;
+		$data .= '&request_array=' . json_encode($_REQUEST);
+		$data .= '&action=save';
+
+		if (defined('EELOGGING_PASS')) {
+			$data .= '&pass=' . EELOGGING_PASS;
+		}
+		if (defined('EELOGGING_KEY')) {
+			$data .= '&key=' . EELOGGING_KEY;
+		}
+
+		$c = curl_init($this->_remote_logging_url);
+		curl_setopt($c, CURLOPT_POST, true);
+		curl_setopt($c, CURLOPT_POSTFIELDS, $data);
+		curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+		curl_exec($c);
+		curl_close($c);
+	}
+
+
+	/**
+	 * write_debug
+	 * writes the contents of the current request's $_GET and $_POST arrays to a log file.
+	 * previous entries are overwritten
+	 */
+	public function write_debug()
+	{
+		$msg = esc_html__(
+			'The Local File Logging functionality was removed permanently. Remote Logging is recommended instead.',
+			'event_espresso'
+		);
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			$msg,
+			'$VID:$'
+		);
+	}
+
+
+	/**
+	 * __clone
+	 */
+	public function __clone()
+	{
+		trigger_error(__('Clone is not allowed.', 'event_espresso'), E_USER_ERROR);
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -45,7 +45,7 @@ 
      */
     public static function instance()
     {
-        if (! self::$_instance instanceof EE_Log) {
+        if ( ! self::$_instance instanceof EE_Log) {
             self::$_instance = new self();
         }
         return self::$_instance;
@@ -58,7 +58,7 @@ 
     private function __construct()
     {
 
-        if (! EE_Registry::instance()->CFG->admin->use_remote_logging) {
+        if ( ! EE_Registry::instance()->CFG->admin->use_remote_logging) {
             return;
         }
 
@@ -102,14 +102,14 @@ 
      */
     private function _format_message($file = '', $function = '', $message = '', $type = '')
     {
-        $msg = '----------------------------------------------------------------------------------------' . PHP_EOL;
-        $msg .= '[' . current_time('mysql') . '] ';
+        $msg = '----------------------------------------------------------------------------------------'.PHP_EOL;
+        $msg .= '['.current_time('mysql').'] ';
         $msg .= ! empty($file) ? basename($file) : '';
         $msg .= ! empty($file) && ! empty($function) ? ' -> ' : '';
-        $msg .= ! empty($function) ? $function . '()' : '';
+        $msg .= ! empty($function) ? $function.'()' : '';
         $msg .= PHP_EOL;
         $type = ! empty($type) ? $type : 'log message';
-        $msg .= ! empty($message) ? "\t" . '[' . $type . '] ' . $message . PHP_EOL : '';
+        $msg .= ! empty($message) ? "\t".'['.$type.'] '.$message.PHP_EOL : '';
         return $msg;
     }
 
@@ -159,19 +159,19 @@ 
             return;
         }
 
-        $data = 'domain=' . $_SERVER['HTTP_HOST'];
-        $data .= '&ip=' . $_SERVER['SERVER_ADDR'];
-        $data .= '&server_type=' . $_SERVER['SERVER_SOFTWARE'];
-        $data .= '&time=' . time();
-        $data .= '&remote_log=' . $this->_log;
-        $data .= '&request_array=' . json_encode($_REQUEST);
+        $data = 'domain='.$_SERVER['HTTP_HOST'];
+        $data .= '&ip='.$_SERVER['SERVER_ADDR'];
+        $data .= '&server_type='.$_SERVER['SERVER_SOFTWARE'];
+        $data .= '&time='.time();
+        $data .= '&remote_log='.$this->_log;
+        $data .= '&request_array='.json_encode($_REQUEST);
         $data .= '&action=save';
 
         if (defined('EELOGGING_PASS')) {
-            $data .= '&pass=' . EELOGGING_PASS;
+            $data .= '&pass='.EELOGGING_PASS;
         }
         if (defined('EELOGGING_KEY')) {
-            $data .= '&key=' . EELOGGING_KEY;
+            $data .= '&key='.EELOGGING_KEY;
         }
 
         $c = curl_init($this->_remote_logging_url);

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

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',
+	);
 }

caffeinated/admin/extend/general_settings/Extend_General_Settings_Admin_Page.core.php

Indentation +53 added lines, -53 removed lines

@@ -18,68 +18,68 @@
 {
 
 
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-        define('GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'general_settings/templates/');
-    }
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+		define('GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'general_settings/templates/');
+	}
 
 
-    protected function _extend_page_config()
-    {
+	protected function _extend_page_config()
+	{
 
-        $this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'general_settings';
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'general_settings';
 
-        // filters and action hooks here
-        add_action('AHEE__admin_option_settings__template__before', array($this, 'debug_logging_options'), 9);
-        add_filter(
-            'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin',
-            array($this, 'update_debug_logging_options'),
-            10,
-            1
-        );
-    }
+		// filters and action hooks here
+		add_action('AHEE__admin_option_settings__template__before', array($this, 'debug_logging_options'), 9);
+		add_filter(
+			'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin',
+			array($this, 'update_debug_logging_options'),
+			10,
+			1
+		);
+	}
 
 
 
-    /*************        Logging Settings        *************/
+	/*************        Logging Settings        *************/
 
-    /**
-     * debug_logging_options
-     *
-     * @param array $template_args
-     *
-     * @return void
-     */
-    public function debug_logging_options($template_args = array())
-    {
-        $template_args['use_remote_logging'] = isset(EE_Registry::instance()->CFG->admin->use_remote_logging) ? absint(
-            EE_Registry::instance()->CFG->admin->use_remote_logging
-        ) : false;
-        $template_args['remote_logging_url'] = isset(EE_Registry::instance()->CFG->admin->remote_logging_url)
-                                               && ! empty(EE_Registry::instance()->CFG->admin->remote_logging_url)
-            ? stripslashes(EE_Registry::instance()->CFG->admin->remote_logging_url) : '';
-        $template = GEN_SET_CAF_TEMPLATE_PATH . 'debug_log_settings.template.php';
-        EEH_Template::display_template($template, $template_args);
-    }
+	/**
+	 * debug_logging_options
+	 *
+	 * @param array $template_args
+	 *
+	 * @return void
+	 */
+	public function debug_logging_options($template_args = array())
+	{
+		$template_args['use_remote_logging'] = isset(EE_Registry::instance()->CFG->admin->use_remote_logging) ? absint(
+			EE_Registry::instance()->CFG->admin->use_remote_logging
+		) : false;
+		$template_args['remote_logging_url'] = isset(EE_Registry::instance()->CFG->admin->remote_logging_url)
+											   && ! empty(EE_Registry::instance()->CFG->admin->remote_logging_url)
+			? stripslashes(EE_Registry::instance()->CFG->admin->remote_logging_url) : '';
+		$template = GEN_SET_CAF_TEMPLATE_PATH . 'debug_log_settings.template.php';
+		EEH_Template::display_template($template, $template_args);
+	}
 
 
-    /**
-     * update_debug_logging_options
-     *
-     * @param array $admin_options
-     *
-     * @return array
-     */
-    public function update_debug_logging_options($admin_options = array())
-    {
-        $admin_options->use_remote_logging = isset($this->_req_data['use_remote_logging']) ? absint(
-            $this->_req_data['use_remote_logging']
-        ) : $admin_options->use_remote_logging;
-        $admin_options->remote_logging_url = isset($this->_req_data['remote_logging_url']) ? esc_url_raw(
-            $this->_req_data['remote_logging_url']
-        ) : $admin_options->remote_logging_url;
+	/**
+	 * update_debug_logging_options
+	 *
+	 * @param array $admin_options
+	 *
+	 * @return array
+	 */
+	public function update_debug_logging_options($admin_options = array())
+	{
+		$admin_options->use_remote_logging = isset($this->_req_data['use_remote_logging']) ? absint(
+			$this->_req_data['use_remote_logging']
+		) : $admin_options->use_remote_logging;
+		$admin_options->remote_logging_url = isset($this->_req_data['remote_logging_url']) ? esc_url_raw(
+			$this->_req_data['remote_logging_url']
+		) : $admin_options->remote_logging_url;
 
-        return $admin_options;
-    }
+		return $admin_options;
+	}
 }

admin_pages/general_settings/help_tours/Admin_Options_Help_Tour.class.php

Indentation +70 added lines, -70 removed lines

@@ -15,81 +15,81 @@
 class Admin_Options_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Admin Options Tour', 'event_espresso');
-        $this->_slug = 'admin-options-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Admin Options Tour', 'event_espresso');
+		$this->_slug = 'admin-options-joyride';
+	}
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            30 => array(
-                'id'      => 'use_remote_logging',
-                'content' => $this->_use_remote_logging_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            40 => array(
-                'id'      => 'affiliate_info',
-                'content' => $this->_show_reg_footer_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			30 => array(
+				'id'      => 'use_remote_logging',
+				'content' => $this->_use_remote_logging_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			40 => array(
+				'id'      => 'affiliate_info',
+				'content' => $this->_show_reg_footer_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
 
-            60 => array(
-                'id'      => 'help_tour_activation',
-                'content' => $this->_help_tour_activation_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-        );
-    }
+			60 => array(
+				'id'      => 'help_tour_activation',
+				'content' => $this->_help_tour_activation_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+		);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Admin Options', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This tour of the Admin Options page will go over different areas of the screen to help you understand what they are used for.',
-                        'event_espresso'
-                    ) . '</p>';
-        return $content;
-    }
+	protected function _start()
+	{
+		$content = '<h3>' . __('Admin Options', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This tour of the Admin Options page will go over different areas of the screen to help you understand what they are used for.',
+						'event_espresso'
+					) . '</p>';
+		return $content;
+	}
 
-    protected function _use_remote_logging_stop()
-    {
-        return '<p>'
-               . __(
-                   ' This option sends all Event Espresso debugging data and get / post variables to the specified URL below.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _use_remote_logging_stop()
+	{
+		return '<p>'
+			   . __(
+				   ' This option sends all Event Espresso debugging data and get / post variables to the specified URL below.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _show_reg_footer_stop()
-    {
-        return '<p>'
-               . __(
-                   'Support us by adding a small link to Event Espresso in your event pages. You can even earn money for yourself by adding your affiliate link there!',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _show_reg_footer_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Support us by adding a small link to Event Espresso in your event pages. You can even earn money for yourself by adding your affiliate link there!',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _help_tour_activation_stop()
-    {
-        return '<p>' . __('Turn these help tours on / off for Event Espresso pages.', 'event_espresso') . '</p>';
-    }
+	protected function _help_tour_activation_stop()
+	{
+		return '<p>' . __('Turn these help tours on / off for Event Espresso pages.', 'event_espresso') . '</p>';
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -61,12 +61,12 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Admin Options', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Admin Options', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This tour of the Admin Options page will go over different areas of the screen to help you understand what they are used for.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         return $content;
     }
 
@@ -76,7 +76,7 @@ 
                . __(
                    ' This option sends all Event Espresso debugging data and get / post variables to the specified URL below.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _show_reg_footer_stop()
@@ -85,11 +85,11 @@ 
                . __(
                    'Support us by adding a small link to Event Espresso in your event pages. You can even earn money for yourself by adding your affiliate link there!',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _help_tour_activation_stop()
     {
-        return '<p>' . __('Turn these help tours on / off for Event Espresso pages.', 'event_espresso') . '</p>';
+        return '<p>'.__('Turn these help tours on / off for Event Espresso pages.', 'event_espresso').'</p>';
     }
 }

admin_pages/general_settings/help_tabs/general_settings_admin_options.help_tab.php

Indentation +6 added lines, -6 removed lines

@@ -32,12 +32,12 @@
 <li>
 <strong><?php esc_html_e('Event Espresso Affiliate ID', 'event_espresso'); ?></strong><br />
 <?php printf(
-    esc_html__(
-        'You can also monetize this link by signing up to our %1$saffiliate program%2$s and adding in your affiliate ID here.',
-        'event_espresso'
-    ),
-    '<a href="https://eventespresso.com/affiliates/">',
-    '</a>'
+	esc_html__(
+		'You can also monetize this link by signing up to our %1$saffiliate program%2$s and adding in your affiliate ID here.',
+		'event_espresso'
+	),
+	'<a href="https://eventespresso.com/affiliates/">',
+	'</a>'
 ); ?>
 </li>
 </ul>

core/data_migration_scripts/EE_DMS_Core_4_8_0.dms.php

Indentation +357 added lines, -357 removed lines

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

Spacing +10 added lines, -10 removed lines

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

core/data_migration_scripts/EE_DMS_Core_4_5_0.dms.php

Indentation +229 added lines, -229 removed lines

@@ -16,9 +16,9 @@ 
 $stages = glob(EE_CORE . 'data_migration_scripts/4_5_0_stages/*');
 $class_to_filepath = array();
 foreach ($stages as $filepath) {
-    $matches = array();
-    preg_match('~4_5_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-    $class_to_filepath[ $matches[1] ] = $filepath;
+	$matches = array();
+	preg_match('~4_5_0_stages/(.*).dmsstage.php~', $filepath, $matches);
+	$class_to_filepath[ $matches[1] ] = $filepath;
 }
 // give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_5_0__autoloaded_stages', $class_to_filepath);
@@ -31,59 +31,59 @@ 
 
 
 
-    /**
-     * EE_DMS_Core_4_5_0 constructor.
-     *
-     * @param TableManager  $table_manager
-     * @param TableAnalysis $table_analysis
-     */
-    public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
-    {
-        $this->_pretty_name = __("Data Update to Event Espresso 4.5.0", "event_espresso");
-        $this->_priority = 10;
-        $this->_migration_stages = array(
-            new EE_DMS_4_5_0_update_wp_user_for_tickets(),
-            new EE_DMS_4_5_0_update_wp_user_for_prices(),
-            new EE_DMS_4_5_0_update_wp_user_for_price_types(),
-            new EE_DMS_4_5_0_update_wp_user_for_question_groups(),
-            new EE_DMS_4_5_0_invoice_settings(),
-        );
-        parent::__construct($table_manager, $table_analysis);
-    }
+	/**
+	 * EE_DMS_Core_4_5_0 constructor.
+	 *
+	 * @param TableManager  $table_manager
+	 * @param TableAnalysis $table_analysis
+	 */
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
+	{
+		$this->_pretty_name = __("Data Update to Event Espresso 4.5.0", "event_espresso");
+		$this->_priority = 10;
+		$this->_migration_stages = array(
+			new EE_DMS_4_5_0_update_wp_user_for_tickets(),
+			new EE_DMS_4_5_0_update_wp_user_for_prices(),
+			new EE_DMS_4_5_0_update_wp_user_for_price_types(),
+			new EE_DMS_4_5_0_update_wp_user_for_question_groups(),
+			new EE_DMS_4_5_0_invoice_settings(),
+		);
+		parent::__construct($table_manager, $table_analysis);
+	}
 
 
 
-    public function can_migrate_from_version($version_array)
-    {
-        $version_string = $version_array['Core'];
-        if (version_compare($version_string, '4.5.0.decaf', '<') && version_compare($version_string, '4.3.0.decaf', '>=')) {
+	public function can_migrate_from_version($version_array)
+	{
+		$version_string = $version_array['Core'];
+		if (version_compare($version_string, '4.5.0.decaf', '<') && version_compare($version_string, '4.3.0.decaf', '>=')) {
 //          echo "$version_string can be migrated from";
-            return true;
-        } elseif (! $version_string) {
+			return true;
+		} elseif (! $version_string) {
 //          echo "no version string provided: $version_string";
-            // no version string provided... this must be pre 4.3
-            return false;// changed mind. dont want people thinking they should migrate yet because they cant
-        } else {
+			// no version string provided... this must be pre 4.3
+			return false;// changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //          echo "$version_string doesnt apply";
-            return false;
-        }
-    }
+			return false;
+		}
+	}
 
 
 
-    public function schema_changes_before_migration()
-    {
-        // relies on 4.1's EEH_Activation::create_table
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
-        $table_name = 'esp_answer';
-        $sql = "ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+	public function schema_changes_before_migration()
+	{
+		// relies on 4.1's EEH_Activation::create_table
+		require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = "ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					ANS_value text NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_attendee_meta';
-        $sql = "ATTM_ID int(10) unsigned NOT	NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_attendee_meta';
+		$sql = "ATTM_ID int(10) unsigned NOT	NULL AUTO_INCREMENT,
 						ATT_ID bigint(20) unsigned NOT NULL,
 						ATT_fname varchar(45) NOT NULL,
 						ATT_lname varchar(45) NOT	NULL,
@@ -99,9 +99,9 @@ 
 								KEY ATT_fname (ATT_fname),
 								KEY ATT_lname (ATT_lname),
 								KEY ATT_email (ATT_email(191))";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_country';
-        $sql = "CNT_ISO varchar(2) COLLATE utf8_bin NOT NULL,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_country';
+		$sql = "CNT_ISO varchar(2) COLLATE utf8_bin NOT NULL,
 					  CNT_ISO3 varchar(3) COLLATE utf8_bin NOT NULL,
 					  RGN_ID tinyint(3) unsigned DEFAULT NULL,
 					  CNT_name varchar(45) COLLATE utf8_bin NOT NULL,
@@ -117,9 +117,9 @@ 
 					  CNT_is_EU tinyint(1) DEFAULT '0',
 					  CNT_active tinyint(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_datetime';
-        $sql = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_datetime';
+		$sql = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				  EVT_ID bigint(20) unsigned NOT NULL,
 				  DTT_name varchar(255) NOT NULL DEFAULT '',
 				  DTT_description text NOT NULL,
@@ -134,9 +134,9 @@ 
 						PRIMARY KEY  (DTT_ID),
 						KEY EVT_ID (EVT_ID),
 						KEY DTT_is_primary (DTT_is_primary)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_meta';
-        $sql = "
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_meta';
+		$sql = "
 			EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
 			EVT_ID bigint(20) unsigned NOT NULL,
 			EVT_display_desc tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -151,31 +151,31 @@ 
 			EVT_external_URL varchar(200) NULL,
 			EVT_donations tinyint(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_question_group';
-        $sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					EVT_ID bigint(20) unsigned NOT NULL,
 					QSG_ID int(10) unsigned NOT NULL,
 					EQG_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_venue';
-        $sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				VNU_ID bigint(20) unsigned NOT NULL,
 				EVV_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_extra_meta';
-        $sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID int(11) DEFAULT NULL,
 				EXM_type varchar(45) DEFAULT NULL,
 				EXM_key varchar(45) DEFAULT NULL,
 				EXM_value text,
 				PRIMARY KEY  (EXM_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_line_item';
-        $sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
 				LIN_code varchar(245) NOT NULL DEFAULT '',
 				TXN_ID int(11) DEFAULT NULL,
 				LIN_name varchar(245) NOT NULL DEFAULT '',
@@ -191,19 +191,19 @@ 
 				OBJ_ID int(11) DEFAULT NULL,
 				OBJ_type varchar(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message_template';
-        $sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message_template';
+		$sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					GRP_ID int(10) unsigned NOT NULL,
 					MTP_context varchar(50) NOT NULL,
 					MTP_template_field varchar(30) NOT NULL,
 					MTP_content text NOT NULL,
 					PRIMARY KEY  (MTP_ID),
 					KEY GRP_ID (GRP_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $this->_get_table_manager()->dropIndex('esp_message_template_group', 'EVT_ID');
-        $table_name = 'esp_message_template_group';
-        $sql = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_get_table_manager()->dropIndex('esp_message_template_group', 'EVT_ID');
+		$table_name = 'esp_message_template_group';
+		$sql = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					MTP_user_id int(10) NOT NULL DEFAULT '1',
 					MTP_name varchar(245) NOT NULL DEFAULT '',
 					MTP_description varchar(245) NOT NULL DEFAULT '',
@@ -215,17 +215,17 @@ 
 					MTP_is_active tinyint(1) NOT NULL DEFAULT '1',
 					PRIMARY KEY  (GRP_ID),
 					KEY MTP_user_id (MTP_user_id)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_message_template';
-        $sql = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_message_template';
+		$sql = "EMT_ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
 					EVT_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 					GRP_ID int(10) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_payment';
-        $sql = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_payment';
+		$sql = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					TXN_ID int(10) unsigned DEFAULT NULL,
 					STS_ID varchar(3) COLLATE utf8_bin DEFAULT NULL,
 					PAY_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -241,28 +241,28 @@ 
 					PRIMARY KEY  (PAY_ID),
 					KEY TXN_ID (TXN_ID),
 					KEY PAY_timestamp (PAY_timestamp)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = "esp_ticket_price";
-        $sql = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = "esp_ticket_price";
+		$sql = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TKT_ID int(10) unsigned NOT NULL,
 					  PRC_ID int(10) unsigned NOT NULL,
 					  PRIMARY KEY  (TKP_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_datetime_ticket";
-        $sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_datetime_ticket";
+		$sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  DTT_ID int(10) unsigned NOT NULL,
 					  TKT_ID int(10) unsigned NOT NULL,
 					  PRIMARY KEY  (DTK_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_ticket_template";
-        $sql = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_ticket_template";
+		$sql = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TTM_name varchar(45) NOT NULL,
 					  TTM_description text,
 					  TTM_file varchar(45),
 					  PRIMARY KEY  (TTM_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question';
-        $sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question';
+		$sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QST_display_text text NOT NULL,
 					QST_admin_label varchar(255) NOT NULL,
 					QST_system varchar(25) DEFAULT NULL,
@@ -274,25 +274,25 @@ 
 					QST_wp_user bigint(20) unsigned NULL,
 					QST_deleted tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_group_question';
-        $sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					QGQ_order int(10) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID) ";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_option';
-        $sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSO_value varchar(255) NOT NULL,
 					QSO_desc text NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					QSO_order int(10) unsigned NOT NULL DEFAULT 0,
 					QSO_deleted tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_registration';
-        $sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_registration';
+		$sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  EVT_ID bigint(20) unsigned NOT NULL,
 					  ATT_ID bigint(20) unsigned NOT NULL,
 					  TXN_ID int(10) unsigned NOT NULL,
@@ -315,25 +315,25 @@ 
 					  KEY STS_ID (STS_ID),
 					  KEY REG_url_link (REG_url_link),
 					  KEY REG_code (REG_code)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_checkin';
-        $sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					DTT_ID int(10) unsigned NOT NULL,
 					CHK_in tinyint(1) unsigned NOT NULL DEFAULT 1,
 					CHK_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 					PRIMARY KEY  (CHK_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_state';
-        $sql = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_state';
+		$sql = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
 					  CNT_ISO varchar(2) COLLATE utf8_bin NOT NULL,
 					  STA_abbrev varchar(6) COLLATE utf8_bin NOT NULL,
 					  STA_name varchar(100) COLLATE utf8_bin NOT NULL,
 					  STA_active tinyint(1) DEFAULT '1',
 					  PRIMARY KEY  (STA_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_status';
-        $sql = "STS_ID varchar(3) COLLATE utf8_bin NOT NULL,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_status';
+		$sql = "STS_ID varchar(3) COLLATE utf8_bin NOT NULL,
 					  STS_code varchar(45) COLLATE utf8_bin NOT NULL,
 					  STS_type set('event','registration','transaction','payment','email') COLLATE utf8_bin NOT NULL,
 					  STS_can_edit tinyint(1) NOT NULL DEFAULT 0,
@@ -341,9 +341,9 @@ 
 					  STS_open tinyint(1) NOT NULL DEFAULT 1,
 					  UNIQUE KEY STS_ID_UNIQUE (STS_ID),
 					  KEY STS_type (STS_type)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_transaction';
-        $sql = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_transaction';
+		$sql = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TXN_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 					  TXN_total decimal(10,3) DEFAULT '0.00',
 					  TXN_paid decimal(10,3) NOT NULL DEFAULT '0.00',
@@ -354,9 +354,9 @@ 
 					  PRIMARY KEY  (TXN_ID),
 					  KEY TXN_timestamp (TXN_timestamp),
 					  KEY STS_ID (STS_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_venue_meta';
-        $sql = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_venue_meta';
+		$sql = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
 			VNU_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 			VNU_address varchar(255) DEFAULT NULL,
 			VNU_address2 varchar(255) DEFAULT NULL,
@@ -374,10 +374,10 @@ 
 			PRIMARY KEY  (VNUM_ID),
 			KEY STA_ID (STA_ID),
 			KEY CNT_ISO (CNT_ISO)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        // modified tables
-        $table_name = "esp_price";
-        $sql = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		// modified tables
+		$table_name = "esp_price";
+		$sql = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  PRT_ID tinyint(3) unsigned NOT NULL,
 					  PRC_amount decimal(10,3) NOT NULL DEFAULT '0.00',
 					  PRC_name varchar(245) NOT NULL,
@@ -389,9 +389,9 @@ 
 					  PRC_wp_user bigint(20) unsigned NULL,
 					  PRC_parent int(10) unsigned DEFAULT 0,
 					  PRIMARY KEY  (PRC_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_price_type";
-        $sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_price_type";
+		$sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
 				  PRT_name varchar(45) NOT NULL,
 				  PBT_ID tinyint(3) unsigned NOT NULL DEFAULT '1',
 				  PRT_is_percent tinyint(1) NOT NULL DEFAULT '0',
@@ -400,9 +400,9 @@ 
 				  PRT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				  UNIQUE KEY PRT_name_UNIQUE (PRT_name),
 				  PRIMARY KEY  (PRT_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = "esp_ticket";
-        $sql = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = "esp_ticket";
+		$sql = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TTM_ID int(10) unsigned NOT NULL,
 					  TKT_name varchar(245) NOT NULL DEFAULT '',
 					  TKT_description text NOT NULL,
@@ -423,10 +423,10 @@ 
 					  TKT_parent int(10) unsigned DEFAULT '0',
 					  TKT_deleted tinyint(1) NOT NULL DEFAULT '0',
 					  PRIMARY KEY  (TKT_ID)";
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $this->_get_table_manager()->dropIndex('esp_question_group', 'QSG_identifier_UNIQUE');
-        $table_name = 'esp_question_group';
-        $sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_get_table_manager()->dropIndex('esp_question_group', 'QSG_identifier_UNIQUE');
+		$table_name = 'esp_question_group';
+		$sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_name varchar(255) NOT NULL,
 					QSG_identifier varchar(100) NOT NULL,
 					QSG_desc text NULL,
@@ -438,133 +438,133 @@ 
 					QSG_wp_user bigint(20) unsigned NULL,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-        $this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
-        $script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
-        // (because many need to convert old string states to foreign keys into the states table)
-        $script_4_1_defaults->insert_default_states();
-        $script_4_1_defaults->insert_default_countries();
-        // schema on price, price_types and tickets has changed so use the DEFAULT method in here instead of 4.1's and later.
-        $this->insert_default_price_types();
-        $this->insert_default_prices();
-        $this->insert_default_tickets();
-        // setting up the config wp option pretty well counts as a 'schema change', or at least should happen ehre
-        EE_Config::instance()->update_espresso_config(false, true);
-        return true;
-    }
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
+		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
+		// (because many need to convert old string states to foreign keys into the states table)
+		$script_4_1_defaults->insert_default_states();
+		$script_4_1_defaults->insert_default_countries();
+		// schema on price, price_types and tickets has changed so use the DEFAULT method in here instead of 4.1's and later.
+		$this->insert_default_price_types();
+		$this->insert_default_prices();
+		$this->insert_default_tickets();
+		// setting up the config wp option pretty well counts as a 'schema change', or at least should happen ehre
+		EE_Config::instance()->update_espresso_config(false, true);
+		return true;
+	}
 
 
 
-    /**
-     * @return boolean
-     */
-    public function schema_changes_after_migration()
-    {
-        return true;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function schema_changes_after_migration()
+	{
+		return true;
+	}
 
 
 
-    public function migration_page_hooks()
-    {
-    }
+	public function migration_page_hooks()
+	{
+	}
 
 
 
-    /**
-     * insert_default_price_types
-     *
-     * @since 4.5.0
-     * @return void
-     */
-    public function insert_default_price_types()
-    {
-        global $wpdb;
-        $price_type_table = $wpdb->prefix . "esp_price_type";
-        if ($this->_get_table_analysis()->tableExists($price_type_table)) {
-            $SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
-            $price_types_exist = $wpdb->get_var($SQL);
-            if (! $price_types_exist) {
-                $user_id = EEH_Activation::get_default_creator_id();
-                $SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_wp_user, PRT_deleted ) VALUES
+	/**
+	 * insert_default_price_types
+	 *
+	 * @since 4.5.0
+	 * @return void
+	 */
+	public function insert_default_price_types()
+	{
+		global $wpdb;
+		$price_type_table = $wpdb->prefix . "esp_price_type";
+		if ($this->_get_table_analysis()->tableExists($price_type_table)) {
+			$SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
+			$price_types_exist = $wpdb->get_var($SQL);
+			if (! $price_types_exist) {
+				$user_id = EEH_Activation::get_default_creator_id();
+				$SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_wp_user, PRT_deleted ) VALUES
 							(1, '" . __('Base Price', 'event_espresso') . "', 1,  0, 0, $user_id, 0),
 							(2, '" . __('Percent Discount', 'event_espresso') . "', 2,  1, 20, $user_id, 0),
 							(3, '" . __('Dollar Discount', 'event_espresso') . "', 2,  0, 30, $user_id, 0),
 							(4, '" . __('Percent Surcharge', 'event_espresso') . "', 3,  1, 40, $user_id,  0),
 							(5, '" . __('Dollar Surcharge', 'event_espresso') . "', 3,  0, 50, $user_id, 0);";
-                $SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_price_types__SQL', $SQL);
-                $wpdb->query($SQL);
-            }
-        }
-    }
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_price_types__SQL', $SQL);
+				$wpdb->query($SQL);
+			}
+		}
+	}
 
 
 
-    /**
-     * insert DEFAULT prices.
-     *  If we're INSTALLING 4.x CAF, then we add a few extra DEFAULT prices
-     * when EEH_Activaion's initialize_db_content is called via  ahook in
-     * EE_Brewing_regular
-     *
-     * @since 4.5.0
-     * @return void
-     */
-    public function insert_default_prices()
-    {
-        global $wpdb;
-        $price_table = $wpdb->prefix . "esp_price";
-        if ($this->_get_table_analysis()->tableExists($price_table)) {
-            $SQL = 'SELECT COUNT(PRC_ID) FROM ' . $price_table;
-            $prices_exist = $wpdb->get_var($SQL);
-            if (! $prices_exist) {
-                $user_id = EEH_Activation::get_default_creator_id();
-                $SQL = "INSERT INTO $price_table
+	/**
+	 * insert DEFAULT prices.
+	 *  If we're INSTALLING 4.x CAF, then we add a few extra DEFAULT prices
+	 * when EEH_Activaion's initialize_db_content is called via  ahook in
+	 * EE_Brewing_regular
+	 *
+	 * @since 4.5.0
+	 * @return void
+	 */
+	public function insert_default_prices()
+	{
+		global $wpdb;
+		$price_table = $wpdb->prefix . "esp_price";
+		if ($this->_get_table_analysis()->tableExists($price_table)) {
+			$SQL = 'SELECT COUNT(PRC_ID) FROM ' . $price_table;
+			$prices_exist = $wpdb->get_var($SQL);
+			if (! $prices_exist) {
+				$user_id = EEH_Activation::get_default_creator_id();
+				$SQL = "INSERT INTO $price_table
 							(PRC_ID, PRT_ID, PRC_amount, PRC_name, PRC_desc,  PRC_is_default, PRC_overrides, PRC_wp_user, PRC_order, PRC_deleted, PRC_parent ) VALUES
 							(1, 1, '0.00', 'Free Admission', '', 1, NULL, $user_id, 0, 0, 0);";
-                $SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_prices__SQL', $SQL);
-                $wpdb->query($SQL);
-            }
-        }
-    }
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_prices__SQL', $SQL);
+				$wpdb->query($SQL);
+			}
+		}
+	}
 
 
 
-    /**
-     * insert DEFAULT ticket
-     * Almost identical to EE_DMS_Core_4_3_0::insert_default_tickets, except is aware of the TKT_wp_user field
-     *
-     * @since 4.5.0
-     * @return void
-     */
-    public function insert_default_tickets()
-    {
-        global $wpdb;
-        $ticket_table = $wpdb->prefix . "esp_ticket";
-        if ($this->_get_table_analysis()->tableExists($ticket_table)) {
-            $SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
-            $tickets_exist = $wpdb->get_var($SQL);
-            if (! $tickets_exist) {
-                $user_id = EEH_Activation::get_default_creator_id();
-                $SQL = "INSERT INTO $ticket_table
+	/**
+	 * insert DEFAULT ticket
+	 * Almost identical to EE_DMS_Core_4_3_0::insert_default_tickets, except is aware of the TKT_wp_user field
+	 *
+	 * @since 4.5.0
+	 * @return void
+	 */
+	public function insert_default_tickets()
+	{
+		global $wpdb;
+		$ticket_table = $wpdb->prefix . "esp_ticket";
+		if ($this->_get_table_analysis()->tableExists($ticket_table)) {
+			$SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
+			$tickets_exist = $wpdb->get_var($SQL);
+			if (! $tickets_exist) {
+				$user_id = EEH_Activation::get_default_creator_id();
+				$SQL = "INSERT INTO $ticket_table
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_required, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_wp_user, TKT_deleted ) VALUES
 					( 1, 0, '"
-                       . __("Free Ticket", "event_espresso")
-                       . "', '', 100, 0, -1, 0, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, $user_id, 0);";
-                $SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL', $SQL);
-                $wpdb->query($SQL);
-            }
-        }
-        $ticket_price_table = $wpdb->prefix . "esp_ticket_price";
-        if ($this->_get_table_analysis()->tableExists($ticket_price_table)) {
-            $SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
-            $ticket_prc_exist = $wpdb->get_var($SQL);
-            if (! $ticket_prc_exist) {
-                $SQL = "INSERT INTO $ticket_price_table
+					   . __("Free Ticket", "event_espresso")
+					   . "', '', 100, 0, -1, 0, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, $user_id, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL', $SQL);
+				$wpdb->query($SQL);
+			}
+		}
+		$ticket_price_table = $wpdb->prefix . "esp_ticket_price";
+		if ($this->_get_table_analysis()->tableExists($ticket_price_table)) {
+			$SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
+			$ticket_prc_exist = $wpdb->get_var($SQL);
+			if (! $ticket_prc_exist) {
+				$SQL = "INSERT INTO $ticket_price_table
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
 				( 1, 1, 1 )
 				";
-                $SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL__ticket_price', $SQL);
-                $wpdb->query($SQL);
-            }
-        }
-    }
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL__ticket_price', $SQL);
+				$wpdb->query($SQL);
+			}
+		}
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -13,12 +13,12 @@ 
 // unfortunately, this needs to be done upon INCLUSION of this file,
 // instead of construction, because it only gets constructed on first page load
 // (all other times it gets resurrected from a wordpress option)
-$stages = glob(EE_CORE . 'data_migration_scripts/4_5_0_stages/*');
+$stages = glob(EE_CORE.'data_migration_scripts/4_5_0_stages/*');
 $class_to_filepath = array();
 foreach ($stages as $filepath) {
     $matches = array();
     preg_match('~4_5_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-    $class_to_filepath[ $matches[1] ] = $filepath;
+    $class_to_filepath[$matches[1]] = $filepath;
 }
 // give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_5_0__autoloaded_stages', $class_to_filepath);
@@ -59,10 +59,10 @@ 
         if (version_compare($version_string, '4.5.0.decaf', '<') && version_compare($version_string, '4.3.0.decaf', '>=')) {
 //          echo "$version_string can be migrated from";
             return true;
-        } elseif (! $version_string) {
+        } elseif ( ! $version_string) {
 //          echo "no version string provided: $version_string";
             // no version string provided... this must be pre 4.3
-            return false;// changed mind. dont want people thinking they should migrate yet because they cant
+            return false; // changed mind. dont want people thinking they should migrate yet because they cant
         } else {
 //          echo "$version_string doesnt apply";
             return false;
@@ -74,7 +74,7 @@ 
     public function schema_changes_before_migration()
     {
         // relies on 4.1's EEH_Activation::create_table
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+        require_once(EE_HELPERS.'EEH_Activation.helper.php');
         $table_name = 'esp_answer';
         $sql = "ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
@@ -479,18 +479,18 @@ 
     public function insert_default_price_types()
     {
         global $wpdb;
-        $price_type_table = $wpdb->prefix . "esp_price_type";
+        $price_type_table = $wpdb->prefix."esp_price_type";
         if ($this->_get_table_analysis()->tableExists($price_type_table)) {
-            $SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
+            $SQL = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table;
             $price_types_exist = $wpdb->get_var($SQL);
-            if (! $price_types_exist) {
+            if ( ! $price_types_exist) {
                 $user_id = EEH_Activation::get_default_creator_id();
                 $SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_wp_user, PRT_deleted ) VALUES
-							(1, '" . __('Base Price', 'event_espresso') . "', 1,  0, 0, $user_id, 0),
-							(2, '" . __('Percent Discount', 'event_espresso') . "', 2,  1, 20, $user_id, 0),
-							(3, '" . __('Dollar Discount', 'event_espresso') . "', 2,  0, 30, $user_id, 0),
-							(4, '" . __('Percent Surcharge', 'event_espresso') . "', 3,  1, 40, $user_id,  0),
-							(5, '" . __('Dollar Surcharge', 'event_espresso') . "', 3,  0, 50, $user_id, 0);";
+							(1, '".__('Base Price', 'event_espresso')."', 1,  0, 0, $user_id, 0),
+							(2, '".__('Percent Discount', 'event_espresso')."', 2,  1, 20, $user_id, 0),
+							(3, '".__('Dollar Discount', 'event_espresso')."', 2,  0, 30, $user_id, 0),
+							(4, '".__('Percent Surcharge', 'event_espresso')."', 3,  1, 40, $user_id,  0),
+							(5, '".__('Dollar Surcharge', 'event_espresso')."', 3,  0, 50, $user_id, 0);";
                 $SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_price_types__SQL', $SQL);
                 $wpdb->query($SQL);
             }
@@ -511,11 +511,11 @@ 
     public function insert_default_prices()
     {
         global $wpdb;
-        $price_table = $wpdb->prefix . "esp_price";
+        $price_table = $wpdb->prefix."esp_price";
         if ($this->_get_table_analysis()->tableExists($price_table)) {
-            $SQL = 'SELECT COUNT(PRC_ID) FROM ' . $price_table;
+            $SQL = 'SELECT COUNT(PRC_ID) FROM '.$price_table;
             $prices_exist = $wpdb->get_var($SQL);
-            if (! $prices_exist) {
+            if ( ! $prices_exist) {
                 $user_id = EEH_Activation::get_default_creator_id();
                 $SQL = "INSERT INTO $price_table
 							(PRC_ID, PRT_ID, PRC_amount, PRC_name, PRC_desc,  PRC_is_default, PRC_overrides, PRC_wp_user, PRC_order, PRC_deleted, PRC_parent ) VALUES
@@ -538,11 +538,11 @@ 
     public function insert_default_tickets()
     {
         global $wpdb;
-        $ticket_table = $wpdb->prefix . "esp_ticket";
+        $ticket_table = $wpdb->prefix."esp_ticket";
         if ($this->_get_table_analysis()->tableExists($ticket_table)) {
-            $SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
+            $SQL = 'SELECT COUNT(TKT_ID) FROM '.$ticket_table;
             $tickets_exist = $wpdb->get_var($SQL);
-            if (! $tickets_exist) {
+            if ( ! $tickets_exist) {
                 $user_id = EEH_Activation::get_default_creator_id();
                 $SQL = "INSERT INTO $ticket_table
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_required, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_wp_user, TKT_deleted ) VALUES
@@ -553,11 +553,11 @@ 
                 $wpdb->query($SQL);
             }
         }
-        $ticket_price_table = $wpdb->prefix . "esp_ticket_price";
+        $ticket_price_table = $wpdb->prefix."esp_ticket_price";
         if ($this->_get_table_analysis()->tableExists($ticket_price_table)) {
-            $SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
+            $SQL = 'SELECT COUNT(TKP_ID) FROM '.$ticket_price_table;
             $ticket_prc_exist = $wpdb->get_var($SQL);
-            if (! $ticket_prc_exist) {
+            if ( ! $ticket_prc_exist) {
                 $SQL = "INSERT INTO $ticket_price_table
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
 				( 1, 1, 1 )