eventespresso / event-espresso-core

modules/bot_trap/EED_Bot_Trap.module.php

Spacing +51 added lines, -51 removed lines

@@ -18,7 +18,7 @@ 
 	 * @return EED_Bot_Trap
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -31,12 +31,12 @@ 
 	 */
 	public static function set_hooks() {
         if (
-			apply_filters( 'FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true ) &&
+			apply_filters('FHEE__EED_Bot_Trap__set_hooks__use_bot_trap', true) &&
 			\EE_Registry::instance()->CFG->registration->use_bot_trap
 		) {
             \EED_Bot_Trap::set_trap();
 			// redirect bots to bogus success page
-			\EE_Config::register_route( 'ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success' );
+			\EE_Config::register_route('ticket_selection_received', 'EED_Bot_Trap', 'display_bot_trap_success');
 		}
 	}
 
@@ -49,7 +49,7 @@ 
 	 *  @return 	void
 	 */
 	public static function set_trap() {
-        define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__) . DS);
+        define('EE_BOT_TRAP_BASE_URL', plugin_dir_url(__FILE__).DS);
         add_action(
             'AHEE__ticket_selector_chart__template__after_ticket_selector',
             array('EED_Bot_Trap', 'generate_bot_trap'),
@@ -81,12 +81,12 @@ 
         }
         add_action(
 			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-			array( 'EED_Bot_Trap', 'bot_trap_settings_form' ),
+			array('EED_Bot_Trap', 'bot_trap_settings_form'),
 			10
 		);
 		add_filter(
 			'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
-			array( 'EED_Bot_Trap', 'update_bot_trap_settings_form' ),
+			array('EED_Bot_Trap', 'update_bot_trap_settings_form'),
 			10, 1
 		);
 	}
@@ -100,7 +100,7 @@ 
 	 * @param    WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {}
+	public function run($WP) {}
 
 
 
@@ -111,14 +111,14 @@ 
 	 * @return    void
 	 */
 	public static function generate_bot_trap() {
-		$do_not_enter = esc_html__( 'please do not enter anything in this input', 'event_espresso' );
+		$do_not_enter = esc_html__('please do not enter anything in this input', 'event_espresso');
 		$html = '<div id="tkt-slctr-request-processor-dv" style="float:left; margin:0 0 0 -999em; height: 0;">';
-		$html .= '<label for="tkt-slctr-request-processor-email">' . $do_not_enter  . '</label>';
+		$html .= '<label for="tkt-slctr-request-processor-email">'.$do_not_enter.'</label>';
 		$html .= '<input type="email" name="tkt-slctr-request-processor-email" value=""/>';
 		$html .= '<input type="hidden" name="tkt-slctr-request-processor-token" value="';
-		if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
-			EE_Registry::instance()->load_core( 'EE_Encryption' );
-			$html .= EE_Encryption::instance()->encrypt( time() );
+		if (EE_Registry::instance()->CFG->registration->use_encryption) {
+			EE_Registry::instance()->load_core('EE_Encryption');
+			$html .= EE_Encryption::instance()->encrypt(time());
 		} else {
 			$html .= time();
 		}
@@ -136,38 +136,38 @@ 
      *                                              It should receive one argument: a boolean indicating
      *                                              whether the trap was triggered by suspicious timing or not.
 	 */
-	public static function process_bot_trap( $triggered_trap_callback = array() ) {
+	public static function process_bot_trap($triggered_trap_callback = array()) {
         // what's your email address Mr. Bot ?
-		$empty_trap = isset( $_REQUEST[ 'tkt-slctr-request-processor-email' ] )
-                      && $_REQUEST[ 'tkt-slctr-request-processor-email' ] === ''
+		$empty_trap = isset($_REQUEST['tkt-slctr-request-processor-email'])
+                      && $_REQUEST['tkt-slctr-request-processor-email'] === ''
             ? true
             : false;
 		// get encrypted timestamp for when the form was originally displayed
-		$bot_trap_timestamp = isset( $_REQUEST[ 'tkt-slctr-request-processor-token' ] )
-            ? sanitize_text_field( $_REQUEST[ 'tkt-slctr-request-processor-token' ] )
+		$bot_trap_timestamp = isset($_REQUEST['tkt-slctr-request-processor-token'])
+            ? sanitize_text_field($_REQUEST['tkt-slctr-request-processor-token'])
             : '';
 		// decrypt and convert to absolute  integer
-		if ( EE_Registry::instance()->CFG->registration->use_encryption ) {
-			EE_Registry::instance()->load_core( 'EE_Encryption' );
-			$bot_trap_timestamp = absint( EE_Encryption::instance()->decrypt( $bot_trap_timestamp ) );
+		if (EE_Registry::instance()->CFG->registration->use_encryption) {
+			EE_Registry::instance()->load_core('EE_Encryption');
+			$bot_trap_timestamp = absint(EE_Encryption::instance()->decrypt($bot_trap_timestamp));
 		} else {
-			$bot_trap_timestamp = absint( $bot_trap_timestamp );
+			$bot_trap_timestamp = absint($bot_trap_timestamp);
 		}
 		// ticket form submitted too impossibly fast ( after now ) or more than an hour later ???
-		$suspicious_timing = $bot_trap_timestamp > time() || $bot_trap_timestamp < ( time() - HOUR_IN_SECONDS )
+		$suspicious_timing = $bot_trap_timestamp > time() || $bot_trap_timestamp < (time() - HOUR_IN_SECONDS)
             ? true
             : false;
 		// are we human ?
-		if ( $empty_trap && ! $suspicious_timing ) {
+		if ($empty_trap && ! $suspicious_timing) {
 		    do_action('AHEE__EED_Bot_Trap__process_bot_trap__trap_not_triggered');
 			return;
 		}
 		// check the given callback is valid first before executing
-		if ( ! is_callable($triggered_trap_callback ) ) {
+		if ( ! is_callable($triggered_trap_callback)) {
 			// invalid callback so lets just sub in our default.
-            $triggered_trap_callback = array( 'EED_Bot_Trap', 'triggered_trap_response' );
+            $triggered_trap_callback = array('EED_Bot_Trap', 'triggered_trap_response');
 		}
-		call_user_func_array($triggered_trap_callback, array( $suspicious_timing ) );
+		call_user_func_array($triggered_trap_callback, array($suspicious_timing));
 	}
 
 
@@ -178,15 +178,15 @@ 
 	 *
 	 * @param bool  $suspicious_timing  If true, then the bot trap was triggered due to the suspicious timing test.
 	 */
-	public static function triggered_trap_response( $suspicious_timing ) {
+	public static function triggered_trap_response($suspicious_timing) {
 		// UH OH...
 		$redirect_url = add_query_arg(
-			array( 'ee' => 'ticket_selection_received' ),
+			array('ee' => 'ticket_selection_received'),
 			EE_Registry::instance()->CFG->core->reg_page_url()
 		);
-		if ( $suspicious_timing ) {
+		if ($suspicious_timing) {
 			$redirect_url = add_query_arg(
-				array( 'ee-notice' => urlencode( esc_html__( 'We\'re sorry, but your ticket selections could not be processed due to a server timing error. Please hit the back button on your browser and try again.', 'event_espresso' ) ) ),
+				array('ee-notice' => urlencode(esc_html__('We\'re sorry, but your ticket selections could not be processed due to a server timing error. Please hit the back button on your browser and try again.', 'event_espresso'))),
 				$redirect_url
 			);
 		}
@@ -217,10 +217,10 @@ 
 	 * @return    void
 	 */
 	public static function display_bot_trap_success() {
-		add_filter( 'FHEE__EED_Single_Page_Checkout__run', '__return_false' );
-		$bot_notice = esc_html__( 'Thank you so much. Your ticket selections have been received for consideration.', 'event_espresso' );
-		$bot_notice = isset( $_REQUEST[ 'ee-notice' ] ) && $_REQUEST[ 'ee-notice' ] !== '' ? sanitize_text_field( stripslashes( $_REQUEST[ 'ee-notice' ] ) ) : $bot_notice;
-		EE_Registry::instance()->REQ->add_output( EEH_HTML::div( $bot_notice, '', 'ee-attention' ) );
+		add_filter('FHEE__EED_Single_Page_Checkout__run', '__return_false');
+		$bot_notice = esc_html__('Thank you so much. Your ticket selections have been received for consideration.', 'event_espresso');
+		$bot_notice = isset($_REQUEST['ee-notice']) && $_REQUEST['ee-notice'] !== '' ? sanitize_text_field(stripslashes($_REQUEST['ee-notice'])) : $bot_notice;
+		EE_Registry::instance()->REQ->add_output(EEH_HTML::div($bot_notice, '', 'ee-attention'));
 	}
 
 
@@ -255,20 +255,20 @@ 
 				'html_id'         			=> 'bot_trap_settings',
 				'layout_strategy' 	=> new EE_Admin_Two_Column_Layout(),
 				'subsections'     		=> array(
-					'bot_trap_hdr' 		=> new EE_Form_Section_HTML( EEH_HTML::h2( esc_html__( 'Bot Trap Settings', 'event_espresso' ) ) ),
+					'bot_trap_hdr' 		=> new EE_Form_Section_HTML(EEH_HTML::h2(esc_html__('Bot Trap Settings', 'event_espresso'))),
 					'use_bot_trap' 		=> new EE_Yes_No_Input(
 						array(
-							'html_label_text' 	=> esc_html__( 'Enable Bot Trap', 'event_espresso' ),
-							'html_help_text' 		=>  esc_html__( 'The Event Espresso Bot Trap will insert a fake input into your Ticket Selector forms that is hidden from regular site visitors, but visible to spam bots. Because the input asks for an email address, it is irresistible to spam bots who will of course enter text into it. Since regular site visitors can not see this input, any value detected during form submission means a bot has been detected, which will then be blocked from submitting the form.', 'event_espresso' ),
-							'default'        			=> isset( EE_Registry::instance()->CFG->registration->use_bot_trap ) ? EE_Registry::instance()->CFG->registration->use_bot_trap : true,
+							'html_label_text' 	=> esc_html__('Enable Bot Trap', 'event_espresso'),
+							'html_help_text' 		=>  esc_html__('The Event Espresso Bot Trap will insert a fake input into your Ticket Selector forms that is hidden from regular site visitors, but visible to spam bots. Because the input asks for an email address, it is irresistible to spam bots who will of course enter text into it. Since regular site visitors can not see this input, any value detected during form submission means a bot has been detected, which will then be blocked from submitting the form.', 'event_espresso'),
+							'default'        			=> isset(EE_Registry::instance()->CFG->registration->use_bot_trap) ? EE_Registry::instance()->CFG->registration->use_bot_trap : true,
 							'required'        		=> false
 						)
 					),
 					'use_encryption' 		=> new EE_Yes_No_Input(
 						array(
-							'html_label_text' 	=> esc_html__( 'Encrypt Bot Trap Data', 'event_espresso' ),
-							'html_help_text' 		=>  esc_html__( 'One way to detect spam bots is by looking at how long it takes them to submit a form. They are often inhumanly fast, or will submit forms hours, days, or even weeks after the form was first scraped off the web. The Event Espresso Bot Trap will send a timestamp with the Ticket Selector form when it is submitted. By default, this timestamp is encrypted so that the spam bots can not change it, but encryption may cause issues on some servers due to configuration "conflicts". If you continuously get caught in the bot trap, then try setting this option to "No". This may increase the number of spam submissions you receive, but increases server compatibility.', 'event_espresso' ),
-							'default'        			=> isset( EE_Registry::instance()->CFG->registration->use_encryption ) ? EE_Registry::instance()->CFG->registration->use_encryption : true,
+							'html_label_text' 	=> esc_html__('Encrypt Bot Trap Data', 'event_espresso'),
+							'html_help_text' 		=>  esc_html__('One way to detect spam bots is by looking at how long it takes them to submit a form. They are often inhumanly fast, or will submit forms hours, days, or even weeks after the form was first scraped off the web. The Event Espresso Bot Trap will send a timestamp with the Ticket Selector form when it is submitted. By default, this timestamp is encrypted so that the spam bots can not change it, but encryption may cause issues on some servers due to configuration "conflicts". If you continuously get caught in the bot trap, then try setting this option to "No". This may increase the number of spam submissions you receive, but increases server compatibility.', 'event_espresso'),
+							'default'        			=> isset(EE_Registry::instance()->CFG->registration->use_encryption) ? EE_Registry::instance()->CFG->registration->use_encryption : true,
 							'required'        		=> false
 						)
 					),
@@ -286,30 +286,30 @@ 
 	 * @param \EE_Registration_Config $EE_Registration_Config
 	 * @return \EE_Registration_Config
 	 */
-	public static function update_bot_trap_settings_form( EE_Registration_Config $EE_Registration_Config ) {
+	public static function update_bot_trap_settings_form(EE_Registration_Config $EE_Registration_Config) {
 		try {
 			$bot_trap_settings_form = EED_Bot_Trap::_bot_trap_settings_form();
 			// if not displaying a form, then check for form submission
-			if ( $bot_trap_settings_form->was_submitted() ) {
+			if ($bot_trap_settings_form->was_submitted()) {
 				// capture form data
 				$bot_trap_settings_form->receive_form_submission();
 				// validate form data
-				if ( $bot_trap_settings_form->is_valid() ) {
+				if ($bot_trap_settings_form->is_valid()) {
 					// grab validated data from form
 					$valid_data = $bot_trap_settings_form->valid_data();
-					if ( isset( $valid_data[ 'use_bot_trap' ], $valid_data[ 'use_encryption' ] ) ) {
-						$EE_Registration_Config->use_bot_trap = $valid_data[ 'use_bot_trap' ];
-						$EE_Registration_Config->use_encryption = $valid_data[ 'use_encryption' ];
+					if (isset($valid_data['use_bot_trap'], $valid_data['use_encryption'])) {
+						$EE_Registration_Config->use_bot_trap = $valid_data['use_bot_trap'];
+						$EE_Registration_Config->use_encryption = $valid_data['use_encryption'];
 					} else {
-						EE_Error::add_error( esc_html__( 'Invalid or missing Bot Trap settings. Please refresh the form and try again.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+						EE_Error::add_error(esc_html__('Invalid or missing Bot Trap settings. Please refresh the form and try again.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					}
 				} else {
-					if ( $bot_trap_settings_form->submission_error_message() != '' ) {
-						EE_Error::add_error( $bot_trap_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__ );
+					if ($bot_trap_settings_form->submission_error_message() != '') {
+						EE_Error::add_error($bot_trap_settings_form->submission_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 			}
-		} catch ( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			$e->get_error();
 		}
 		return $EE_Registration_Config;

modules/ticket_selector/templates/ticket_selector_chart_iframe.template.php

Indentation -3 removed lines

@@ -1,16 +1,13 @@
 <?php
 /**
  * Template for the ticket selector when displayed in an iframe.
-
  * Following template arguments are available:
-
  * @type string $notices	HTML for notices and ajax gif
  * @type string $ticket_selector This is the html for the ticket selector.
  * @type string $powered_by credit link
  * @type array $css 		An array of css urls.
  * @type string $eei18n 	localized JSON vars
  * @type array $js 			An array of js urls.
-
  * @since 4.6.7
  * @package Event Espresso
  * @subpackage module

admin_pages/transactions/Transactions_Admin_Page.core.php

Indentation +59 added lines, -59 removed lines

@@ -106,9 +106,9 @@ 
 
 	/**
 	 * 		grab url requests and route them
-	*		@access private
-	*		@return void
-	*/
+	 *		@access private
+	 *		@return void
+	 */
 	public function _set_page_routes() {
 
 		$this->_set_transaction_status_array();
@@ -263,10 +263,10 @@ 
 	/**
 	 * _set_transaction_status_array
 	 * sets list of transaction statuses
-	*
+	 *
 	 * @access private
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	private function _set_transaction_status_array() {
 		self::$_txn_status = EEM_Transaction::instance()->status_array(TRUE);
 	}
@@ -288,10 +288,10 @@ 
 
 	/**
 	 * 	get list of payment statuses
-	*
+	 *
 	 * @access private
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	private function _get_payment_status_array() {
 		self::$_pay_status = EEM_Payment::instance()->status_array(TRUE);
 		$this->_template_args['payment_status'] = self::$_pay_status;
@@ -399,19 +399,19 @@ 
 		if ( is_object( $this->_transaction) )
 			return; //get out we've already set the object
 
-	    $TXN = EEM_Transaction::instance();
+		$TXN = EEM_Transaction::instance();
 
-	    $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
+		$TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
 
-	    //get transaction object
-	    $this->_transaction = $TXN->get_one_by_ID($TXN_ID);
-	    $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL;
+		//get transaction object
+		$this->_transaction = $TXN->get_one_by_ID($TXN_ID);
+		$this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL;
 		$this->_transaction->verify_abandoned_transaction_status();
 
 	 	if ( empty( $this->_transaction ) ) {
-	    	$error_msg = esc_html__('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID .  esc_html__(' could not be retrieved.', 'event_espresso');
+			$error_msg = esc_html__('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID .  esc_html__(' could not be retrieved.', 'event_espresso');
 			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
-	    }
+		}
 	}
 
 
@@ -526,12 +526,12 @@ 
 
 
 	/**
-	* 	_transaction_details
+	 * 	_transaction_details
 	 * generates HTML for the View Transaction Details Admin page
-	*
+	 *
 	 * @access protected
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	protected function _transaction_details() {
 		do_action( 'AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction );
 
@@ -582,7 +582,7 @@ 
 						'button secondary-button right',
 						'dashicons dashicons-email-alt'
 					)
-				    : '';
+					: '';
 		} else {
 			$this->_template_args['send_payment_reminder_button'] = '';
 		}
@@ -736,10 +736,10 @@ 
 	/**
 	 * txn_details_meta_box
 	 * generates HTML for the Transaction main meta box
-	*
+	 *
 	 * @access public
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	public function txn_details_meta_box() {
 
 		$this->_set_transaction_object();
@@ -1115,10 +1115,10 @@ 
 	/**
 	 * txn_billing_info_side_meta_box
 	 * 	generates HTML for the Edit Transaction side meta box
-	*
+	 *
 	 * @access public
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	public function txn_billing_info_side_meta_box() {
 
 		$this->_template_args['billing_form'] = $this->_transaction->billing_info();
@@ -1136,10 +1136,10 @@ 
 	/**
 	 * apply_payments_or_refunds
 	 * 	registers a payment or refund made towards a transaction
-	*
+	 *
 	 * @access public
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	public function apply_payments_or_refunds() {
 		$json_response_data = array( 'return_data' => FALSE );
 		$valid_data = $this->_validate_payment_request_data();
@@ -1293,9 +1293,9 @@ 
 							'default' => '',
 							'required' => false,
 							'html_label_text' => esc_html__( 'Transaction or Cheque Number', 'event_espresso' ),
-                                                        'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( esc_html__('Input too long', 'event_espresso'), 100 ),
-                                                        )
+														'validation_strategies' => array(
+															new EE_Max_Length_Validation_Strategy( esc_html__('Input too long', 'event_espresso'), 100 ),
+														)
 						)
 					),
 					'po_number' => new EE_Text_Input(
@@ -1303,9 +1303,9 @@ 
 							'default' => '',
 							'required' => false,
 							'html_label_text' => esc_html__( 'Purchase Order Number', 'event_espresso' ),
-                                                        'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( esc_html__('Input too long', 'event_espresso'), 100 ),
-                                                        )
+														'validation_strategies' => array(
+															new EE_Max_Length_Validation_Strategy( esc_html__('Input too long', 'event_espresso'), 100 ),
+														)
 						)
 					),
 					'accounting' => new EE_Text_Input(
@@ -1313,9 +1313,9 @@ 
 							'default' => '',
 							'required' => false,
 							'html_label_text' => esc_html__( 'Extra Field for Accounting', 'event_espresso' ),
-                                                        'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( esc_html__('Input too long', 'event_espresso'), 100 ),
-                                                        )
+														'validation_strategies' => array(
+															new EE_Max_Length_Validation_Strategy( esc_html__('Input too long', 'event_espresso'), 100 ),
+														)
 						)
 					),
 				)
@@ -1610,10 +1610,10 @@ 
 	/**
 	 * delete_payment
 	 * 	delete a payment or refund made towards a transaction
-	*
+	 *
 	 * @access public
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	public function delete_payment() {
 		$json_response_data = array( 'return_data' => FALSE );
 		$PAY_ID = isset( $this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) ? absint( $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) : 0;
@@ -1730,12 +1730,12 @@ 
 	/**
 	 * _send_payment_reminder
 	 * 	generates HTML for the View Transaction Details Admin page
-	*
+	 *
 	 * @access protected
-	*	@return void
-	*/
+	 *	@return void
+	 */
 	protected function _send_payment_reminder() {
-	    $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
+		$TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
 		$transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
 		$query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID'] ) : array();
 		do_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction );
@@ -1757,29 +1757,29 @@ 
 
 		$TXN = EEM_Transaction::instance();
 
-	    $start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' ));
-	    $end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' );
+		$start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' ));
+		$end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' );
 
-	    //make sure our timestamps start and end right at the boundaries for each day
-	    $start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00';
-	    $end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59';
+		//make sure our timestamps start and end right at the boundaries for each day
+		$start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00';
+		$end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59';
 
 
-	    //convert to timestamps
-	    $start_date = strtotime( $start_date );
-	    $end_date = strtotime( $end_date );
+		//convert to timestamps
+		$start_date = strtotime( $start_date );
+		$end_date = strtotime( $end_date );
 
-	    //makes sure start date is the lowest value and vice versa
-	    $start_date = min( $start_date, $end_date );
-	    $end_date = max( $start_date, $end_date );
+		//makes sure start date is the lowest value and vice versa
+		$start_date = min( $start_date, $end_date );
+		$end_date = max( $start_date, $end_date );
 
-	    //convert to correct format for query
+		//convert to correct format for query
 	$start_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' );
 	$end_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' );
 
 
 
-	    //set orderby
+		//set orderby
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
 
 		switch ( $this->_req_data['orderby'] ) {

Spacing +418 added lines, -418 removed lines

@@ -56,8 +56,8 @@ 
 	 * @param bool $routing
 	 * @return Transactions_Admin_Page
 	 */
-	public function __construct( $routing = TRUE ) {
-		parent::__construct( $routing );
+	public function __construct($routing = TRUE) {
+		parent::__construct($routing);
 	}
 
 
@@ -80,9 +80,9 @@ 
 	 * @return void
 	 */
 	protected function _ajax_hooks() {
-		add_action('wp_ajax_espresso_apply_payment', array( $this, 'apply_payments_or_refunds'));
-		add_action('wp_ajax_espresso_apply_refund', array( $this, 'apply_payments_or_refunds'));
-		add_action('wp_ajax_espresso_delete_payment', array( $this, 'delete_payment'));
+		add_action('wp_ajax_espresso_apply_payment', array($this, 'apply_payments_or_refunds'));
+		add_action('wp_ajax_espresso_apply_refund', array($this, 'apply_payments_or_refunds'));
+		add_action('wp_ajax_espresso_delete_payment', array($this, 'delete_payment'));
 	}
 
 
@@ -97,7 +97,7 @@ 
 			'buttons' => array(
 				'add' => esc_html__('Add New Transaction', 'event_espresso'),
 				'edit' => esc_html__('Edit Transaction', 'event_espresso'),
-				'delete' => esc_html__('Delete Transaction','event_espresso'),
+				'delete' => esc_html__('Delete Transaction', 'event_espresso'),
 			)
 		);
 	}
@@ -113,7 +113,7 @@ 
 
 		$this->_set_transaction_status_array();
 
-		$txn_id = ! empty( $this->_req_data['TXN_ID'] ) && ! is_array( $this->_req_data['TXN_ID'] ) ? $this->_req_data['TXN_ID'] : 0;
+		$txn_id = ! empty($this->_req_data['TXN_ID']) && ! is_array($this->_req_data['TXN_ID']) ? $this->_req_data['TXN_ID'] : 0;
 
 		$this->_page_routes = array(
 
@@ -185,7 +185,7 @@ 
 						'filename' => 'transactions_overview_views_filters_search'
 					),
 				),
-				'help_tour' => array( 'Transactions_Overview_Help_Tour' ),
+				'help_tour' => array('Transactions_Overview_Help_Tour'),
 				/**
 				 * commented out because currently we are not displaying tips for transaction list table status but this
 				 * may change in a later iteration so want to keep the code for then.
@@ -197,7 +197,7 @@ 
 				'nav' => array(
 					'label' => esc_html__('View Transaction', 'event_espresso'),
 					'order' => 5,
-					'url' => isset($this->_req_data['TXN_ID']) ? add_query_arg(array('TXN_ID' => $this->_req_data['TXN_ID'] ), $this->_current_page_view_url )  : $this->_admin_base_url,
+					'url' => isset($this->_req_data['TXN_ID']) ? add_query_arg(array('TXN_ID' => $this->_req_data['TXN_ID']), $this->_current_page_view_url) : $this->_admin_base_url,
 					'persistent' => FALSE
 					),
 				'help_tabs' => array(
@@ -218,8 +218,8 @@ 
 						'filename' => 'transactions_view_transaction_primary_registrant_billing_information'
 					),
 				),
-				'qtips' => array( 'Transaction_Details_Tips' ),
-				'help_tour' => array( 'Transaction_Details_Help_Tour' ),
+				'qtips' => array('Transaction_Details_Tips'),
+				'help_tour' => array('Transaction_Details_Help_Tour'),
 				'metaboxes' => array('_transaction_details_metaboxes'),
 
 				'require_nonce' => FALSE
@@ -237,23 +237,23 @@ 
 		// IF a registration was JUST added via the admin...
 		if (
 		isset(
-			$this->_req_data[ 'redirect_from' ],
-			$this->_req_data[ 'EVT_ID' ],
-			$this->_req_data[ 'event_name' ]
+			$this->_req_data['redirect_from'],
+			$this->_req_data['EVT_ID'],
+			$this->_req_data['event_name']
 		)
 		) {
 			// then set a cookie so that we can block any attempts to use
 			// the back button as a way to enter another registration.
-			setcookie( 'ee_registration_added', $this->_req_data[ 'EVT_ID' ], time() + WEEK_IN_SECONDS, '/' );
+			setcookie('ee_registration_added', $this->_req_data['EVT_ID'], time() + WEEK_IN_SECONDS, '/');
 			// and update the global
-			$_COOKIE[ 'ee_registration_added' ] = $this->_req_data[ 'EVT_ID' ];
+			$_COOKIE['ee_registration_added'] = $this->_req_data['EVT_ID'];
 		}
-		EE_Registry::$i18n_js_strings[ 'invalid_server_response' ] = esc_html__( 'An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings[ 'error_occurred' ] = esc_html__( 'An error occurred! Please refresh the page and try again.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings[ 'txn_status_array' ] = self::$_txn_status;
-		EE_Registry::$i18n_js_strings[ 'pay_status_array' ] = self::$_pay_status;
-		EE_Registry::$i18n_js_strings[ 'payments_total' ] = esc_html__( 'Payments Total', 'event_espresso' );
-		EE_Registry::$i18n_js_strings[ 'transaction_overpaid' ] = esc_html__( 'This transaction has been overpaid ! Payments Total', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['invalid_server_response'] = esc_html__('An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['error_occurred'] = esc_html__('An error occurred! Please refresh the page and try again.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['txn_status_array'] = self::$_txn_status;
+		EE_Registry::$i18n_js_strings['pay_status_array'] = self::$_pay_status;
+		EE_Registry::$i18n_js_strings['payments_total'] = esc_html__('Payments Total', 'event_espresso');
+		EE_Registry::$i18n_js_strings['transaction_overpaid'] = esc_html__('This transaction has been overpaid ! Payments Total', 'event_espresso');
 	}
 	public function admin_notices() {}
 	public function admin_footer_scripts() {}
@@ -320,14 +320,14 @@ 
 	 */
 	public function load_scripts_styles() {
 		//enqueue style
-		wp_register_style( 'espresso_txn', TXN_ASSETS_URL . 'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION );
+		wp_register_style('espresso_txn', TXN_ASSETS_URL.'espresso_transactions_admin.css', array(), EVENT_ESPRESSO_VERSION);
 		wp_enqueue_style('espresso_txn');
 
 		//scripts
 		add_filter('FHEE_load_accounting_js', '__return_true');
 
 		//scripts
-		wp_register_script('espresso_txn', TXN_ASSETS_URL . 'espresso_transactions_admin.js', array('ee_admin_js', 'ee-datepicker', 'jquery-ui-datepicker', 'jquery-ui-draggable', 'ee-dialog', 'ee-accounting', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_register_script('espresso_txn', TXN_ASSETS_URL.'espresso_transactions_admin.js', array('ee_admin_js', 'ee-datepicker', 'jquery-ui-datepicker', 'jquery-ui-draggable', 'ee-dialog', 'ee-accounting', 'ee-serialize-full-array'), EVENT_ESPRESSO_VERSION, TRUE);
 		wp_enqueue_script('espresso_txn');
 
 	}
@@ -367,8 +367,8 @@ 
 	 *	@return void
 	 */
 	protected function _set_list_table_views_default() {
-		$this->_views = array (
-			'all' => array (
+		$this->_views = array(
+			'all' => array(
 				'slug' 		=> 'all',
 				'label' 		=> esc_html__('View All Transactions', 'event_espresso'),
 				'count' 	=> 0
@@ -396,21 +396,21 @@ 
 	 *	@return void
 	 */
 	private function _set_transaction_object() {
-		if ( is_object( $this->_transaction) )
+		if (is_object($this->_transaction))
 			return; //get out we've already set the object
 
 	    $TXN = EEM_Transaction::instance();
 
-	    $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
+	    $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE;
 
 	    //get transaction object
 	    $this->_transaction = $TXN->get_one_by_ID($TXN_ID);
-	    $this->_session = !empty( $this->_transaction ) ? $this->_transaction->get('TXN_session_data') : NULL;
+	    $this->_session = ! empty($this->_transaction) ? $this->_transaction->get('TXN_session_data') : NULL;
 		$this->_transaction->verify_abandoned_transaction_status();
 
-	 	if ( empty( $this->_transaction ) ) {
-	    	$error_msg = esc_html__('An error occurred and the details for Transaction ID #', 'event_espresso') . $TXN_ID .  esc_html__(' could not be retrieved.', 'event_espresso');
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+	 	if (empty($this->_transaction)) {
+	    	$error_msg = esc_html__('An error occurred and the details for Transaction ID #', 'event_espresso').$TXN_ID.esc_html__(' could not be retrieved.', 'event_espresso');
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 	    }
 	}
 
@@ -423,12 +423,12 @@ 
 	 *	@return array
 	 */
 	protected function _transaction_legend_items() {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 		$items = array();
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_read_global_messages', 'view_filtered_messages' ) ) {
-			$related_for_icon = EEH_MSG_Template::get_message_action_icon( 'see_notifications_for' );
-			if ( isset( $related_for_icon['css_class']) && isset( $related_for_icon['label'] ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_read_global_messages', 'view_filtered_messages')) {
+			$related_for_icon = EEH_MSG_Template::get_message_action_icon('see_notifications_for');
+			if (isset($related_for_icon['css_class']) && isset($related_for_icon['label'])) {
 				$items['view_related_messages'] = array(
 					'class' => $related_for_icon['css_class'],
 					'desc' => $related_for_icon['label'],
@@ -438,7 +438,7 @@ 
 
 		$items = apply_filters(
 			'FHEE__Transactions_Admin_Page___transaction_legend_items__items',
-			array_merge( $items,
+			array_merge($items,
 				array(
 					'view_details' => array(
 						'class' => 'dashicons dashicons-cart',
@@ -450,7 +450,7 @@ 
 					),
 					'view_receipt' => array(
 						'class' => 'dashicons dashicons-media-default',
-						'desc' => esc_html__('View Transaction Receipt', 'event_espresso' )
+						'desc' => esc_html__('View Transaction Receipt', 'event_espresso')
 					),
 					'view_registration' => array(
 						'class' => 'dashicons dashicons-clipboard',
@@ -460,8 +460,8 @@ 
 			)
 		);
 
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_send_message', 'espresso_transactions_send_payment_reminder' ) ) {
-			if ( EEH_MSG_Template::is_mt_active( 'payment_reminder' ) ) {
+		if (EE_Registry::instance()->CAP->current_user_can('ee_send_message', 'espresso_transactions_send_payment_reminder')) {
+			if (EEH_MSG_Template::is_mt_active('payment_reminder')) {
 				$items['send_payment_reminder'] = array(
 					'class' => 'dashicons dashicons-email-alt',
 					'desc' => esc_html__('Send Payment Reminder', 'event_espresso')
@@ -482,29 +482,29 @@ 
 			'FHEE__Transactions_Admin_Page___transaction_legend_items__more_items',
 			array(
 				'overpaid'   => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::overpaid_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::overpaid_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::overpaid_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::overpaid_status_code, FALSE, 'sentence')
 				),
 				'complete'   => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::complete_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::complete_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::complete_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::complete_status_code, FALSE, 'sentence')
 				),
 				'incomplete' => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::incomplete_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::incomplete_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::incomplete_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::incomplete_status_code, FALSE, 'sentence')
 				),
 				'abandoned'  => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::abandoned_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::abandoned_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::abandoned_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::abandoned_status_code, FALSE, 'sentence')
 				),
 				'failed'     => array(
-					'class' => 'ee-status-legend ee-status-legend-' . EEM_Transaction::failed_status_code,
-					'desc'  => EEH_Template::pretty_status( EEM_Transaction::failed_status_code, FALSE, 'sentence' )
+					'class' => 'ee-status-legend ee-status-legend-'.EEM_Transaction::failed_status_code,
+					'desc'  => EEH_Template::pretty_status(EEM_Transaction::failed_status_code, FALSE, 'sentence')
 				)
 			)
 		);
 
-		return array_merge( $items, $more_items);
+		return array_merge($items, $more_items);
 	}
 
 
@@ -517,9 +517,9 @@ 
 	 */
 	protected function _transactions_overview_list_table() {
 		$this->_admin_page_title = esc_html__('Transactions', 'event_espresso');
-		$event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID'] ) : NULL;
-		$this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf( esc_html__('%sViewing Transactions for the Event: %s%s', 'event_espresso'), '<h3>', '<a href="' . EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL ) . '" title="' . esc_attr__('Click to Edit event', 'event_espresso') . '">' . $event->get('EVT_name') . '</a>', '</h3>' ) : '';
-		$this->_template_args['after_list_table'] = $this->_display_legend( $this->_transaction_legend_items() );
+		$event = isset($this->_req_data['EVT_ID']) ? EEM_Event::instance()->get_one_by_ID($this->_req_data['EVT_ID']) : NULL;
+		$this->_template_args['admin_page_header'] = $event instanceof EE_Event ? sprintf(esc_html__('%sViewing Transactions for the Event: %s%s', 'event_espresso'), '<h3>', '<a href="'.EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $event->ID()), EVENTS_ADMIN_URL).'" title="'.esc_attr__('Click to Edit event', 'event_espresso').'">'.$event->get('EVT_name').'</a>', '</h3>') : '';
+		$this->_template_args['after_list_table'] = $this->_display_legend($this->_transaction_legend_items());
 		$this->display_admin_list_table_page_with_no_sidebar();
 	}
 
@@ -533,7 +533,7 @@ 
 	*	@return void
 	*/
 	protected function _transaction_details() {
-		do_action( 'AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction );
+		do_action('AHEE__Transactions_Admin_Page__transaction_details__start', $this->_transaction);
 
 		$this->_set_transaction_status_array();
 
@@ -546,14 +546,14 @@ 
 		$attendee = $primary_registration instanceof EE_Registration ? $primary_registration->attendee() : NULL;
 
 		$this->_template_args['txn_nmbr']['value'] = $this->_transaction->ID();
-		$this->_template_args['txn_nmbr']['label'] = esc_html__( 'Transaction Number', 'event_espresso' );
+		$this->_template_args['txn_nmbr']['label'] = esc_html__('Transaction Number', 'event_espresso');
 
 		$this->_template_args['txn_datetime']['value'] = $this->_transaction->get_i18n_datetime('TXN_timestamp');
-		$this->_template_args['txn_datetime']['label'] = esc_html__( 'Date', 'event_espresso' );
+		$this->_template_args['txn_datetime']['label'] = esc_html__('Date', 'event_espresso');
 
-		$this->_template_args['txn_status']['value'] = self::$_txn_status[ $this->_transaction->get('STS_ID') ];
-		$this->_template_args['txn_status']['label'] = esc_html__( 'Transaction Status', 'event_espresso' );
-		$this->_template_args['txn_status']['class'] = 'status-' . $this->_transaction->get('STS_ID');
+		$this->_template_args['txn_status']['value'] = self::$_txn_status[$this->_transaction->get('STS_ID')];
+		$this->_template_args['txn_status']['label'] = esc_html__('Transaction Status', 'event_espresso');
+		$this->_template_args['txn_status']['class'] = 'status-'.$this->_transaction->get('STS_ID');
 
 		$this->_template_args['grand_total'] = $this->_transaction->get('TXN_total');
 		$this->_template_args['total_paid'] = $this->_transaction->get('TXN_paid');
@@ -566,7 +566,7 @@ 
 			)
 		) {
 			$this->_template_args['send_payment_reminder_button'] =
-				EEH_MSG_Template::is_mt_active( 'payment_reminder' )
+				EEH_MSG_Template::is_mt_active('payment_reminder')
 				&& $this->_transaction->get('STS_ID') != EEM_Transaction::complete_status_code
 				&& $this->_transaction->get('STS_ID') != EEM_Transaction::overpaid_status_code
 					? EEH_Template::get_button_or_link(
@@ -588,40 +588,40 @@ 
 		}
 
 		$amount_due = $this->_transaction->get('TXN_total') - $this->_transaction->get('TXN_paid');
-		$this->_template_args['amount_due'] = EEH_Template::format_currency( $amount_due, TRUE );
-		if ( EE_Registry::instance()->CFG->currency->sign_b4 ) {
-			$this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign . $this->_template_args['amount_due'];
+		$this->_template_args['amount_due'] = EEH_Template::format_currency($amount_due, TRUE);
+		if (EE_Registry::instance()->CFG->currency->sign_b4) {
+			$this->_template_args['amount_due'] = EE_Registry::instance()->CFG->currency->sign.$this->_template_args['amount_due'];
 		} else {
-			$this->_template_args['amount_due'] = $this->_template_args['amount_due'] . EE_Registry::instance()->CFG->currency->sign;
+			$this->_template_args['amount_due'] = $this->_template_args['amount_due'].EE_Registry::instance()->CFG->currency->sign;
 		}
-		$this->_template_args['amount_due_class'] =  '';
+		$this->_template_args['amount_due_class'] = '';
 
-		if ( $this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total') ) {
+		if ($this->_transaction->get('TXN_paid') == $this->_transaction->get('TXN_total')) {
 			// paid in full
-			$this->_template_args['amount_due'] =  FALSE;
-		} elseif ( $this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total') ) {
+			$this->_template_args['amount_due'] = FALSE;
+		} elseif ($this->_transaction->get('TXN_paid') > $this->_transaction->get('TXN_total')) {
 			// overpaid
-			$this->_template_args['amount_due_class'] =  'txn-overview-no-payment-spn';
-		} elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') > 0 )) {
+			$this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn';
+		} elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') > 0)) {
 			// monies owing
-			$this->_template_args['amount_due_class'] =  'txn-overview-part-payment-spn';
-		} elseif (( $this->_transaction->get('TXN_total') > 0 ) && ( $this->_transaction->get('TXN_paid') == 0 )) {
+			$this->_template_args['amount_due_class'] = 'txn-overview-part-payment-spn';
+		} elseif (($this->_transaction->get('TXN_total') > 0) && ($this->_transaction->get('TXN_paid') == 0)) {
 			// no payments made yet
-			$this->_template_args['amount_due_class'] =  'txn-overview-no-payment-spn';
-		} elseif ( $this->_transaction->get('TXN_total') == 0 ) {
+			$this->_template_args['amount_due_class'] = 'txn-overview-no-payment-spn';
+		} elseif ($this->_transaction->get('TXN_total') == 0) {
 			// free event
-			$this->_template_args['amount_due'] =  FALSE;
+			$this->_template_args['amount_due'] = FALSE;
 		}
 
 		$payment_method = $this->_transaction->payment_method();
 
 		$this->_template_args['method_of_payment_name'] = $payment_method instanceof EE_Payment_Method
 			? $payment_method->admin_name()
-			: esc_html__( 'Unknown', 'event_espresso' );
+			: esc_html__('Unknown', 'event_espresso');
 
 		$this->_template_args['currency_sign'] = EE_Registry::instance()->CFG->currency->sign;
 		// link back to overview
-		$this->_template_args['txn_overview_url'] = ! empty ( $_SERVER['HTTP_REFERER'] )
+		$this->_template_args['txn_overview_url'] = ! empty ($_SERVER['HTTP_REFERER'])
 			? $_SERVER['HTTP_REFERER']
 			: TXN_ADMIN_URL;
 
@@ -629,13 +629,13 @@ 
 		// next link
 		$next_txn = $this->_transaction->next(
 			null,
-			array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ),
+			array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))),
 			'TXN_ID'
 		);
 		$this->_template_args['next_transaction'] = $next_txn
 			? $this->_next_link(
 				EE_Admin_Page::add_query_args_and_nonce(
-					array( 'action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID'] ),
+					array('action' => 'view_transaction', 'TXN_ID' => $next_txn['TXN_ID']),
 					TXN_ADMIN_URL
 				),
 				'dashicons dashicons-arrow-right ee-icon-size-22'
@@ -644,13 +644,13 @@ 
 		// previous link
 		$previous_txn = $this->_transaction->previous(
 			null,
-			array( array( 'STS_ID' => array( '!=', EEM_Transaction::failed_status_code ) ) ),
+			array(array('STS_ID' => array('!=', EEM_Transaction::failed_status_code))),
 			'TXN_ID'
 		);
 		$this->_template_args['previous_transaction'] = $previous_txn
 			? $this->_previous_link(
 				EE_Admin_Page::add_query_args_and_nonce(
-					array( 'action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID'] ),
+					array('action' => 'view_transaction', 'TXN_ID' => $previous_txn['TXN_ID']),
 					TXN_ADMIN_URL
 				),
 				'dashicons dashicons-arrow-left ee-icon-size-22'
@@ -660,16 +660,16 @@ 
 		// were we just redirected here after adding a new registration ???
 		if (
 			isset(
-				$this->_req_data[ 'redirect_from' ],
-				$this->_req_data[ 'EVT_ID' ],
-				$this->_req_data[ 'event_name' ]
+				$this->_req_data['redirect_from'],
+				$this->_req_data['EVT_ID'],
+				$this->_req_data['event_name']
 			)
 		) {
 			if (
 				EE_Registry::instance()->CAP->current_user_can(
 					'ee_edit_registrations',
 					'espresso_registrations_new_registration',
-					$this->_req_data[ 'EVT_ID' ]
+					$this->_req_data['EVT_ID']
 				)
 			) {
 				$this->_admin_page_title .= '<a id="add-new-registration" class="add-new-h2 button-primary" href="';
@@ -679,25 +679,25 @@ 
 						'action'   => 'new_registration',
 						'return'   => 'default',
 						'TXN_ID'   => $this->_transaction->ID(),
-						'event_id' => $this->_req_data[ 'EVT_ID' ],
+						'event_id' => $this->_req_data['EVT_ID'],
 					),
 					REG_ADMIN_URL
 				);
 				$this->_admin_page_title .= '">';
 
 				$this->_admin_page_title .= sprintf(
-					esc_html__('Add Another New Registration to Event: "%1$s" ?', 'event_espresso' ),
-					htmlentities( urldecode( $this->_req_data[ 'event_name' ] ), ENT_QUOTES, 'UTF-8' )
+					esc_html__('Add Another New Registration to Event: "%1$s" ?', 'event_espresso'),
+					htmlentities(urldecode($this->_req_data['event_name']), ENT_QUOTES, 'UTF-8')
 				);
 				$this->_admin_page_title .= '</a>';
 			}
-			EE_Registry::instance()->SSN->clear_session( __CLASS__, __FUNCTION__ );
+			EE_Registry::instance()->SSN->clear_session(__CLASS__, __FUNCTION__);
 		}
 		// grab messages at the last second
 		$this->_template_args['notices'] = EE_Error::get_notices();
 		// path to template
-		$template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_header.template.php';
-		$this->_template_args['admin_page_header'] = EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = TXN_TEMPLATE_PATH.'txn_admin_details_header.template.php';
+		$this->_template_args['admin_page_header'] = EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 		// the details template wrapper
 		$this->display_admin_page_with_sidebar();
@@ -716,18 +716,18 @@ 
 
 		$this->_set_transaction_object();
 
-		add_meta_box( 'edit-txn-details-mbox', esc_html__( 'Transaction Details', 'event_espresso' ), array( $this, 'txn_details_meta_box' ), $this->_wp_page_slug, 'normal', 'high' );
+		add_meta_box('edit-txn-details-mbox', esc_html__('Transaction Details', 'event_espresso'), array($this, 'txn_details_meta_box'), $this->_wp_page_slug, 'normal', 'high');
 		add_meta_box(
 			'edit-txn-attendees-mbox',
-			esc_html__( 'Attendees Registered in this Transaction', 'event_espresso' ),
-			array( $this, 'txn_attendees_meta_box' ),
+			esc_html__('Attendees Registered in this Transaction', 'event_espresso'),
+			array($this, 'txn_attendees_meta_box'),
 			$this->_wp_page_slug,
 			'normal',
 			'high',
-			array( 'TXN_ID' => $this->_transaction->ID() )
+			array('TXN_ID' => $this->_transaction->ID())
 		);
-		add_meta_box( 'edit-txn-registrant-mbox', esc_html__( 'Primary Contact', 'event_espresso' ), array( $this, 'txn_registrant_side_meta_box' ), $this->_wp_page_slug, 'side', 'high' );
-		add_meta_box( 'edit-txn-billing-info-mbox', esc_html__( 'Billing Information', 'event_espresso' ), array( $this, 'txn_billing_info_side_meta_box' ), $this->_wp_page_slug, 'side', 'high' );
+		add_meta_box('edit-txn-registrant-mbox', esc_html__('Primary Contact', 'event_espresso'), array($this, 'txn_registrant_side_meta_box'), $this->_wp_page_slug, 'side', 'high');
+		add_meta_box('edit-txn-billing-info-mbox', esc_html__('Billing Information', 'event_espresso'), array($this, 'txn_billing_info_side_meta_box'), $this->_wp_page_slug, 'side', 'high');
 
 	}
 
@@ -748,15 +748,15 @@ 
 
 		//get line table
 		EEH_Autoloader::register_line_item_display_autoloaders();
-		$Line_Item_Display = new EE_Line_Item_Display( 'admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy' );
-		$this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item( $this->_transaction->total_line_item() );
+		$Line_Item_Display = new EE_Line_Item_Display('admin_table', 'EE_Admin_Table_Line_Item_Display_Strategy');
+		$this->_template_args['line_item_table'] = $Line_Item_Display->display_line_item($this->_transaction->total_line_item());
 		$this->_template_args['REG_code'] = $this->_transaction->get_first_related('Registration')->get('REG_code');
 
 		// process taxes
-		$taxes = $this->_transaction->get_many_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_tax )));
-		$this->_template_args['taxes'] = ! empty( $taxes ) ? $taxes : FALSE;
+		$taxes = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_tax)));
+		$this->_template_args['taxes'] = ! empty($taxes) ? $taxes : FALSE;
 
-		$this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE );
+		$this->_template_args['grand_total'] = EEH_Template::format_currency($this->_transaction->get('TXN_total'), FALSE, FALSE);
 		$this->_template_args['grand_raw_total'] = $this->_transaction->get('TXN_total');
 		$this->_template_args['TXN_status'] = $this->_transaction->get('STS_ID');
 
@@ -764,63 +764,63 @@ 
 
 		// process payment details
 		$payments = $this->_transaction->get_many_related('Payment');
-		if( ! empty(  $payments ) ) {
-			$this->_template_args[ 'payments' ] = $payments;
-			$this->_template_args[ 'existing_reg_payments' ] = $this->_get_registration_payment_IDs( $payments );
+		if ( ! empty($payments)) {
+			$this->_template_args['payments'] = $payments;
+			$this->_template_args['existing_reg_payments'] = $this->_get_registration_payment_IDs($payments);
 		} else {
-			$this->_template_args[ 'payments' ] = false;
-			$this->_template_args[ 'existing_reg_payments' ] = array();
+			$this->_template_args['payments'] = false;
+			$this->_template_args['existing_reg_payments'] = array();
 		}
 
-		$this->_template_args['edit_payment_url'] = add_query_arg( array( 'action' => 'edit_payment'  ), TXN_ADMIN_URL );
-		$this->_template_args['delete_payment_url'] = add_query_arg( array( 'action' => 'espresso_delete_payment' ), TXN_ADMIN_URL );
+		$this->_template_args['edit_payment_url'] = add_query_arg(array('action' => 'edit_payment'), TXN_ADMIN_URL);
+		$this->_template_args['delete_payment_url'] = add_query_arg(array('action' => 'espresso_delete_payment'), TXN_ADMIN_URL);
 
-		if ( isset( $txn_details['invoice_number'] )) {
+		if (isset($txn_details['invoice_number'])) {
 			$this->_template_args['txn_details']['invoice_number']['value'] = $this->_template_args['REG_code'];
-			$this->_template_args['txn_details']['invoice_number']['label'] = esc_html__( 'Invoice Number', 'event_espresso' );
+			$this->_template_args['txn_details']['invoice_number']['label'] = esc_html__('Invoice Number', 'event_espresso');
 		}
 
 		$this->_template_args['txn_details']['registration_session']['value'] = $this->_transaction->get_first_related('Registration')->get('REG_session');
-		$this->_template_args['txn_details']['registration_session']['label'] = esc_html__( 'Registration Session', 'event_espresso' );
+		$this->_template_args['txn_details']['registration_session']['label'] = esc_html__('Registration Session', 'event_espresso');
 
-		$this->_template_args['txn_details']['ip_address']['value'] = isset( $this->_session['ip_address'] ) ? $this->_session['ip_address'] : '';
-		$this->_template_args['txn_details']['ip_address']['label'] = esc_html__( 'Transaction placed from IP', 'event_espresso' );
+		$this->_template_args['txn_details']['ip_address']['value'] = isset($this->_session['ip_address']) ? $this->_session['ip_address'] : '';
+		$this->_template_args['txn_details']['ip_address']['label'] = esc_html__('Transaction placed from IP', 'event_espresso');
 
-		$this->_template_args['txn_details']['user_agent']['value'] = isset( $this->_session['user_agent'] ) ? $this->_session['user_agent'] : '';
-		$this->_template_args['txn_details']['user_agent']['label'] = esc_html__( 'Registrant User Agent', 'event_espresso' );
+		$this->_template_args['txn_details']['user_agent']['value'] = isset($this->_session['user_agent']) ? $this->_session['user_agent'] : '';
+		$this->_template_args['txn_details']['user_agent']['label'] = esc_html__('Registrant User Agent', 'event_espresso');
 
 		$reg_steps = '<ul>';
-		foreach ( $this->_transaction->reg_steps() as $reg_step => $reg_step_status ) {
-			if ( $reg_step_status === true ) {
-				$reg_steps .= '<li style="color:#70cc50">' . sprintf( esc_html__( '%1$s : Completed', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>';
-			} else if ( is_numeric( $reg_step_status ) && $reg_step_status !== false ) {
-					$reg_steps .= '<li style="color:#2EA2CC">' . sprintf(
-							esc_html__( '%1$s : Initiated %2$s', 'event_espresso' ),
-							ucwords( str_replace( '_', ' ', $reg_step ) ),
-							gmdate( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), ( $reg_step_status + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) )
-						) . '</li>';
+		foreach ($this->_transaction->reg_steps() as $reg_step => $reg_step_status) {
+			if ($reg_step_status === true) {
+				$reg_steps .= '<li style="color:#70cc50">'.sprintf(esc_html__('%1$s : Completed', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>';
+			} else if (is_numeric($reg_step_status) && $reg_step_status !== false) {
+					$reg_steps .= '<li style="color:#2EA2CC">'.sprintf(
+							esc_html__('%1$s : Initiated %2$s', 'event_espresso'),
+							ucwords(str_replace('_', ' ', $reg_step)),
+							gmdate(get_option('date_format').' '.get_option('time_format'), ($reg_step_status + (get_option('gmt_offset') * HOUR_IN_SECONDS)))
+						).'</li>';
 				} else {
-				$reg_steps .= '<li style="color:#E76700">' . sprintf( esc_html__( '%1$s : Never Initiated', 'event_espresso' ), ucwords( str_replace( '_', ' ', $reg_step ) ) ) . '</li>';
+				$reg_steps .= '<li style="color:#E76700">'.sprintf(esc_html__('%1$s : Never Initiated', 'event_espresso'), ucwords(str_replace('_', ' ', $reg_step))).'</li>';
 			}
 		}
 		$reg_steps .= '</ul>';
 		$this->_template_args['txn_details']['reg_steps']['value'] = $reg_steps;
-		$this->_template_args['txn_details']['reg_steps']['label'] = esc_html__( 'Registration Step Progress', 'event_espresso' );
+		$this->_template_args['txn_details']['reg_steps']['label'] = esc_html__('Registration Step Progress', 'event_espresso');
 
 
 		$this->_get_registrations_to_apply_payment_to();
-		$this->_get_payment_methods( $payments );
+		$this->_get_payment_methods($payments);
 		$this->_get_payment_status_array();
 		$this->_get_reg_status_selection(); //sets up the template args for the reg status array for the transaction.
 
-		$this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'transaction'  ), TXN_ADMIN_URL );
-		$this->_template_args['apply_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_apply_payment' ), WP_AJAX_URL );
-		$this->_template_args['delete_payment_form_url'] = add_query_arg( array( 'page' => 'espresso_transactions', 'action' => 'espresso_delete_payment' ), WP_AJAX_URL );
+		$this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'transaction'), TXN_ADMIN_URL);
+		$this->_template_args['apply_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_apply_payment'), WP_AJAX_URL);
+		$this->_template_args['delete_payment_form_url'] = add_query_arg(array('page' => 'espresso_transactions', 'action' => 'espresso_delete_payment'), WP_AJAX_URL);
 
 		// 'espresso_delete_payment_nonce'
 
-		$template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_txn_details.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );
+		$template_path = TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_txn_details.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE);
 
 	}
 
@@ -835,27 +835,27 @@ 
 	 * @param EE_Payment[] $payments
 	 * @return array
 	 */
-	protected function _get_registration_payment_IDs( $payments = array() ) {
+	protected function _get_registration_payment_IDs($payments = array()) {
 		$existing_reg_payments = array();
 		// get all reg payments for these payments
-		$reg_payments = EEM_Registration_Payment::instance()->get_all( array(
+		$reg_payments = EEM_Registration_Payment::instance()->get_all(array(
 			array(
 				'PAY_ID' => array(
 					'IN',
-					array_keys( $payments )
+					array_keys($payments)
 				)
 			)
-		) );
-		if ( ! empty( $reg_payments ) ) {
-			foreach ( $payments as $payment ) {
-				if ( ! $payment instanceof EE_Payment ) {
+		));
+		if ( ! empty($reg_payments)) {
+			foreach ($payments as $payment) {
+				if ( ! $payment instanceof EE_Payment) {
 					continue;
-				} else if ( ! isset( $existing_reg_payments[ $payment->ID() ] ) ) {
-					$existing_reg_payments[ $payment->ID() ] = array();
+				} else if ( ! isset($existing_reg_payments[$payment->ID()])) {
+					$existing_reg_payments[$payment->ID()] = array();
 				}
-				foreach ( $reg_payments as $reg_payment ) {
-					if ( $reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID() ) {
-						$existing_reg_payments[ $payment->ID() ][ ] = $reg_payment->registration_ID();
+				foreach ($reg_payments as $reg_payment) {
+					if ($reg_payment instanceof EE_Registration_Payment && $reg_payment->payment_ID() === $payment->ID()) {
+						$existing_reg_payments[$payment->ID()][] = $reg_payment->registration_ID();
 					}
 				}
 			}
@@ -888,54 +888,54 @@ 
 				)
 			)
 		);
-		$registrations_to_apply_payment_to = EEH_HTML::br() . EEH_HTML::div(
+		$registrations_to_apply_payment_to = EEH_HTML::br().EEH_HTML::div(
 			'', 'txn-admin-apply-payment-to-registrations-dv', '', 'clear: both; margin: 1.5em 0 0; display: none;'
 		);
-		$registrations_to_apply_payment_to .= EEH_HTML::br() . EEH_HTML::div( '', '', 'admin-primary-mbox-tbl-wrap' );
-		$registrations_to_apply_payment_to .= EEH_HTML::table( '', '', 'admin-primary-mbox-tbl' );
+		$registrations_to_apply_payment_to .= EEH_HTML::br().EEH_HTML::div('', '', 'admin-primary-mbox-tbl-wrap');
+		$registrations_to_apply_payment_to .= EEH_HTML::table('', '', 'admin-primary-mbox-tbl');
 		$registrations_to_apply_payment_to .= EEH_HTML::thead(
 			EEH_HTML::tr(
-				EEH_HTML::th( esc_html__( 'ID', 'event_espresso' ) ) .
-				EEH_HTML::th( esc_html__( 'Registrant', 'event_espresso' ) ) .
-				EEH_HTML::th( esc_html__( 'Ticket', 'event_espresso' ) ) .
-				EEH_HTML::th( esc_html__( 'Event', 'event_espresso' ) ) .
-				EEH_HTML::th( esc_html__( 'Paid', 'event_espresso' ), '', 'txn-admin-payment-paid-td jst-cntr' ) .
-				EEH_HTML::th( esc_html__( 'Owing', 'event_espresso' ), '', 'txn-admin-payment-owing-td jst-cntr' ) .
-				EEH_HTML::th( esc_html__( 'Apply', 'event_espresso' ), '', 'jst-cntr' )
+				EEH_HTML::th(esc_html__('ID', 'event_espresso')).
+				EEH_HTML::th(esc_html__('Registrant', 'event_espresso')).
+				EEH_HTML::th(esc_html__('Ticket', 'event_espresso')).
+				EEH_HTML::th(esc_html__('Event', 'event_espresso')).
+				EEH_HTML::th(esc_html__('Paid', 'event_espresso'), '', 'txn-admin-payment-paid-td jst-cntr').
+				EEH_HTML::th(esc_html__('Owing', 'event_espresso'), '', 'txn-admin-payment-owing-td jst-cntr').
+				EEH_HTML::th(esc_html__('Apply', 'event_espresso'), '', 'jst-cntr')
 			)
 		);
 		$registrations_to_apply_payment_to .= EEH_HTML::tbody();
 		// get registrations for TXN
-		$registrations = $this->_transaction->registrations( $query_params );
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		$registrations = $this->_transaction->registrations($query_params);
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration) {
 				$attendee_name = $registration->attendee() instanceof EE_Attendee
 					? $registration->attendee()->full_name()
-					: esc_html__( 'Unknown Attendee', 'event_espresso' );
+					: esc_html__('Unknown Attendee', 'event_espresso');
 				$owing = $registration->final_price() - $registration->paid();
 				$taxable = $registration->ticket()->taxable()
-					? ' <span class="smaller-text lt-grey-text"> ' . esc_html__( '+ tax', 'event_espresso' ) . '</span>'
+					? ' <span class="smaller-text lt-grey-text"> '.esc_html__('+ tax', 'event_espresso').'</span>'
 					: '';
-				$checked = empty( $existing_reg_payments ) || in_array( $registration->ID(), $existing_reg_payments )
+				$checked = empty($existing_reg_payments) || in_array($registration->ID(), $existing_reg_payments)
 					? ' checked="checked"'
 					: '';
 				$disabled = $registration->final_price() > 0 ? '' : ' disabled';
 				$registrations_to_apply_payment_to .= EEH_HTML::tr(
-					EEH_HTML::td( $registration->ID() ) .
-					EEH_HTML::td( $attendee_name ) .
+					EEH_HTML::td($registration->ID()).
+					EEH_HTML::td($attendee_name).
 					EEH_HTML::td(
-						$registration->ticket()->name() . ' : ' . $registration->ticket()->pretty_price() . $taxable
-					) .
-					EEH_HTML::td( $registration->event_name() ) .
-					EEH_HTML::td( $registration->pretty_paid(), '', 'txn-admin-payment-paid-td jst-cntr' ) .
-					EEH_HTML::td( EEH_Template::format_currency( $owing ), '', 'txn-admin-payment-owing-td jst-cntr' ) .
+						$registration->ticket()->name().' : '.$registration->ticket()->pretty_price().$taxable
+					).
+					EEH_HTML::td($registration->event_name()).
+					EEH_HTML::td($registration->pretty_paid(), '', 'txn-admin-payment-paid-td jst-cntr').
+					EEH_HTML::td(EEH_Template::format_currency($owing), '', 'txn-admin-payment-owing-td jst-cntr').
 					EEH_HTML::td(
-						'<input type="checkbox" value="' . $registration->ID()
+						'<input type="checkbox" value="'.$registration->ID()
 						. '" name="txn_admin_payment[registrations]"'
-						. $checked . $disabled . '>',
+						. $checked.$disabled.'>',
 						'', 'jst-cntr'
 					),
-					'apply-payment-registration-row-' . $registration->ID()
+					'apply-payment-registration-row-'.$registration->ID()
 				);
 			}
 		}
@@ -950,7 +950,7 @@ 
 			'', 'clear description'
 		);
 		$registrations_to_apply_payment_to .= EEH_HTML::divx();
-		$this->_template_args[ 'registrations_to_apply_payment_to' ] = $registrations_to_apply_payment_to;
+		$this->_template_args['registrations_to_apply_payment_to'] = $registrations_to_apply_payment_to;
 	}
 
 
@@ -967,9 +967,9 @@ 
 		$statuses = EEM_Registration::reg_status_array(array(), TRUE);
 		//let's add a "don't change" option.
 		$status_array['NAN'] = esc_html__('Leave the Same', 'event_espresso');
-		$status_array = array_merge( $status_array, $statuses );
-		$this->_template_args['status_change_select'] = EEH_Form_Fields::select_input( 'txn_reg_status_change[reg_status]', $status_array, 'NAN', 'id="txn-admin-payment-reg-status-inp"', 'txn-reg-status-change-reg-status' );
-		$this->_template_args['delete_status_change_select'] = EEH_Form_Fields::select_input( 'delete_txn_reg_status_change[reg_status]', $status_array, 'NAN', 'delete-txn-admin-payment-reg-status-inp', 'delete-txn-reg-status-change-reg-status' );
+		$status_array = array_merge($status_array, $statuses);
+		$this->_template_args['status_change_select'] = EEH_Form_Fields::select_input('txn_reg_status_change[reg_status]', $status_array, 'NAN', 'id="txn-admin-payment-reg-status-inp"', 'txn-reg-status-change-reg-status');
+		$this->_template_args['delete_status_change_select'] = EEH_Form_Fields::select_input('delete_txn_reg_status_change[reg_status]', $status_array, 'NAN', 'delete-txn-admin-payment-reg-status-inp', 'delete-txn-reg-status-change-reg-status');
 
 	}
 
@@ -984,21 +984,21 @@ 
 	 * @param EE_Payment[] to show on this page
 	 *	@return void
 	 */
-	private function _get_payment_methods( $payments = array() ) {
+	private function _get_payment_methods($payments = array()) {
 		$payment_methods_of_payments = array();
-		foreach( $payments as $payment ){
-			if( $payment instanceof EE_Payment ){
-				$payment_methods_of_payments[] = $payment->get( 'PMD_ID' );
+		foreach ($payments as $payment) {
+			if ($payment instanceof EE_Payment) {
+				$payment_methods_of_payments[] = $payment->get('PMD_ID');
 			}
 		}
-		if( $payment_methods_of_payments ){
-			$query_args = array( array( 'OR*payment_method_for_payment' => array(
-					'PMD_ID' => array( 'IN', $payment_methods_of_payments ),
-					'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) ) );
-		}else{
-			$query_args = array( array( 'PMD_scope' => array( 'LIKE', '%' . EEM_Payment_Method::scope_admin . '%' ) ) );
+		if ($payment_methods_of_payments) {
+			$query_args = array(array('OR*payment_method_for_payment' => array(
+					'PMD_ID' => array('IN', $payment_methods_of_payments),
+					'PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%') )));
+		} else {
+			$query_args = array(array('PMD_scope' => array('LIKE', '%'.EEM_Payment_Method::scope_admin.'%')));
 		}
-		$this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all( $query_args );
+		$this->_template_args['payment_methods'] = EEM_Payment_Method::instance()->get_all($query_args);
 	}
 
 
@@ -1012,17 +1012,17 @@ 
 	 * @param array $metabox
 	 * @return void
 	 */
-	public function txn_attendees_meta_box( $post, $metabox = array( 'args' => array() )) {
+	public function txn_attendees_meta_box($post, $metabox = array('args' => array())) {
 
-		extract( $metabox['args'] );
+		extract($metabox['args']);
 		$this->_template_args['post'] = $post;
 		$this->_template_args['event_attendees'] = array();
 		// process items in cart
-		$line_items = $this->_transaction->get_many_related('Line_Item', array( array( 'LIN_type' => 'line-item' ) ) );
-		if ( ! empty( $line_items )) {
-			foreach ( $line_items as $item ) {
-				if ( $item instanceof EE_Line_Item ) {
-					switch( $item->OBJ_type() ) {
+		$line_items = $this->_transaction->get_many_related('Line_Item', array(array('LIN_type' => 'line-item')));
+		if ( ! empty($line_items)) {
+			foreach ($line_items as $item) {
+				if ($item instanceof EE_Line_Item) {
+					switch ($item->OBJ_type()) {
 
 						case 'Event' :
 							break;
@@ -1030,39 +1030,39 @@ 
 						case 'Ticket' :
 							$ticket = $item->ticket();
 							//right now we're only handling tickets here.  Cause its expected that only tickets will have attendees right?
-							if ( ! $ticket instanceof EE_Ticket ) {
+							if ( ! $ticket instanceof EE_Ticket) {
 								continue;
 							}
 							try {
 								$event_name = $ticket->get_event_name();
-							} catch ( Exception $e ) {
-								EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
-								$event_name = esc_html__( 'Unknown Event', 'event_espresso' );
+							} catch (Exception $e) {
+								EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+								$event_name = esc_html__('Unknown Event', 'event_espresso');
 							}
-							$event_name .= ' - ' . $item->get( 'LIN_name' );
-							$ticket_price = EEH_Template::format_currency( $item->get( 'LIN_unit_price' ) );
+							$event_name .= ' - '.$item->get('LIN_name');
+							$ticket_price = EEH_Template::format_currency($item->get('LIN_unit_price'));
 							// now get all of the registrations for this transaction that use this ticket
-							$registrations = $ticket->get_many_related('Registration', array( array('TXN_ID' => $this->_transaction->ID() )));
-							foreach( $registrations as $registration ) {
-								if ( ! $registration instanceof EE_Registration ) {
+							$registrations = $ticket->get_many_related('Registration', array(array('TXN_ID' => $this->_transaction->ID())));
+							foreach ($registrations as $registration) {
+								if ( ! $registration instanceof EE_Registration) {
 									continue;
 								}
-								$this->_template_args['event_attendees'][$registration->ID()]['STS_ID'] 			= $registration->status_ID();
-								$this->_template_args['event_attendees'][$registration->ID()]['att_num'] 			= $registration->count();
-								$this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] 	= $event_name;
-								$this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] 		= $ticket_price;
+								$this->_template_args['event_attendees'][$registration->ID()]['STS_ID'] = $registration->status_ID();
+								$this->_template_args['event_attendees'][$registration->ID()]['att_num'] = $registration->count();
+								$this->_template_args['event_attendees'][$registration->ID()]['event_ticket_name'] = $event_name;
+								$this->_template_args['event_attendees'][$registration->ID()]['ticket_price'] = $ticket_price;
 								// attendee info
 								$attendee = $registration->get_first_related('Attendee');
-								if ( $attendee instanceof EE_Attendee ) {
-									$this->_template_args['event_attendees'][$registration->ID()]['att_id'] 	= $attendee->ID();
-									$this->_template_args['event_attendees'][$registration->ID()]['attendee'] 	= $attendee->full_name();
-									$this->_template_args['event_attendees'][$registration->ID()]['email']		= '<a href="mailto:' . $attendee->email() . '?subject=' . $event_name . esc_html__(' Event', 'event_espresso') . '">' . $attendee->email() . '</a>';
-									$this->_template_args['event_attendees'][$registration->ID()]['address'] 	= EEH_Address::format( $attendee, 'inline', false, false );
+								if ($attendee instanceof EE_Attendee) {
+									$this->_template_args['event_attendees'][$registration->ID()]['att_id'] = $attendee->ID();
+									$this->_template_args['event_attendees'][$registration->ID()]['attendee'] = $attendee->full_name();
+									$this->_template_args['event_attendees'][$registration->ID()]['email'] = '<a href="mailto:'.$attendee->email().'?subject='.$event_name.esc_html__(' Event', 'event_espresso').'">'.$attendee->email().'</a>';
+									$this->_template_args['event_attendees'][$registration->ID()]['address'] = EEH_Address::format($attendee, 'inline', false, false);
 								} else {
 									$this->_template_args['event_attendees'][$registration->ID()]['att_id'] 	= '';
-									$this->_template_args['event_attendees'][$registration->ID()]['attendee'] 	= '';
+									$this->_template_args['event_attendees'][$registration->ID()]['attendee'] = '';
 									$this->_template_args['event_attendees'][$registration->ID()]['email'] 		= '';
-									$this->_template_args['event_attendees'][$registration->ID()]['address'] 	= '';
+									$this->_template_args['event_attendees'][$registration->ID()]['address'] = '';
 								}
 							}
 							break;
@@ -1071,12 +1071,12 @@ 
 				}
 			}
 
-			$this->_template_args['transaction_form_url'] = add_query_arg( array( 'action' => 'edit_transaction', 'process' => 'attendees'  ), TXN_ADMIN_URL );
-			echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE );
+			$this->_template_args['transaction_form_url'] = add_query_arg(array('action' => 'edit_transaction', 'process' => 'attendees'), TXN_ADMIN_URL);
+			echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_main_meta_box_attendees.template.php', $this->_template_args, TRUE);
 
 		} else {
 			echo sprintf(
-				esc_html__( '%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso' ),
+				esc_html__('%1$sFor some reason, there are no attendees registered for this transaction. Likely the registration was abandoned in process.%2$s', 'event_espresso'),
 				'<p class="important-notice">',
 				'</p>'
 			);
@@ -1095,19 +1095,19 @@ 
 	 */
 	public function txn_registrant_side_meta_box() {
 		$primary_att = $this->_transaction->primary_registration() instanceof EE_Registration ? $this->_transaction->primary_registration()->get_first_related('Attendee') : null;
-		if ( ! $primary_att instanceof EE_Attendee ) {
+		if ( ! $primary_att instanceof EE_Attendee) {
 			$this->_template_args['no_attendee_message'] = esc_html__('There is no attached contact for this transaction.  The transaction either failed due to an error or was abandoned.', 'event_espresso');
 			$primary_att = EEM_Attendee::instance()->create_default_object();
 		}
-		$this->_template_args['ATT_ID'] 						= $primary_att->ID();
+		$this->_template_args['ATT_ID'] = $primary_att->ID();
 		$this->_template_args['prime_reg_fname']		= $primary_att->fname();
 		$this->_template_args['prime_reg_lname']		= $primary_att->lname();
-		$this->_template_args['prime_reg_email'] 		= $primary_att->email();
+		$this->_template_args['prime_reg_email'] = $primary_att->email();
 		$this->_template_args['prime_reg_phone'] 	= $primary_att->phone();
-		$this->_template_args['edit_attendee_url'] 	= EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'edit_attendee', 'post' => $primary_att->ID()  ), REG_ADMIN_URL );
+		$this->_template_args['edit_attendee_url'] = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit_attendee', 'post' => $primary_att->ID()), REG_ADMIN_URL);
 		// get formatted address for registrant
-		$this->_template_args[ 'formatted_address' ] = EEH_Address::format( $primary_att );
-		echo EEH_Template::display_template( TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE );
+		$this->_template_args['formatted_address'] = EEH_Address::format($primary_att);
+		echo EEH_Template::display_template(TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_registrant.template.php', $this->_template_args, TRUE);
 	}
 
 
@@ -1123,12 +1123,12 @@ 
 
 		$this->_template_args['billing_form'] = $this->_transaction->billing_info();
 		$this->_template_args['billing_form_url'] = add_query_arg(
-			array( 'action' => 'edit_transaction', 'process' => 'billing'  ),
+			array('action' => 'edit_transaction', 'process' => 'billing'),
 			TXN_ADMIN_URL
 		);
 
-		$template_path = TXN_TEMPLATE_PATH . 'txn_admin_details_side_meta_box_billing_info.template.php';
-		echo EEH_Template::display_template( $template_path, $this->_template_args, TRUE );/**/
+		$template_path = TXN_TEMPLATE_PATH.'txn_admin_details_side_meta_box_billing_info.template.php';
+		echo EEH_Template::display_template($template_path, $this->_template_args, TRUE); /**/
 	}
 
 
@@ -1141,42 +1141,42 @@ 
 	*	@return void
 	*/
 	public function apply_payments_or_refunds() {
-		$json_response_data = array( 'return_data' => FALSE );
+		$json_response_data = array('return_data' => FALSE);
 		$valid_data = $this->_validate_payment_request_data();
-		if ( ! empty( $valid_data ) ) {
-			$PAY_ID = $valid_data[ 'PAY_ID' ];
+		if ( ! empty($valid_data)) {
+			$PAY_ID = $valid_data['PAY_ID'];
 			//save  the new payment
-			$payment = $this->_create_payment_from_request_data( $valid_data );
+			$payment = $this->_create_payment_from_request_data($valid_data);
 			// get the TXN for this payment
 			$transaction = $payment->transaction();
 			// verify transaction
-			if ( $transaction instanceof EE_Transaction ) {
+			if ($transaction instanceof EE_Transaction) {
 				// calculate_total_payments_and_update_status
-				$this->_process_transaction_payments( $transaction );
-				$REG_IDs = $this->_get_REG_IDs_to_apply_payment_to( $payment );
-				$this->_remove_existing_registration_payments( $payment, $PAY_ID );
+				$this->_process_transaction_payments($transaction);
+				$REG_IDs = $this->_get_REG_IDs_to_apply_payment_to($payment);
+				$this->_remove_existing_registration_payments($payment, $PAY_ID);
 				// apply payment to registrations (if applicable)
-				if ( ! empty( $REG_IDs ) ) {
-					$this->_update_registration_payments( $transaction, $payment, $REG_IDs );
+				if ( ! empty($REG_IDs)) {
+					$this->_update_registration_payments($transaction, $payment, $REG_IDs);
 					$this->_maybe_send_notifications();
 					// now process status changes for the same registrations
-					$this->_process_registration_status_change( $transaction, $REG_IDs );
+					$this->_process_registration_status_change($transaction, $REG_IDs);
 				}
-				$this->_maybe_send_notifications( $payment );
+				$this->_maybe_send_notifications($payment);
 				//prepare to render page
-				$json_response_data[ 'return_data' ] = $this->_build_payment_json_response( $payment, $REG_IDs );
-				do_action( 'AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment );
+				$json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs);
+				do_action('AHEE__Transactions_Admin_Page__apply_payments_or_refund__after_recording', $transaction, $payment);
 			} else {
 				EE_Error::add_error(
-					esc_html__( 'A valid Transaction for this payment could not be retrieved.', 'event_espresso' ),
+					esc_html__('A valid Transaction for this payment could not be retrieved.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
 		} else {
-			EE_Error::add_error( esc_html__( 'The payment form data could not be processed. Please try again.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(esc_html__('The payment form data could not be processed. Please try again.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 
-		$notices = EE_Error::get_notices( false, false, false );
+		$notices = EE_Error::get_notices(false, false, false);
 		$this->_template_args = array(
 			'data' => $json_response_data,
 			'error' => $notices['errors'],
@@ -1193,30 +1193,30 @@ 
 	 * @return array
 	 */
 	protected function _validate_payment_request_data() {
-		if ( ! isset( $this->_req_data[ 'txn_admin_payment' ] ) ) {
+		if ( ! isset($this->_req_data['txn_admin_payment'])) {
 			return false;
 		}
 		$payment_form = $this->_generate_payment_form_section();
 		try {
-			if ( $payment_form->was_submitted() ) {
+			if ($payment_form->was_submitted()) {
 				$payment_form->receive_form_submission();
-				if ( ! $payment_form->is_valid() ) {
+				if ( ! $payment_form->is_valid()) {
 					$submission_error_messages = array();
-					foreach ( $payment_form->get_validation_errors_accumulated() as $validation_error ) {
-						if ( $validation_error instanceof EE_Validation_Error ) {
+					foreach ($payment_form->get_validation_errors_accumulated() as $validation_error) {
+						if ($validation_error instanceof EE_Validation_Error) {
 							$submission_error_messages[] = sprintf(
-								_x( '%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso' ),
+								_x('%s : %s', 'Form Section Name : Form Validation Error', 'event_espresso'),
 								$validation_error->get_form_section()->html_label_text(),
 								$validation_error->getMessage()
 							);
 						}
 					}
-					EE_Error::add_error( join( '<br />', $submission_error_messages ), __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error(join('<br />', $submission_error_messages), __FILE__, __FUNCTION__, __LINE__);
 					return array();
 				}
 			}
-		} catch ( EE_Error $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+		} catch (EE_Error $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 			return array();
 		}
 		return $payment_form->valid_data();
@@ -1238,63 +1238,63 @@ 
 						array(
 							'default' => 0,
 							'required' => false,
-							'html_label_text' => esc_html__( 'Payment ID', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Int_Normalization() )
+							'html_label_text' => esc_html__('Payment ID', 'event_espresso'),
+							'validation_strategies' => array(new EE_Int_Normalization())
 						)
 					),
 					'TXN_ID' => new EE_Text_Input(
 						array(
 							'default' => 0,
 							'required' => true,
-							'html_label_text' => esc_html__( 'Transaction ID', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Int_Normalization() )
+							'html_label_text' => esc_html__('Transaction ID', 'event_espresso'),
+							'validation_strategies' => array(new EE_Int_Normalization())
 						)
 					),
 					'type' => new EE_Text_Input(
 						array(
 							'default' => 1,
 							'required' => true,
-							'html_label_text' => esc_html__( 'Payment or Refund', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Int_Normalization() )
+							'html_label_text' => esc_html__('Payment or Refund', 'event_espresso'),
+							'validation_strategies' => array(new EE_Int_Normalization())
 						)
 					),
 					'amount' => new EE_Text_Input(
 						array(
 							'default' => 0,
 							'required' => true,
-							'html_label_text' => esc_html__( 'Payment amount', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Float_Normalization() )
+							'html_label_text' => esc_html__('Payment amount', 'event_espresso'),
+							'validation_strategies' => array(new EE_Float_Normalization())
 						)
 					),
 					'status' => new EE_Text_Input(
 						array(
 							'default' => EEM_Payment::status_id_approved,
 							'required' => true,
-							'html_label_text' => esc_html__( 'Payment status', 'event_espresso' ),
+							'html_label_text' => esc_html__('Payment status', 'event_espresso'),
 						)
 					),
 					'PMD_ID' => new EE_Text_Input(
 						array(
 							'default' => 2,
 							'required' => true,
-							'html_label_text' => esc_html__( 'Payment Method', 'event_espresso' ),
-							'validation_strategies' => array( new EE_Int_Normalization() )
+							'html_label_text' => esc_html__('Payment Method', 'event_espresso'),
+							'validation_strategies' => array(new EE_Int_Normalization())
 						)
 					),
 					'date' => new EE_Text_Input(
 						array(
 							'default' => time(),
 							'required' => true,
-							'html_label_text' => esc_html__( 'Payment date', 'event_espresso' ),
+							'html_label_text' => esc_html__('Payment date', 'event_espresso'),
 						)
 					),
 					'txn_id_chq_nmbr' => new EE_Text_Input(
 						array(
 							'default' => '',
 							'required' => false,
-							'html_label_text' => esc_html__( 'Transaction or Cheque Number', 'event_espresso' ),
+							'html_label_text' => esc_html__('Transaction or Cheque Number', 'event_espresso'),
                                                         'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( esc_html__('Input too long', 'event_espresso'), 100 ),
+                                                            new EE_Max_Length_Validation_Strategy(esc_html__('Input too long', 'event_espresso'), 100),
                                                         )
 						)
 					),
@@ -1302,9 +1302,9 @@ 
 						array(
 							'default' => '',
 							'required' => false,
-							'html_label_text' => esc_html__( 'Purchase Order Number', 'event_espresso' ),
+							'html_label_text' => esc_html__('Purchase Order Number', 'event_espresso'),
                                                         'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( esc_html__('Input too long', 'event_espresso'), 100 ),
+                                                            new EE_Max_Length_Validation_Strategy(esc_html__('Input too long', 'event_espresso'), 100),
                                                         )
 						)
 					),
@@ -1312,9 +1312,9 @@ 
 						array(
 							'default' => '',
 							'required' => false,
-							'html_label_text' => esc_html__( 'Extra Field for Accounting', 'event_espresso' ),
+							'html_label_text' => esc_html__('Extra Field for Accounting', 'event_espresso'),
                                                         'validation_strategies' => array(
-                                                            new EE_Max_Length_Validation_Strategy( esc_html__('Input too long', 'event_espresso'), 100 ),
+                                                            new EE_Max_Length_Validation_Strategy(esc_html__('Input too long', 'event_espresso'), 100),
                                                         )
 						)
 					),
@@ -1331,37 +1331,37 @@ 
 	 * @param array $valid_data
 	 * @return EE_Payment
 	 */
-	protected function _create_payment_from_request_data( $valid_data ) {
-		$PAY_ID = $valid_data[ 'PAY_ID' ];
+	protected function _create_payment_from_request_data($valid_data) {
+		$PAY_ID = $valid_data['PAY_ID'];
 		// get payment amount
-		$amount = $valid_data[ 'amount' ] ? abs( $valid_data[ 'amount' ] ) : 0;
+		$amount = $valid_data['amount'] ? abs($valid_data['amount']) : 0;
 		// payments have a type value of 1 and refunds have a type value of -1
 		// so multiplying amount by type will give a positive value for payments, and negative values for refunds
-		$amount = $valid_data[ 'type' ] < 0 ? $amount * -1 : $amount;
+		$amount = $valid_data['type'] < 0 ? $amount * -1 : $amount;
 		// for some reason the date string coming in has extra spaces between the date and time.  This fixes that.
-		$date = $valid_data['date'] ? preg_replace( '/\s+/', ' ', $valid_data['date'] ) : date( 'Y-m-d g:i a', current_time( 'timestamp' ) );
+		$date = $valid_data['date'] ? preg_replace('/\s+/', ' ', $valid_data['date']) : date('Y-m-d g:i a', current_time('timestamp'));
 		$payment = EE_Payment::new_instance(
 			array(
-				'TXN_ID' 								=> $valid_data[ 'TXN_ID' ],
-				'STS_ID' 								=> $valid_data[ 'status' ],
+				'TXN_ID' 								=> $valid_data['TXN_ID'],
+				'STS_ID' 								=> $valid_data['status'],
 				'PAY_timestamp' 				=> $date,
 				'PAY_source'           			=> EEM_Payment_Method::scope_admin,
-				'PMD_ID'               				=> $valid_data[ 'PMD_ID' ],
+				'PMD_ID'               				=> $valid_data['PMD_ID'],
 				'PAY_amount'           			=> $amount,
-				'PAY_txn_id_chq_nmbr'  	=> $valid_data[ 'txn_id_chq_nmbr' ],
-				'PAY_po_number'        		=> $valid_data[ 'po_number' ],
-				'PAY_extra_accntng'    		=> $valid_data[ 'accounting' ],
+				'PAY_txn_id_chq_nmbr'  	=> $valid_data['txn_id_chq_nmbr'],
+				'PAY_po_number'        		=> $valid_data['po_number'],
+				'PAY_extra_accntng'    		=> $valid_data['accounting'],
 				'PAY_details'          				=> $valid_data,
 				'PAY_ID'               				=> $PAY_ID
 			),
 			'',
-			array( 'Y-m-d', 'g:i a' )
+			array('Y-m-d', 'g:i a')
 		);
 
-		if ( ! $payment->save() ) {
+		if ( ! $payment->save()) {
 			EE_Error::add_error(
 				sprintf(
-					esc_html__( 'Payment %1$d has not been successfully saved to the database.', 'event_espresso' ),
+					esc_html__('Payment %1$d has not been successfully saved to the database.', 'event_espresso'),
 					$payment->ID()
 				),
 				__FILE__, __FUNCTION__, __LINE__
@@ -1378,15 +1378,15 @@ 
 	 * @param \EE_Transaction $transaction
 	 * @return array
 	 */
-	protected function _process_transaction_payments( EE_Transaction $transaction ) {
+	protected function _process_transaction_payments(EE_Transaction $transaction) {
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		//update the transaction with this payment
-		if ( $transaction_payments->calculate_total_payments_and_update_status( $transaction ) ) {
-			EE_Error::add_success( esc_html__( 'The payment has been processed successfully.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ($transaction_payments->calculate_total_payments_and_update_status($transaction)) {
+			EE_Error::add_success(esc_html__('The payment has been processed successfully.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		} else {
 			EE_Error::add_error(
-				esc_html__( 'The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso' )
+				esc_html__('The payment was processed successfully but the amount paid for the transaction was not updated.', 'event_espresso')
 				, __FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -1402,19 +1402,19 @@ 
 	 * @param \EE_Payment $payment
 	 * @return array
 	 */
-	protected function _get_REG_IDs_to_apply_payment_to( EE_Payment $payment ) {
+	protected function _get_REG_IDs_to_apply_payment_to(EE_Payment $payment) {
 		$REG_IDs = array();
 		// grab array of IDs for specific registrations to apply changes to
-		if ( isset( $this->_req_data[ 'txn_admin_payment' ][ 'registrations' ] ) ) {
-			$REG_IDs = (array)$this->_req_data[ 'txn_admin_payment' ][ 'registrations' ];
+		if (isset($this->_req_data['txn_admin_payment']['registrations'])) {
+			$REG_IDs = (array) $this->_req_data['txn_admin_payment']['registrations'];
 		}
 		//nothing specified ? then get all reg IDs
-		if ( empty( $REG_IDs ) ) {
+		if (empty($REG_IDs)) {
 			$registrations = $payment->transaction()->registrations();
-			$REG_IDs = ! empty( $registrations ) ? array_keys( $registrations ) : $this->_get_existing_reg_payment_REG_IDs( $payment );
+			$REG_IDs = ! empty($registrations) ? array_keys($registrations) : $this->_get_existing_reg_payment_REG_IDs($payment);
 		}
 		// ensure that REG_IDs are integers and NOT strings
-		return array_map( 'intval', $REG_IDs );
+		return array_map('intval', $REG_IDs);
 	}
 
 
@@ -1431,7 +1431,7 @@ 
 	/**
 	 * @param array $existing_reg_payment_REG_IDs
 	 */
-	public function set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs = null ) {
+	public function set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs = null) {
 		$this->_existing_reg_payment_REG_IDs = $existing_reg_payment_REG_IDs;
 	}
 
@@ -1446,13 +1446,13 @@ 
 	 * @param \EE_Payment $payment
 	 * @return array
 	 */
-	protected function _get_existing_reg_payment_REG_IDs( EE_Payment $payment ) {
-		if ( $this->existing_reg_payment_REG_IDs() === null ) {
+	protected function _get_existing_reg_payment_REG_IDs(EE_Payment $payment) {
+		if ($this->existing_reg_payment_REG_IDs() === null) {
 			// let's get any existing reg payment records for this payment
-			$existing_reg_payment_REG_IDs = $payment->get_many_related( 'Registration' );
+			$existing_reg_payment_REG_IDs = $payment->get_many_related('Registration');
 			// but we only want the REG IDs, so grab the array keys
-			$existing_reg_payment_REG_IDs = ! empty( $existing_reg_payment_REG_IDs ) ? array_keys( $existing_reg_payment_REG_IDs ) : array();
-			$this->set_existing_reg_payment_REG_IDs( $existing_reg_payment_REG_IDs );
+			$existing_reg_payment_REG_IDs = ! empty($existing_reg_payment_REG_IDs) ? array_keys($existing_reg_payment_REG_IDs) : array();
+			$this->set_existing_reg_payment_REG_IDs($existing_reg_payment_REG_IDs);
 		}
 		return $this->existing_reg_payment_REG_IDs();
 	}
@@ -1471,23 +1471,23 @@ 
 	 * @param int         $PAY_ID
 	 * @return bool;
 	 */
-	protected function _remove_existing_registration_payments( EE_Payment $payment, $PAY_ID = 0 ) {
+	protected function _remove_existing_registration_payments(EE_Payment $payment, $PAY_ID = 0) {
 		// newly created payments will have nothing recorded for $PAY_ID
-		if ( $PAY_ID == 0 ) {
+		if ($PAY_ID == 0) {
 			return false;
 		}
-		$existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment );
-		if ( empty( $existing_reg_payment_REG_IDs )) {
+		$existing_reg_payment_REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment);
+		if (empty($existing_reg_payment_REG_IDs)) {
 			return false;
 		}
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		return $transaction_payments->delete_registration_payments_and_update_registrations(
 			$payment,
 			array(
 				array(
 					'PAY_ID' => $payment->ID(),
-					'REG_ID' => array( 'IN', $existing_reg_payment_REG_IDs ),
+					'REG_ID' => array('IN', $existing_reg_payment_REG_IDs),
 				)
 			)
 		);
@@ -1506,25 +1506,25 @@ 
 	 * @param array $REG_IDs
 	 * @return bool
 	 */
-	protected function _update_registration_payments( EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array() ) {
+	protected function _update_registration_payments(EE_Transaction $transaction, EE_Payment $payment, $REG_IDs = array()) {
 		// we can pass our own custom set of registrations to EE_Payment_Processor::process_registration_payments()
 		// so let's do that using our set of REG_IDs from the form
 		$registration_query_where_params = array(
-			'REG_ID' => array( 'IN', $REG_IDs )
+			'REG_ID' => array('IN', $REG_IDs)
 		);
 		// but add in some conditions regarding payment,
 		// so that we don't apply payments to registrations that are free or have already been paid for
 		// but ONLY if the payment is NOT a refund ( ie: the payment amount is not negative )
-		if ( ! $payment->is_a_refund() ) {
-			$registration_query_where_params[ 'REG_final_price' ]  = array( '!=', 0 );
-			$registration_query_where_params[ 'REG_final_price*' ]  = array( '!=', 'REG_paid', true );
+		if ( ! $payment->is_a_refund()) {
+			$registration_query_where_params['REG_final_price'] = array('!=', 0);
+			$registration_query_where_params['REG_final_price*'] = array('!=', 'REG_paid', true);
 		}
 		//EEH_Debug_Tools::printr( $registration_query_where_params, '$registration_query_where_params', __FILE__, __LINE__ );
-		$registrations = $transaction->registrations( array( $registration_query_where_params ) );
-		if ( ! empty( $registrations ) ) {
+		$registrations = $transaction->registrations(array($registration_query_where_params));
+		if ( ! empty($registrations)) {
 			/** @type EE_Payment_Processor $payment_processor */
-			$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
-			$payment_processor->process_registration_payments( $transaction, $payment, $registrations );
+			$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
+			$payment_processor->process_registration_payments($transaction, $payment, $registrations);
 		}
 	}
 
@@ -1540,22 +1540,22 @@ 
 	 * @param array $REG_IDs
 	 * @return bool
 	 */
-	protected function _process_registration_status_change( EE_Transaction $transaction, $REG_IDs = array() ) {
+	protected function _process_registration_status_change(EE_Transaction $transaction, $REG_IDs = array()) {
 		// first if there is no change in status then we get out.
 		if (
-			! isset( $this->_req_data['txn_reg_status_change'], $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] )
+			! isset($this->_req_data['txn_reg_status_change'], $this->_req_data['txn_reg_status_change']['reg_status'])
 			|| $this->_req_data['txn_reg_status_change']['reg_status'] == 'NAN'
 		) {
 			//no error message, no change requested, just nothing to do man.
 			return FALSE;
 		}
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		// made it here dude?  Oh WOW.  K, let's take care of changing the statuses
 		return $transaction_processor->manually_update_registration_statuses(
 			$transaction,
-			sanitize_text_field( $this->_req_data[ 'txn_reg_status_change' ][ 'reg_status' ] ),
-			array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) )
+			sanitize_text_field($this->_req_data['txn_reg_status_change']['reg_status']),
+			array(array('REG_ID' => array('IN', $REG_IDs)))
 		);
 	}
 
@@ -1570,16 +1570,16 @@ 
 	 * @param bool | null        $delete_txn_reg_status_change
 	 * @return array
 	 */
-	protected function _build_payment_json_response( EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null ) {
+	protected function _build_payment_json_response(EE_Payment $payment, $REG_IDs = array(), $delete_txn_reg_status_change = null) {
 		// was the payment deleted ?
-		if ( is_bool( $delete_txn_reg_status_change )) {
+		if (is_bool($delete_txn_reg_status_change)) {
 			return array(
 				'PAY_ID' 				=> $payment->ID(),
 				'amount' 			=> $payment->amount(),
 				'total_paid' 			=> $payment->transaction()->paid(),
 				'txn_status' 			=> $payment->transaction()->status_ID(),
 				'pay_status' 		=> $payment->STS_ID(),
-				'registrations' 	=> $this->_registration_payment_data_array( $REG_IDs ),
+				'registrations' 	=> $this->_registration_payment_data_array($REG_IDs),
 				'delete_txn_reg_status_change' => $delete_txn_reg_status_change,
 			);
 		} else {
@@ -1591,16 +1591,16 @@ 
 				'pay_status' 	=> $payment->STS_ID(),
 				'PAY_ID'           => $payment->ID(),
 				'STS_ID' 			=> $payment->STS_ID(),
-				'status' 			=> self::$_pay_status[ $payment->STS_ID() ],
-				'date' 				=> $payment->timestamp( 'Y-m-d', 'h:i a' ),
-				'method' 		=> strtoupper( $payment->source() ),
+				'status' 			=> self::$_pay_status[$payment->STS_ID()],
+				'date' 				=> $payment->timestamp('Y-m-d', 'h:i a'),
+				'method' 		=> strtoupper($payment->source()),
 				'PM_ID' 			=> $payment->payment_method() ? $payment->payment_method()->ID() : 1,
-				'gateway' 		=> $payment->payment_method() ? $payment->payment_method()->admin_name() : esc_html__( "Unknown", 'event_espresso' ),
+				'gateway' 		=> $payment->payment_method() ? $payment->payment_method()->admin_name() : esc_html__("Unknown", 'event_espresso'),
 				'gateway_response' 	=> $payment->gateway_response(),
 				'txn_id_chq_nmbr'  	=> $payment->txn_id_chq_nmbr(),
 				'po_number'        		=> $payment->po_number(),
 				'extra_accntng'    		=> $payment->extra_accntng(),
-				'registrations'    			=> $this->_registration_payment_data_array( $REG_IDs ),
+				'registrations'    			=> $this->_registration_payment_data_array($REG_IDs),
 			);
 		}
 	}
@@ -1615,39 +1615,39 @@ 
 	*	@return void
 	*/
 	public function delete_payment() {
-		$json_response_data = array( 'return_data' => FALSE );
-		$PAY_ID = isset( $this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) ? absint( $this->_req_data['delete_txn_admin_payment']['PAY_ID'] ) : 0;
-		if ( $PAY_ID ) {
-			$delete_txn_reg_status_change = isset( $this->_req_data[ 'delete_txn_reg_status_change' ] ) ? $this->_req_data[ 'delete_txn_reg_status_change' ] : false;
-			$payment = EEM_Payment::instance()->get_one_by_ID( $PAY_ID );
-			if ( $payment instanceof EE_Payment ) {
-				$REG_IDs = $this->_get_existing_reg_payment_REG_IDs( $payment );
+		$json_response_data = array('return_data' => FALSE);
+		$PAY_ID = isset($this->_req_data['delete_txn_admin_payment'], $this->_req_data['delete_txn_admin_payment']['PAY_ID']) ? absint($this->_req_data['delete_txn_admin_payment']['PAY_ID']) : 0;
+		if ($PAY_ID) {
+			$delete_txn_reg_status_change = isset($this->_req_data['delete_txn_reg_status_change']) ? $this->_req_data['delete_txn_reg_status_change'] : false;
+			$payment = EEM_Payment::instance()->get_one_by_ID($PAY_ID);
+			if ($payment instanceof EE_Payment) {
+				$REG_IDs = $this->_get_existing_reg_payment_REG_IDs($payment);
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
-				if ( $transaction_payments->delete_payment_and_update_transaction( $payment )) {
-					$json_response_data['return_data'] = $this->_build_payment_json_response( $payment, $REG_IDs, $delete_txn_reg_status_change );
-					if ( $delete_txn_reg_status_change ) {
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
+				if ($transaction_payments->delete_payment_and_update_transaction($payment)) {
+					$json_response_data['return_data'] = $this->_build_payment_json_response($payment, $REG_IDs, $delete_txn_reg_status_change);
+					if ($delete_txn_reg_status_change) {
 						$this->_req_data['txn_reg_status_change'] = $delete_txn_reg_status_change;
 						//MAKE sure we also add the delete_txn_req_status_change to the
 						//$_REQUEST global because that's how messages will be looking for it.
 						$_REQUEST['txn_reg_status_change'] = $delete_txn_reg_status_change;
 						$this->_maybe_send_notifications();
-						$this->_process_registration_status_change( $payment->transaction(), $REG_IDs );
+						$this->_process_registration_status_change($payment->transaction(), $REG_IDs);
 					}
 				}
 			} else {
 				EE_Error::add_error(
-					esc_html__( 'Valid Payment data could not be retrieved from the database.', 'event_espresso' ),
+					esc_html__('Valid Payment data could not be retrieved from the database.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
 		} else {
 			EE_Error::add_error(
-				esc_html__( 'A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso' ),
+				esc_html__('A valid Payment ID was not received, therefore payment form data could not be loaded.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
-		$notices = EE_Error::get_notices( false, false, false);
+		$notices = EE_Error::get_notices(false, false, false);
 		$this->_template_args = array(
 			'data' => $json_response_data,
 			'success' => $notices['success'],
@@ -1667,16 +1667,16 @@ 
 	 * @param array $REG_IDs
 	 * @return array
 	 */
-	protected function _registration_payment_data_array( $REG_IDs ) {
+	protected function _registration_payment_data_array($REG_IDs) {
 		$registration_payment_data = array();
 		//if non empty reg_ids lets get an array of registrations and update the values for the apply_payment/refund rows.
-		if ( ! empty( $REG_IDs ) ) {
-			$registrations = EEM_Registration::instance()->get_all( array( array( 'REG_ID' => array( 'IN', $REG_IDs ) ) ) );
-			foreach ( $registrations as $registration ) {
-				if ( $registration instanceof EE_Registration ) {
-					$registration_payment_data[ $registration->ID() ] = array(
+		if ( ! empty($REG_IDs)) {
+			$registrations = EEM_Registration::instance()->get_all(array(array('REG_ID' => array('IN', $REG_IDs))));
+			foreach ($registrations as $registration) {
+				if ($registration instanceof EE_Registration) {
+					$registration_payment_data[$registration->ID()] = array(
 						'paid' => $registration->pretty_paid(),
-						'owing' => EEH_Template::format_currency( $registration->final_price() - $registration->paid() ),
+						'owing' => EEH_Template::format_currency($registration->final_price() - $registration->paid()),
 					);
 				}
 			}
@@ -1696,30 +1696,30 @@ 
 	 * @access protected
 	 * @param \EE_Payment | null $payment
 	 */
-	protected function _maybe_send_notifications( $payment = null ) {
-		switch ( $payment instanceof EE_Payment ) {
+	protected function _maybe_send_notifications($payment = null) {
+		switch ($payment instanceof EE_Payment) {
 			// payment notifications
 			case true :
 				if (
 					isset(
-						$this->_req_data[ 'txn_payments' ],
-						$this->_req_data[ 'txn_payments' ][ 'send_notifications' ]
+						$this->_req_data['txn_payments'],
+						$this->_req_data['txn_payments']['send_notifications']
 					) &&
-					filter_var( $this->_req_data[ 'txn_payments' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN )
+					filter_var($this->_req_data['txn_payments']['send_notifications'], FILTER_VALIDATE_BOOLEAN)
 				) {
-					$this->_process_payment_notification( $payment );
+					$this->_process_payment_notification($payment);
 				}
 				break;
 			// registration notifications
 			case false :
 				if (
 					isset(
-						$this->_req_data[ 'txn_reg_status_change' ],
-						$this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ]
+						$this->_req_data['txn_reg_status_change'],
+						$this->_req_data['txn_reg_status_change']['send_notifications']
 					) &&
-					filter_var( $this->_req_data[ 'txn_reg_status_change' ][ 'send_notifications' ], FILTER_VALIDATE_BOOLEAN )
+					filter_var($this->_req_data['txn_reg_status_change']['send_notifications'], FILTER_VALIDATE_BOOLEAN)
 				) {
-					add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+					add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 				}
 				break;
 		}
@@ -1735,11 +1735,11 @@ 
 	*	@return void
 	*/
 	protected function _send_payment_reminder() {
-	    $TXN_ID = ( ! empty( $this->_req_data['TXN_ID'] )) ? absint( $this->_req_data['TXN_ID'] ) : FALSE;
-		$transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
-		$query_args = isset($this->_req_data['redirect_to'] ) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID'] ) : array();
-		do_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction );
-		$this->_redirect_after_action( FALSE, esc_html__('payment reminder', 'event_espresso'), esc_html__('sent', 'event_espresso'), $query_args, TRUE );
+	    $TXN_ID = ( ! empty($this->_req_data['TXN_ID'])) ? absint($this->_req_data['TXN_ID']) : FALSE;
+		$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
+		$query_args = isset($this->_req_data['redirect_to']) ? array('action' => $this->_req_data['redirect_to'], 'TXN_ID' => $this->_req_data['TXN_ID']) : array();
+		do_action('AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', $transaction);
+		$this->_redirect_after_action(FALSE, esc_html__('payment reminder', 'event_espresso'), esc_html__('sent', 'event_espresso'), $query_args, TRUE);
 	}
 
 
@@ -1753,36 +1753,36 @@ 
 	 * @param string   $view
 	 * @return mixed int = count || array of transaction objects
 	 */
-	public function get_transactions( $perpage, $count = FALSE, $view = '' ) {
+	public function get_transactions($perpage, $count = FALSE, $view = '') {
 
 		$TXN = EEM_Transaction::instance();
 
-	    $start_date = isset( $this->_req_data['txn-filter-start-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-start-date'] ) : date( 'm/d/Y', strtotime( '-10 year' ));
-	    $end_date = isset( $this->_req_data['txn-filter-end-date'] ) ? wp_strip_all_tags( $this->_req_data['txn-filter-end-date'] ) : date( 'm/d/Y' );
+	    $start_date = isset($this->_req_data['txn-filter-start-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-start-date']) : date('m/d/Y', strtotime('-10 year'));
+	    $end_date = isset($this->_req_data['txn-filter-end-date']) ? wp_strip_all_tags($this->_req_data['txn-filter-end-date']) : date('m/d/Y');
 
 	    //make sure our timestamps start and end right at the boundaries for each day
-	    $start_date = date( 'Y-m-d', strtotime( $start_date ) ) . ' 00:00:00';
-	    $end_date = date( 'Y-m-d', strtotime( $end_date ) ) . ' 23:59:59';
+	    $start_date = date('Y-m-d', strtotime($start_date)).' 00:00:00';
+	    $end_date = date('Y-m-d', strtotime($end_date)).' 23:59:59';
 
 
 	    //convert to timestamps
-	    $start_date = strtotime( $start_date );
-	    $end_date = strtotime( $end_date );
+	    $start_date = strtotime($start_date);
+	    $end_date = strtotime($end_date);
 
 	    //makes sure start date is the lowest value and vice versa
-	    $start_date = min( $start_date, $end_date );
-	    $end_date = max( $start_date, $end_date );
+	    $start_date = min($start_date, $end_date);
+	    $end_date = max($start_date, $end_date);
 
 	    //convert to correct format for query
-	$start_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $start_date ), 'Y-m-d H:i:s' );
-	$end_date = EEM_Transaction::instance()->convert_datetime_for_query( 'TXN_timestamp', date( 'Y-m-d H:i:s', $end_date ), 'Y-m-d H:i:s' );
+	$start_date = EEM_Transaction::instance()->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', $start_date), 'Y-m-d H:i:s');
+	$end_date = EEM_Transaction::instance()->convert_datetime_for_query('TXN_timestamp', date('Y-m-d H:i:s', $end_date), 'Y-m-d H:i:s');
 
 
 
 	    //set orderby
 		$this->_req_data['orderby'] = ! empty($this->_req_data['orderby']) ? $this->_req_data['orderby'] : '';
 
-		switch ( $this->_req_data['orderby'] ) {
+		switch ($this->_req_data['orderby']) {
 			case 'TXN_ID':
 				$orderby = 'TXN_ID';
 				break;
@@ -1796,66 +1796,66 @@ 
 				$orderby = 'TXN_timestamp';
 		}
 
-		$sort = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'DESC';
-		$current_page = isset( $this->_req_data['paged'] ) && !empty( $this->_req_data['paged'] ) ? $this->_req_data['paged'] : 1;
-		$per_page = isset( $perpage ) && !empty( $perpage ) ? $perpage : 10;
-		$per_page = isset( $this->_req_data['perpage'] ) && !empty( $this->_req_data['perpage'] ) ? $this->_req_data['perpage'] : $per_page;
+		$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'DESC';
+		$current_page = isset($this->_req_data['paged']) && ! empty($this->_req_data['paged']) ? $this->_req_data['paged'] : 1;
+		$per_page = isset($perpage) && ! empty($perpage) ? $perpage : 10;
+		$per_page = isset($this->_req_data['perpage']) && ! empty($this->_req_data['perpage']) ? $this->_req_data['perpage'] : $per_page;
 
-		$offset = ($current_page-1)*$per_page;
-		$limit = array( $offset, $per_page );
+		$offset = ($current_page - 1) * $per_page;
+		$limit = array($offset, $per_page);
 
 		$_where = array(
-			'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date) ),
+			'TXN_timestamp' => array('BETWEEN', array($start_date, $end_date)),
 			'Registration.REG_count' => 1
 		);
 
-		if ( isset( $this->_req_data['EVT_ID'] ) ) {
+		if (isset($this->_req_data['EVT_ID'])) {
 			$_where['Registration.EVT_ID'] = $this->_req_data['EVT_ID'];
 		}
 
-		if ( isset( $this->_req_data['s'] ) ) {
-			$search_string = '%' . $this->_req_data['s'] . '%';
+		if (isset($this->_req_data['s'])) {
+			$search_string = '%'.$this->_req_data['s'].'%';
 			$_where['OR'] = array(
-				'Registration.Event.EVT_name' => array( 'LIKE', $search_string ),
-				'Registration.Event.EVT_desc' => array( 'LIKE', $search_string ),
-				'Registration.Event.EVT_short_desc' => array( 'LIKE' , $search_string ),
-				'Registration.Attendee.ATT_full_name' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_fname' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_lname' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_short_bio' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_email' => array('LIKE', $search_string ),
-				'Registration.Attendee.ATT_address' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_address2' => array( 'LIKE', $search_string ),
-				'Registration.Attendee.ATT_city' => array( 'LIKE', $search_string ),
-				'Registration.REG_final_price' => array( 'LIKE', $search_string ),
-				'Registration.REG_code' => array( 'LIKE', $search_string ),
-				'Registration.REG_count' => array( 'LIKE' , $search_string ),
-				'Registration.REG_group_size' => array( 'LIKE' , $search_string ),
-				'Registration.Ticket.TKT_name' => array( 'LIKE', $search_string ),
-				'Registration.Ticket.TKT_description' => array( 'LIKE', $search_string ),
-				'Payment.PAY_source' => array('LIKE', $search_string ),
-				'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string ),
-				'TXN_session_data' => array( 'LIKE', $search_string ),
-				'Payment.PAY_txn_id_chq_nmbr' => array( 'LIKE', $search_string )
+				'Registration.Event.EVT_name' => array('LIKE', $search_string),
+				'Registration.Event.EVT_desc' => array('LIKE', $search_string),
+				'Registration.Event.EVT_short_desc' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_full_name' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_fname' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_lname' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_short_bio' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_email' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_address' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_address2' => array('LIKE', $search_string),
+				'Registration.Attendee.ATT_city' => array('LIKE', $search_string),
+				'Registration.REG_final_price' => array('LIKE', $search_string),
+				'Registration.REG_code' => array('LIKE', $search_string),
+				'Registration.REG_count' => array('LIKE', $search_string),
+				'Registration.REG_group_size' => array('LIKE', $search_string),
+				'Registration.Ticket.TKT_name' => array('LIKE', $search_string),
+				'Registration.Ticket.TKT_description' => array('LIKE', $search_string),
+				'Payment.PAY_source' => array('LIKE', $search_string),
+				'Payment.Payment_Method.PMD_name' => array('LIKE', $search_string),
+				'TXN_session_data' => array('LIKE', $search_string),
+				'Payment.PAY_txn_id_chq_nmbr' => array('LIKE', $search_string)
 				);
 		}
 
 		//failed transactions
-		$failed = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'failed' && ! $count ) || ( $count && $view == 'failed' ) ? TRUE: FALSE;
-		$abandoned = ( ! empty( $this->_req_data['status'] ) && $this->_req_data['status'] == 'abandoned' && ! $count ) || ( $count && $view == 'abandoned' ) ? TRUE: FALSE;
+		$failed = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'failed' && ! $count) || ($count && $view == 'failed') ? TRUE: FALSE;
+		$abandoned = ( ! empty($this->_req_data['status']) && $this->_req_data['status'] == 'abandoned' && ! $count) || ($count && $view == 'abandoned') ? TRUE: FALSE;
 
-		if ( $failed ) {
-			$_where[ 'STS_ID' ] = EEM_Transaction::failed_status_code;
-		} else if ( $abandoned ) {
+		if ($failed) {
+			$_where['STS_ID'] = EEM_Transaction::failed_status_code;
+		} else if ($abandoned) {
 				$_where['STS_ID'] = EEM_Transaction::abandoned_status_code;
 		} else {
-				$_where['STS_ID'] = array( '!=', EEM_Transaction::failed_status_code );
-				$_where['STS_ID*'] = array( '!=', EEM_Transaction::abandoned_status_code );
+				$_where['STS_ID'] = array('!=', EEM_Transaction::failed_status_code);
+				$_where['STS_ID*'] = array('!=', EEM_Transaction::abandoned_status_code);
 		}
 
-		$query_params = array( $_where, 'order_by' => array( $orderby => $sort ), 'limit' => $limit );
+		$query_params = array($_where, 'order_by' => array($orderby => $sort), 'limit' => $limit);
 
-		$transactions = $count ? $TXN->count( array($_where), 'TXN_ID', TRUE ) : $TXN->get_all($query_params);
+		$transactions = $count ? $TXN->count(array($_where), 'TXN_ID', TRUE) : $TXN->get_all($query_params);
 
 
 		return $transactions;

core/data_migration_scripts/EE_DMS_Core_4_6_0.dms.php

Spacing +63 added lines, -63 removed lines

@@ -13,7 +13,7 @@ 
  * @author        Mike Nelson
  * @since         4.6.0
  */
-class EE_DMS_Core_4_6_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_6_0 extends EE_Data_Migration_Script_Base {
 
 	/**
 	 * return EE_DMS_Core_4_6_0
@@ -22,7 +22,7 @@ 
 	 * @param TableAnalysis $table_analysis
 	 * @throws \EE_Error
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
 		$this->_load_script_stages();
 		$this->_pretty_name = __("Data Migration to Event Espresso 4.6.0.P", "event_espresso");
 		$this->_priority = 10;
@@ -37,7 +37,7 @@ 
 			new EE_DMS_4_6_0_payments(),
 			new EE_DMS_4_6_0_invoice_settings()
 		);
-		parent::__construct( $table_manager, $table_analysis );
+		parent::__construct($table_manager, $table_analysis);
 	}
 
 
@@ -48,14 +48,14 @@ 
 	 */
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if($version_string <= '4.6.0' && $version_string >= '4.5.0' ){
+		if ($version_string <= '4.6.0' && $version_string >= '4.5.0') {
 //			echo "$version_string can be migrated from";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -77,14 +77,14 @@ 
 	 */
 	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 UNSIGNED NOT NULL AUTO_INCREMENT,
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$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,
@@ -123,7 +123,7 @@ 
 					  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' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_currency';
 		$sql = "CUR_code VARCHAR(6) COLLATE utf8_bin NOT NULL,
@@ -133,7 +133,7 @@ 
 				CUR_dec_plc VARCHAR(1) COLLATE utf8_bin NOT NULL DEFAULT '2',
 				CUR_active TINYINT(1) DEFAULT '0',
 				PRIMARY KEY  (CUR_code)";
-		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_currency_payment_method';
@@ -163,7 +163,7 @@ 
 
 
 
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -180,41 +180,41 @@ 
 			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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT 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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$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 '',
@@ -230,7 +230,7 @@ 
 				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' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_log';
 		$sql = "LOG_ID INT(11) NOT NULL AUTO_INCREMENT,
@@ -253,7 +253,7 @@ 
 					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' );
+		$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,
@@ -268,7 +268,7 @@ 
 					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');
+		$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,
@@ -277,7 +277,7 @@ 
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_payment';
@@ -345,8 +345,8 @@ 
 					  PRIMARY KEY  (TTM_ID)";
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -358,27 +358,27 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_order INT 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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -411,8 +411,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$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,
@@ -501,7 +501,7 @@ 
 					  PRC_wp_user BIGINT UNSIGNED NULL,
 					  PRC_parent INT(10) UNSIGNED DEFAULT 0,
 					  PRIMARY KEY  (PRC_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$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,
@@ -538,12 +538,12 @@ 
 					  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->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$this->_get_table_manager()->dropIndex( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		$this->_get_table_manager()->dropIndex('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -555,7 +555,7 @@ 
 					QSG_wp_user BIGINT UNSIGNED NULL,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($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');
@@ -583,15 +583,15 @@ 
 		return true;
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 
-	public function add_default_admin_only_payments(){
+	public function add_default_admin_only_payments() {
 		global $wpdb;
 		$table_name = $wpdb->prefix."esp_payment_method";
 		$user_id = EEH_Activation::get_default_creator_id();
-		if ( $this->_get_table_analysis()->tableExists( $table_name ) ) {
+		if ($this->_get_table_analysis()->tableExists($table_name)) {
 
 			$SQL = "SELECT COUNT( * ) FROM $table_name";
 			$existing_payment_methods = $wpdb->get_var($SQL);
@@ -612,11 +612,11 @@ 
 			//so admins can record payments for them from the admin page
 
 
-			foreach($default_admin_only_payment_methods as $nicename => $description){
+			foreach ($default_admin_only_payment_methods as $nicename => $description) {
 				$slug = sanitize_key($nicename);
 			//check that such a payment method exists
-				$exists = $wpdb->get_var($wpdb->prepare("SELECT count(*) FROM $table_name WHERE PMD_slug = %s",$slug));
-				if( ! $exists){
+				$exists = $wpdb->get_var($wpdb->prepare("SELECT count(*) FROM $table_name WHERE PMD_slug = %s", $slug));
+				if ( ! $exists) {
 					$values = array(
 								'PMD_type'=>'Admin_Only',
 								'PMD_name'=>$nicename,
@@ -630,17 +630,17 @@ 
 							$table_name,
 							$values,
 							array(
-								'%s',//PMD_type
-								'%s',//PMD_name
-								'%s',//PMD_admin_name
-								'%s',//PMD_admin_desc
-								'%s',//PMD_slug
-								'%d',//PMD_wp_user
-								'%s',//PMD_scope
+								'%s', //PMD_type
+								'%s', //PMD_name
+								'%s', //PMD_admin_name
+								'%s', //PMD_admin_desc
+								'%s', //PMD_slug
+								'%d', //PMD_wp_user
+								'%s', //PMD_scope
 							)
 							);
-					if( ! $success ){
-						$this->add_error(sprintf(__("Could not insert new admin-only payment method with values %s during migration", "event_espresso"),$this->_json_encode($values)));
+					if ( ! $success) {
+						$this->add_error(sprintf(__("Could not insert new admin-only payment method with values %s during migration", "event_espresso"), $this->_json_encode($values)));
 					}
 				}
 			}
@@ -658,11 +658,11 @@ 
 
 		global $wpdb;
 		$currency_table = $wpdb->prefix."esp_currency";
-		if ( $this->_get_table_analysis()->tableExists( $currency_table ) ) {
+		if ($this->_get_table_analysis()->tableExists($currency_table)) {
 
 			$SQL = "SELECT COUNT('CUR_code') FROM $currency_table";
 			$countries = $wpdb->get_var($SQL);
-			if ( ! $countries ) {
+			if ( ! $countries) {
 				$SQL = "INSERT INTO $currency_table
 				( CUR_code, CUR_single, CUR_plural, CUR_sign, CUR_dec_plc, CUR_active) VALUES
 				( 'EUR',  'Euro',  'Euros',  '€',  2,1),

core/data_migration_scripts/EE_DMS_Core_4_3_0.dms.php

Spacing +54 added lines, -54 removed lines

@@ -7,7 +7,7 @@ 
  * mostly just
  * -adds QSO_order to the Question_Option table;
  */
-class EE_DMS_Core_4_3_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_3_0 extends EE_Data_Migration_Script_Base {
 
 
 
@@ -18,7 +18,7 @@ 
 	 * @param TableAnalysis $table_analysis
 	 * @throws \EE_Error
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
 		$this->_load_script_stages();
 		$this->_pretty_name = __("Data Migration to Event Espresso 4.3.0.P", "event_espresso");
 		$this->_priority = 10;
@@ -27,21 +27,21 @@ 
 			new EE_DMS_4_3_0_event_message_templates(),
 			new EE_DMS_4_3_0_critical_page_shortcode_tracking()
 		);
-		parent::__construct( $table_manager, $table_analysis );
+		parent::__construct($table_manager, $table_analysis);
 	}
 
 
 
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if($version_string <= '4.3.0' && $version_string >= '4.2.0' ){
+		if ($version_string <= '4.3.0' && $version_string >= '4.2.0') {
 //			echo "$version_string can be migrated fro";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.2
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -51,14 +51,14 @@ 
 	}
 	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 UNSIGNED NOT NULL AUTO_INCREMENT,
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$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,
@@ -97,7 +97,7 @@ 
 					  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' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -120,7 +120,7 @@ 
 
 
 
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -137,41 +137,41 @@ 
 			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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT 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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$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 '',
@@ -187,7 +187,7 @@ 
 				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' );
+		$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,
@@ -199,7 +199,7 @@ 
 					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' );
+		$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,
@@ -214,7 +214,7 @@ 
 					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');
+		$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,
@@ -223,7 +223,7 @@ 
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-		$this->_table_is_new_in_this_version( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -332,8 +332,8 @@ 
 
 
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -345,12 +345,12 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$this->_get_table_manager()->dropIndex( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		$this->_get_table_manager()->dropIndex('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -361,29 +361,29 @@ 
 					QSG_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_order INT 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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -416,8 +416,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$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,
@@ -491,7 +491,7 @@ 
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
-		$script_with_defaults = EE_Registry::instance()->load_dms( 'Core_4_1_0' );
+		$script_with_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
 		//setting up the DEFAULT stats and countries is also essential for the data migrations to run
 		//(because many need to convert old string states to foreign keys into the states table)
 		$script_with_defaults->insert_default_states();
@@ -513,7 +513,7 @@ 
 		return true;
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 
@@ -529,34 +529,34 @@ 
 
 		global $wpdb;
 		$ticket_table = $wpdb->prefix."esp_ticket";
-		if ( $this->_get_table_analysis()->tableExists( $ticket_table ) ) {
+		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) {
 				$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_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, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL );
+					( 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, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_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 ) ) {
+		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 )
 				";
 
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL);
 				$wpdb->query($SQL);
 			}
 		}

core/data_migration_scripts/EE_DMS_Core_4_2_0.dms.php

Spacing +43 added lines, -43 removed lines

@@ -8,7 +8,7 @@ 
  * -adds QGQ_order to the question-group_question table;
  * -adds DTT_name and DTT_description to the datetime table;
  */
-class EE_DMS_Core_4_2_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_2_0 extends EE_Data_Migration_Script_Base {
 
 
 
@@ -19,7 +19,7 @@ 
 	 * @param TableAnalysis $table_analysis
 	 * @throws \EE_Error
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
 		$this->_load_script_stages();
 		$this->_pretty_name = __("Data Migration to Event Espresso 4.2.0.P", "event_espresso");
 		$this->_priority = 10;
@@ -27,22 +27,22 @@ 
 			new EE_DMS_4_2_0_question_group_questions(),
 			new EE_DMS_4_2_0_datetime_fields(),
 		);
-		parent::__construct( $table_manager, $table_analysis );
+		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.2.0', '<=' ) && version_compare( $version_string, '4.1.0', '>=' ) ) {
+		if (version_compare($version_string, '4.2.0', '<=') && version_compare($version_string, '4.1.0', '>=')) {
 //			echo "$version_string can be migrated fro";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.1
 			//because since 4.1 we're
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -52,14 +52,14 @@ 
 	}
 	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 UNSIGNED NOT NULL AUTO_INCREMENT,
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$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,
@@ -99,7 +99,7 @@ 
 					  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' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -122,7 +122,7 @@ 
 
 
 
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -139,41 +139,41 @@ 
 			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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT 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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$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 '',
@@ -189,7 +189,7 @@ 
 				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' );
+		$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,
@@ -216,7 +216,7 @@ 
 					PRIMARY KEY  (GRP_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -324,8 +324,8 @@ 
 
 
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -337,12 +337,12 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$this->_get_table_manager()->dropIndex( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		$this->_get_table_manager()->dropIndex('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -353,28 +353,28 @@ 
 					QSG_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -407,8 +407,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$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,
@@ -482,7 +482,7 @@ 
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
-		$script_with_defaults = EE_Registry::instance()->load_dms( 'Core_4_1_0' );
+		$script_with_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
 		//setting up the DEFAULT stats and countries is also essential for the data migrations to run
 		//(because many need to convert old string states to foreign keys into the states table)
 		$script_with_defaults->insert_default_states();
@@ -504,7 +504,7 @@ 
 		return true;
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 }

core/data_migration_scripts/EE_DMS_Core_4_8_0.dms.php

Spacing +77 added lines, -77 removed lines

@@ -16,7 +16,7 @@ 
  * @author     Mike Nelson
  * @since      4.6.0
  */
-class EE_DMS_Core_4_8_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_8_0 extends EE_Data_Migration_Script_Base {
 
 	/**
 	 * return EE_DMS_Core_4_8_0
@@ -25,7 +25,7 @@ 
 	 * @param TableAnalysis $table_analysis
 	 * @throws \EE_Error
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
 		$this->_load_script_stages();
 		$this->_pretty_name = __("Data Migration to Event Espresso 4.8.0.P (for promotions)", "event_espresso");
 		$this->_priority = 10;
@@ -33,7 +33,7 @@ 
 			new EE_DMS_4_8_0_pretax_totals(),
 			new EE_DMS_4_8_0_event_subtotals(),
 		);
-		parent::__construct( $table_manager, $table_analysis );
+		parent::__construct($table_manager, $table_analysis);
 	}
 
 
@@ -48,14 +48,14 @@ 
 	 */
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if( $version_string <= '4.8.0' && $version_string >= '4.7.0' ){
+		if ($version_string <= '4.8.0' && $version_string >= '4.7.0') {
 //			echo "$version_string can be migrated from";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -76,19 +76,19 @@ 
 	 * @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');
+		$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,
+		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');
+		$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,
@@ -128,7 +128,7 @@ 
 					  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' );
+		$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,
@@ -138,7 +138,7 @@ 
 				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' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_currency_payment_method';
@@ -168,7 +168,7 @@ 
 						KEY EVT_ID (EVT_ID),
 						KEY DTT_is_primary (DTT_is_primary)";
 
-		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_event_meta';
 		$sql = "
@@ -187,41 +187,41 @@ 
 			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');
+		$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,
+		$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');
+		$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,
+		$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');
+		$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,
+		$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');
+		$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,
@@ -234,8 +234,8 @@ 
 				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,
+		$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 '',
@@ -254,7 +254,7 @@ 
 				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' );
+		$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,
@@ -293,7 +293,7 @@ 
 					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');
+		$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,
@@ -302,7 +302,7 @@ 
 					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');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_payment';
@@ -375,8 +375,8 @@ 
 					  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,
+		$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 "",
@@ -390,22 +390,22 @@ 
 					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');
+		$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,
+		$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');
+		$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,
+		$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,
@@ -415,7 +415,7 @@ 
 					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');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -461,8 +461,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$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,
@@ -557,7 +557,7 @@ 
 					  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');
+		$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,
@@ -595,10 +595,10 @@ 
 					  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' );
+		$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,
+		$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,
@@ -611,7 +611,7 @@ 
 					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' );
+		$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');
@@ -647,7 +647,7 @@ 
 		return $script_4_7_defaults->schema_changes_after_migration();
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 
@@ -661,19 +661,19 @@ 
 		//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, 'Alan 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, '+941', 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, '+381', 0, 0 ),
-			array( 'YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0 ),
+			array('AX', 'ALA', 0, 'Alan 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, '+941', 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, '+381', 0, 0),
+			array('YT', 'MYT', 0, 'Mayotte', 'EUR', 'Euro', 'Euros', '€', 0, 2, '+262', 1, 0),
 		);
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
@@ -692,14 +692,14 @@ 
 							"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" ;
+		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 ) {
+				if ( ! $countries) {
 
-					$wpdb->insert( $country_table,
-							array_combine( array_keys( $country_format), $country ),
+					$wpdb->insert($country_table,
+							array_combine(array_keys($country_format), $country),
 							$country_format
 							);
 				}
@@ -717,7 +717,7 @@ 
 		// 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 ),
+			array('RSD', 'Dinar', 'Dinars', '', 3, 1),
 		);
 		global $wpdb;
 		$currency_table = $wpdb->prefix."esp_currency";
@@ -729,14 +729,14 @@ 
 							"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" ;
+		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 ) {
+				if ( ! $countries) {
 
-					$wpdb->insert( $currency_table,
-							array_combine( array_keys( $currency_format), $currency ),
+					$wpdb->insert($currency_table,
+							array_combine(array_keys($currency_format), $currency),
 							$currency_format
 							);
 				}
@@ -748,9 +748,9 @@ 
 	 * 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(){
+	public function fix_non_default_taxes() {
 		global $wpdb;
-		$query = $wpdb->prepare( "UPDATE
+		$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
@@ -758,7 +758,7 @@ 
 			WHERE
 				p.PRC_is_default = 0 AND
 				pt.PBT_ID = %d
-					", EEM_Price_Type::base_type_tax );
-		$wpdb->query( $query );
+					", EEM_Price_Type::base_type_tax);
+		$wpdb->query($query);
 	}
 }

core/data_migration_scripts/EE_DMS_Core_4_5_0.dms.php

Spacing +71 added lines, -71 removed lines

@@ -9,7 +9,7 @@ 
  * -adds DTT_name and DTT_description to the datetime table;
  * -adds users onto prices, price types, question groups, and tickets
  */
-class EE_DMS_Core_4_5_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_5_0 extends EE_Data_Migration_Script_Base {
 
 
 
@@ -20,7 +20,7 @@ 
 	 * @param TableAnalysis $table_analysis
 	 * @throws \EE_Error
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
 		$this->_load_script_stages();
 		$this->_pretty_name = __("Data Migration to Event Espresso 4.5.0.P", "event_espresso");
 		$this->_priority = 10;
@@ -31,21 +31,21 @@ 
 			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 );
+		parent::__construct($table_manager, $table_analysis);
 	}
 
 
 
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if($version_string <= '4.5.0' && $version_string >= '4.3.0' ){
+		if ($version_string <= '4.5.0' && $version_string >= '4.3.0') {
 //			echo "$version_string can be migrated from";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -55,14 +55,14 @@ 
 	}
 	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 UNSIGNED NOT NULL AUTO_INCREMENT,
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$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,
@@ -101,7 +101,7 @@ 
 					  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' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_datetime';
 		$sql = "DTT_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -122,7 +122,7 @@ 
 
 
 
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -139,41 +139,41 @@ 
 			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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT 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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$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 '',
@@ -189,7 +189,7 @@ 
 				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' );
+		$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,
@@ -201,7 +201,7 @@ 
 					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' );
+		$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,
@@ -216,7 +216,7 @@ 
 					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');
+		$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,
@@ -225,7 +225,7 @@ 
 					PRIMARY KEY  (EMT_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY GRP_ID (GRP_ID)";
-		$this->_table_should_exist_previously( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_payment';
@@ -275,8 +275,8 @@ 
 					  PRIMARY KEY  (TTM_ID)";
 		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -288,27 +288,27 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QGQ_order INT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_order INT 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');
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -341,8 +341,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$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,
@@ -430,7 +430,7 @@ 
 					  PRC_wp_user BIGINT UNSIGNED NULL,
 					  PRC_parent INT(10) UNSIGNED DEFAULT 0,
 					  PRIMARY KEY  (PRC_ID)";
-		$this->_table_should_exist_previously($table_name,$sql, 'ENGINE=InnoDB');
+		$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,
@@ -467,12 +467,12 @@ 
 					  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->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
-		$this->_get_table_manager()->dropIndex( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		$this->_get_table_manager()->dropIndex('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -484,7 +484,7 @@ 
 					QSG_wp_user BIGINT UNSIGNED NULL,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_should_exist_previously($table_name, $sql, 'ENGINE=InnoDB');
 
 		$script_4_1_defaults = EE_Registry::instance()->load_dms('Core_4_1_0');
 
@@ -508,7 +508,7 @@ 
 		return true;
 	}
 
-	public function migration_page_hooks(){
+	public function migration_page_hooks() {
 
 	}
 
@@ -522,21 +522,21 @@ 
 		global $wpdb;
 		$price_type_table = $wpdb->prefix."esp_price_type";
 
-		if ( $this->_get_table_analysis()->tableExists( $price_type_table ) ) {
+		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 );
+			$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);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_5_0__insert_default_price_types__SQL', $SQL );
-				$wpdb->query( $SQL );
+							(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);
 			}
 		}
 	}
@@ -556,17 +556,17 @@ 
 		global $wpdb;
 		$price_table = $wpdb->prefix."esp_price";
 
-		if ( $this->_get_table_analysis()->tableExists( $price_table ) ) {
+		if ($this->_get_table_analysis()->tableExists($price_table)) {
 
-			$SQL = 'SELECT COUNT(PRC_ID) FROM ' .$price_table;
-			$prices_exist = $wpdb->get_var( $SQL );
+			$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
 							(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 );
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_prices__SQL', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
@@ -584,35 +584,35 @@ 
 
 		global $wpdb;
 		$ticket_table = $wpdb->prefix."esp_ticket";
-		if ( $this->_get_table_analysis()->tableExists( $ticket_table ) ) {
+		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
-					( 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 );
+					( 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 ) ) {
+		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 )
 				";
 
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL__ticket_price', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_5_0__insert_default_tickets__SQL__ticket_price', $SQL);
 				$wpdb->query($SQL);
 			}
 		}

core/data_migration_scripts/EE_DMS_Core_4_9_0.dms.php

Spacing +38 added lines, -38 removed lines

@@ -11,7 +11,7 @@ 
  * @author        Mike Nelson
  * @since         4.6.0
  */
-class EE_DMS_Core_4_9_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_9_0 extends EE_Data_Migration_Script_Base {
 
 	/**
 	 * return EE_DMS_Core_4_9_0
@@ -20,7 +20,7 @@ 
 	 * @param TableAnalysis $table_analysis
 	 * @throws \EE_Error
 	 */
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ) {
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
 		$this->_load_script_stages();
 		$this->_pretty_name = __("Data Migration to Event Espresso 4.9.0.P", "event_espresso");
 		$this->_priority = 10;
@@ -28,7 +28,7 @@ 
 			new EE_DMS_4_9_0_Email_System_Question(),
 			new EE_DMS_4_9_0_Answers_With_No_Registration(),
 		);
-		parent::__construct( $table_manager, $table_analysis );
+		parent::__construct($table_manager, $table_analysis);
 	}
 
 
@@ -40,14 +40,14 @@ 
 	 */
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if( $version_string <= '4.9.0' && $version_string >= '4.8.0' ){
+		if ($version_string <= '4.9.0' && $version_string >= '4.8.0') {
 //			echo "$version_string can be migrated from";
 			return true;
-		} elseif( ! $version_string ){
+		} elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.3
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -68,18 +68,18 @@ 
 	 * @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');
+		$now_in_mysql = current_time('mysql', true);
 
-		$table_name='esp_answer';
-		$sql=" ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$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_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -101,7 +101,7 @@ 
 				KEY ATT_fname (ATT_fname)";
 		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
 
-		$table_name='esp_checkin';
+		$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,
@@ -129,7 +129,7 @@ 
 				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' );
+		$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,
@@ -139,7 +139,7 @@ 
 				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' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 
 		$table_name = 'esp_currency_payment_method';
@@ -167,7 +167,7 @@ 
 				KEY DTT_EVT_start (DTT_EVT_start),
 				KEY EVT_ID (EVT_ID),
 				KEY DTT_is_primary (DTT_is_primary)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = "esp_datetime_ticket";
 		$sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -185,7 +185,7 @@ 
 				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');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_event_meta';
 		$sql = "EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
@@ -203,9 +203,9 @@ 
 				EVT_donations tinyint(1) NULL,
 				PRIMARY KEY  (EVTM_ID),
 				KEY EVT_ID (EVT_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_event_question_group';
+		$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,
@@ -213,17 +213,17 @@ 
 				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');
+		$this->_table_is_changed_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_event_venue';
+		$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');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_extra_meta';
+		$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,
@@ -231,7 +231,7 @@ 
 				EXM_value text,
 				PRIMARY KEY  (EXM_ID),
 				KEY EXM_type (EXM_type,OBJ_ID,EXM_key)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_extra_join';
 		$sql = "EXJ_ID int(11) NOT NULL AUTO_INCREMENT,
@@ -244,7 +244,7 @@ 
 				KEY second_model (EXJ_second_model_name,EXJ_second_model_id)";
 		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB ');
 
-		$table_name='esp_line_item';
+		$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,
@@ -264,7 +264,7 @@ 
 				PRIMARY KEY  (LIN_ID),
 				KEY LIN_code (LIN_code(191)),
 				KEY TXN_ID (TXN_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_log';
 		$sql = "LOG_ID int(11) NOT NULL AUTO_INCREMENT,
@@ -313,7 +313,7 @@ 
 				KEY STS_ID (STS_ID),
 				KEY MSG_created (MSG_created),
 				KEY MSG_modified (MSG_modified)";
-		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_message_template';
 		$sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -338,7 +338,7 @@ 
 				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');
+		$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,
@@ -396,7 +396,7 @@ 
 				PRIMARY KEY  (TTM_ID)";
 		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question';
+		$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,
@@ -411,9 +411,9 @@ 
 				QST_deleted tinyint(2) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (QST_ID),
 				KEY QST_order (QST_order)';
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question_group_question';
+		$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,
@@ -421,9 +421,9 @@ 
 				PRIMARY KEY  (QGQ_ID),
 				KEY QST_ID (QST_ID),
 				KEY QSG_ID_order (QSG_ID,QGQ_order)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_question_option';
+		$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,
@@ -434,7 +434,7 @@ 
 				PRIMARY KEY  (QSO_ID),
 				KEY QST_ID (QST_ID),
 				KEY QSO_order (QSO_order)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_registration';
 		$sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -547,7 +547,7 @@ 
 				PRC_parent int(10) unsigned DEFAULT 0,
 				PRIMARY KEY  (PRC_ID),
 				KEY PRT_ID (PRT_ID)";
-		$this->_table_has_not_changed_since_previous($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = "esp_price_type";
 		$sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
@@ -584,7 +584,7 @@ 
 				TKT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				PRIMARY KEY  (TKT_ID),
 				KEY TKT_start_date (TKT_start_date)";
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_question_group';
 		$sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -600,7 +600,7 @@ 
 				PRIMARY KEY  (QSG_ID),
 				UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier),
 				KEY QSG_order (QSG_order)';
-		$this->_table_has_not_changed_since_previous($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_has_not_changed_since_previous($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');
@@ -634,5 +634,5 @@ 
 		return true;
 	}
 
-	public function migration_page_hooks(){}
+	public function migration_page_hooks() {}
 }
\ No newline at end of file