eventespresso / event-espresso-core

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

Braces +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 		$invoice_settings = isset( EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] ) ? EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] : NULL;
 		if( ! $invoice_settings ){
 			$this->add_error( __( 'Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso' ) );
-		}else{
+		} else{
 			$invoice_settings[ 'template_payment_instructions' ] = $invoice_settings[ 'pdf_instructions' ];
 			$invoice_settings[ 'template_invoice_payee_name' ] = $invoice_settings[ 'payable_to' ];
 			$invoice_settings[ 'template_invoice_address' ] = $invoice_settings[ 'payment_address' ];

Spacing +24 added lines, -24 removed lines

@@ -29,7 +29,7 @@ 
 	 * Just initializes the status of the migration
 	 */
 	public function __construct() {
-		$this->_pretty_name = __( 'Update Invoice Gateway Settings', 'event_espresso' );
+		$this->_pretty_name = __('Update Invoice Gateway Settings', 'event_espresso');
 		parent::__construct();
 	}
 
@@ -56,39 +56,39 @@ 
 	 * @throws EE_Error
 	 * @return int number of items ACTUALLY migrated
 	 */
-	protected function _migration_step( $num_items = 1 ){
+	protected function _migration_step($num_items = 1) {
 		// if this isn't set then something is really wrong
-		if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config ) {
-			throw new EE_Error( __( 'It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso' ));
+		if ( ! EE_Config::instance()->gateway instanceof EE_Gateway_Config) {
+			throw new EE_Error(__('It appears the Event Espresso Core Configuration is not setup correctly.', 'event_espresso'));
 		}
-		$invoice_settings = isset( EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] ) ? EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] : NULL;
-		if( ! $invoice_settings ){
-			$this->add_error( __( 'Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso' ) );
-		}else{
-			$invoice_settings[ 'template_payment_instructions' ] = $invoice_settings[ 'pdf_instructions' ];
-			$invoice_settings[ 'template_invoice_payee_name' ] = $invoice_settings[ 'payable_to' ];
-			$invoice_settings[ 'template_invoice_address' ] = $invoice_settings[ 'payment_address' ];
-			$invoice_settings[ 'template_invoice_email' ] = '';
-			$invoice_settings[ 'template_invoice_tax_number' ] = '';
-			unset( $invoice_settings[ 'pdf_instructions' ] );
-			unset( $invoice_settings[ 'payable_to' ] );
-			unset( $invoice_settings[ 'payment_address' ] );
-			EE_Config::instance()->gateway->payment_settings[ 'Invoice' ] = $invoice_settings;
-			EE_Config::instance()->update_espresso_config(false,false);
+		$invoice_settings = isset(EE_Config::instance()->gateway->payment_settings['Invoice']) ? EE_Config::instance()->gateway->payment_settings['Invoice'] : NULL;
+		if ( ! $invoice_settings) {
+			$this->add_error(__('Could not migrate EE4.4 invoice settings to EE4.5 because they didnt exist', 'event_espresso'));
+		} else {
+			$invoice_settings['template_payment_instructions'] = $invoice_settings['pdf_instructions'];
+			$invoice_settings['template_invoice_payee_name'] = $invoice_settings['payable_to'];
+			$invoice_settings['template_invoice_address'] = $invoice_settings['payment_address'];
+			$invoice_settings['template_invoice_email'] = '';
+			$invoice_settings['template_invoice_tax_number'] = '';
+			unset($invoice_settings['pdf_instructions']);
+			unset($invoice_settings['payable_to']);
+			unset($invoice_settings['payment_address']);
+			EE_Config::instance()->gateway->payment_settings['Invoice'] = $invoice_settings;
+			EE_Config::instance()->update_espresso_config(false, false);
 
 			//@todo: check 'invoice_css' too because we can't easily affect that so we might need to set a persistent notice
 			//(why is it tough to change? because we want to update the receipt and invoice message template, but
 			//message templates are only initialized AFTER migrations and those two are new in 4.5. So if we wanted to
 			//update them from a DMS, we'd need to have the DMS create the message templates which is quite a lot of code;
 			//also we don't want to build a dependency on the messages code because it is likely to change soon
-			if( ! in_array( $invoice_settings[ 'invoice_css' ], array( '', 'simple.css' ) ) ){
-				EE_Error::add_persistent_admin_notice( 'invoice_css_not_updated', sprintf( __( 'You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.', 'event_espresso'), $invoice_settings[ 'invoice_css' ] ), FALSE );
+			if ( ! in_array($invoice_settings['invoice_css'], array('', 'simple.css'))) {
+				EE_Error::add_persistent_admin_notice('invoice_css_not_updated', sprintf(__('You had previously set your Invoice Payment Method\'s stylesheet to be %1$s, but that setting has moved. PDF and HTML Invoices and Receipts are now Messages, which means you can easily modify them from your Wordpress Dashboard instead of using filters or uploading template files. Please visit Messages -> Receipt and Messages -> Invoice to change their stylesheets.', 'event_espresso'), $invoice_settings['invoice_css']), FALSE);
 			}
 			$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
-			$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
-			$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
-			if( $overridden_invoice_body || $overridden_receipt_body ) {
-				EE_Error::add_persistent_admin_notice( 'invoice_overriding_templates', sprintf( __( 'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE );
+			$overridden_invoice_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', NULL, FALSE, FALSE, TRUE);
+			$overridden_receipt_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', NULL, FALSE, FALSE, TRUE);
+			if ($overridden_invoice_body || $overridden_receipt_body) {
+				EE_Error::add_persistent_admin_notice('invoice_overriding_templates', sprintf(__('Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents. We recommend deleting your old Invoice/Receipt templates and modifying the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE);
 			}
 
 		}

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

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
 		$updated = $wpdb->update($this->_old_table,
 				array('PRT_wp_user'=>$user_id),
 				array('PRT_ID'=>$old_row['PRT_ID']),
-				array('%d',//PRT_wp_user
+				array('%d', //PRT_wp_user
 					),
-				array('%d',//PRT_ID
+				array('%d', //PRT_ID
 					));
-		if ( FALSE === $updated ) {
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting PRT_wp_user = %d where PRT_ID = %d", 'event_espresso'),$user_id,$old_row['PRT_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting PRT_wp_user = %d where PRT_ID = %d", 'event_espresso'), $user_id, $old_row['PRT_ID']));
 		}
 	}
 }

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

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
 		$updated = $wpdb->update($this->_old_table,
 				array('PRC_wp_user'=>$user_id),
 				array('PRC_ID'=>$old_row['PRC_ID']),
-				array('%d',//PRC_wp_user
+				array('%d', //PRC_wp_user
 					),
-				array('%d',//PRC_ID
+				array('%d', //PRC_ID
 					));
-		if ( FALSE === $updated ) {
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting PRC_wp_user = %d where PRC_ID = %d", 'event_espresso'),$user_id,$old_row['PRC_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting PRC_wp_user = %d where PRC_ID = %d", 'event_espresso'), $user_id, $old_row['PRC_ID']));
 		}
 	}
 }

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

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
 		$updated = $wpdb->update($this->_old_table,
 				array('QSG_wp_user'=>$user_id),
 				array('QSG_ID'=>$old_row['QSG_ID']),
-				array('%d',//QSG_wp_user
+				array('%d', //QSG_wp_user
 					),
-				array('%d',//QSG_ID
+				array('%d', //QSG_ID
 					));
-		if ( FALSE === $updated ) {
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting QSG_wp_user = %d where QSG_ID = %d", 'event_espresso'),$user_id,$old_row['QSG_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting QSG_wp_user = %d where QSG_ID = %d", 'event_espresso'), $user_id, $old_row['QSG_ID']));
 		}
 	}
 }

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

Spacing +4 added lines, -4 removed lines

@@ -21,12 +21,12 @@
 		$updated = $wpdb->update($this->_old_table,
 				array('TKT_wp_user'=>$user_id),
 				array('TKT_ID'=>$old_row['TKT_ID']),
-				array('%d',//TKT_wp_user
+				array('%d', //TKT_wp_user
 					),
-				array('%d',//TKT_ID
+				array('%d', //TKT_ID
 					));
-		if ( FALSE === $updated ) {
-			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting TKT_wp_user = %d where TKT_ID = %d", 'event_espresso'),$user_id,$old_row['TKT_ID']));
+		if (FALSE === $updated) {
+			$this->add_error(sprintf(__("Error in updating table {$this->_old_table} setting TKT_wp_user = %d where TKT_ID = %d", 'event_espresso'), $user_id, $old_row['TKT_ID']));
 		}
 	}
 }

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

Spacing +16 added lines, -16 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -12,24 +12,24 @@ 
  * @author				Mike Nelson
  *
  */
-class EE_DMS_4_6_0_billing_info extends EE_Data_Migration_Script_Stage_Table{
-	function __construct(){
+class EE_DMS_4_6_0_billing_info extends EE_Data_Migration_Script_Stage_Table {
+	function __construct() {
 		global $wpdb;
 		$this->_old_table = $wpdb->postmeta;
 		$this->_pretty_name = __('Billing Info', 'event_espresso');
 		$this->_extra_where_sql = "WHERE meta_key LIKE 'billing_info_%'";
 		parent::__construct();
 	}
-	protected function _migrate_old_row( $old_row ) {
+	protected function _migrate_old_row($old_row) {
 		$new_billing_info = array();
-		$old_billing_info = maybe_unserialize( $old_row[ 'meta_value' ] );
-		$gateway_name = str_replace( "billing_info_",'',$old_row[ 'meta_key' ] );
+		$old_billing_info = maybe_unserialize($old_row['meta_value']);
+		$gateway_name = str_replace("billing_info_", '', $old_row['meta_key']);
 		$repetitive_prefix = '_reg-page-billing-';
-		$repetitive_suffix = "-" . $gateway_name;
-		foreach( $old_billing_info as $old_input_name => $input_value ){
-			$old_input_name_important_part = str_replace( array( $repetitive_prefix, $repetitive_suffix ), array( '', ''), $old_input_name );
+		$repetitive_suffix = "-".$gateway_name;
+		foreach ($old_billing_info as $old_input_name => $input_value) {
+			$old_input_name_important_part = str_replace(array($repetitive_prefix, $repetitive_suffix), array('', ''), $old_input_name);
 
-			switch( $old_input_name_important_part ){
+			switch ($old_input_name_important_part) {
 				case 'fname':
 					$new_input_name = 'first_name';
 					break;
@@ -39,7 +39,7 @@ 
 				case 'state':
 					//we used to store the state's id ,but now we just store the name
 					$new_input_name = $old_input_name_important_part;
-					$input_value = $this->_get_state_name_by_ID( $input_value );
+					$input_value = $this->_get_state_name_by_ID($input_value);
 					break;
 				case 'card-nmbr':
 					$new_input_name = 'credit_card';
@@ -62,9 +62,9 @@ 
 					$new_input_name = $old_input_name_important_part;
 
 			}
-			$new_billing_info[ $new_input_name ] = $input_value;
+			$new_billing_info[$new_input_name] = $input_value;
 		}
-		update_post_meta( $old_row[ 'post_id' ], $old_row[ 'meta_key' ], $new_billing_info );
+		update_post_meta($old_row['post_id'], $old_row['meta_key'], $new_billing_info);
 	}
 	/**
 	 *
@@ -72,9 +72,9 @@ 
 	 * @param int $id
 	 * @return string
 	 */
-	protected function _get_state_name_by_ID( $id ){
+	protected function _get_state_name_by_ID($id) {
 		global $wpdb;
-		return $wpdb->get_var( $wpdb->prepare( "SELECT STA_name FROM " . $wpdb->prefix . "esp_state WHERE STA_ID = %d", $id ) );
+		return $wpdb->get_var($wpdb->prepare("SELECT STA_name FROM ".$wpdb->prefix."esp_state WHERE STA_ID = %d", $id));
 	}
 
 

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

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -13,7 +13,7 @@ 
  * @author				Brent Christensen
  *
  */
-class EE_DMS_4_6_0_country_system_question extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_6_0_country_system_question extends EE_Data_Migration_Script_Stage_Table {
 
 
 
@@ -24,7 +24,7 @@ 
 	 */
 	public function __construct() {
 		global $wpdb;
-		$this->_pretty_name = __( 'Country - System Question', 'event_espresso' );
+		$this->_pretty_name = __('Country - System Question', 'event_espresso');
 		$this->_old_table = $wpdb->prefix.'esp_question';
 		$this->_extra_where_sql = "WHERE QST_system = 'country'";
 		parent::__construct();
@@ -37,21 +37,21 @@ 
 	 * @param array $question an associative array where keys are column names and values are their values.
 	 * @return null
 	 */
-	protected function _migrate_old_row( $question ) {
-		if ( $question['QST_ID'] && $question['QST_system'] == 'country' ) {
+	protected function _migrate_old_row($question) {
+		if ($question['QST_ID'] && $question['QST_system'] == 'country') {
 			global $wpdb;
 			$success = $wpdb->update(
 				$this->_old_table,
-				array( 'QST_type' => 'COUNTRY' ),  // data
-				array( 'QST_ID' => $question['QST_ID'] ),  // where
-				array( '%s' ),   // data format
-				array( '%d' )  // where format
+				array('QST_type' => 'COUNTRY'), // data
+				array('QST_ID' => $question['QST_ID']), // where
+				array('%s'), // data format
+				array('%d')  // where format
 			);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error(
 					sprintf(
-						__( 'Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso' ),
-						json_encode( $question['QST_system'] ),
+						__('Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso'),
+						json_encode($question['QST_system']),
 						$question['QST_ID'],
 						$wpdb->last_error
 					)

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

Spacing +71 added lines, -71 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION')) {
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 
@@ -14,7 +14,7 @@ 
  * Migrates 4.1-4.5-style gateway settings (which were stores in EE_Config)
  * to 4.6-style payment methods (which have their database table)
  */
-class EE_DMS_4_6_0_gateways extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_6_0_gateways extends EE_Data_Migration_Script_Stage {
 
 	protected $_new_table_name;
 	protected $_extra_meta_table_name;
@@ -73,11 +73,11 @@ 
 	 */
 	protected function _migration_step($num_items_to_migrate = 50) {
 		$items_actually_migrated = 0;
-		$gateways_to_deal_with = array_slice(EE_Config::instance()->gateway->payment_settings,$this->count_records_migrated(),$num_items_to_migrate);
-		foreach($gateways_to_deal_with as $old_gateway_slug => $old_gateway_settings){
+		$gateways_to_deal_with = array_slice(EE_Config::instance()->gateway->payment_settings, $this->count_records_migrated(), $num_items_to_migrate);
+		foreach ($gateways_to_deal_with as $old_gateway_slug => $old_gateway_settings) {
 
-			if( in_array( $old_gateway_slug, $this->_gateway_we_know_to_migrate ) ) {
-				if( ! $old_gateway_settings){
+			if (in_array($old_gateway_slug, $this->_gateway_we_know_to_migrate)) {
+				if ( ! $old_gateway_settings) {
 					//no settings existed for this gateway anyways... weird...
 					$items_actually_migrated++;
 					continue;
@@ -86,16 +86,16 @@ 
 				$success = $this->_convert_gateway_settings(
 						$old_gateway_slug,
 						$old_gateway_settings,
-						isset( EE_Config::instance()->gateway->active_gateways[ $old_gateway_slug ] ) );
-				if( $success ) {
-					EE_Config::instance()->gateway->payment_settings[ $old_gateway_slug ] = 'Deprecated';
+						isset(EE_Config::instance()->gateway->active_gateways[$old_gateway_slug]) );
+				if ($success) {
+					EE_Config::instance()->gateway->payment_settings[$old_gateway_slug] = 'Deprecated';
 				}
 			}
 			$items_actually_migrated++;
 		}
 
-		EE_Config::instance()->update_espresso_config(false,false);
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
+		EE_Config::instance()->update_espresso_config(false, false);
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
 			$this->set_completed();
 		}
 		return $items_actually_migrated;
@@ -108,22 +108,22 @@ 
 	 * @param boolean $active indicates the gateway is currently active
 	 * @return boolean success
 	 */
-	protected function _convert_gateway_settings($old_gateway_slug,$old_gateway_settings,$active){
-		switch($old_gateway_slug){
+	protected function _convert_gateway_settings($old_gateway_slug, $old_gateway_settings, $active) {
+		switch ($old_gateway_slug) {
 			case 'Aim':
 				$extra_meta_key_values = array(
 					'login_id'=>$old_gateway_settings['authnet_aim_login_id'],
 					'transaction_key'=>$old_gateway_settings['authnet_aim_transaction_key'],
 					'test_transactions'=>$old_gateway_settings['test_transactions']
 				);
-				$desc = __( 'Please provide the following billing information.', 'event_espresso' );
+				$desc = __('Please provide the following billing information.', 'event_espresso');
 				break;
 			case 'Bank':
 				$extra_meta_key_values = array(
 					'page_title'=>$old_gateway_settings['page_title'],
 					'payment_instructions'=>
-					sprintf( __('%1$s<br/>Name on Bank Account: %2$s<br/>Bank Account Number: %3$s<br/>Bank Name: %4$s<br/>Bank Address:%5$s', 'event_espresso'), $old_gateway_settings['bank_instructions'] , $old_gateway_settings['account_name'], $old_gateway_settings['account_number'], $old_gateway_settings['bank_name'], $old_gateway_settings['bank_address'] ) );
-				$desc = __( 'Make payment using an electronic funds transfer from your bank.', 'event_espresso' );
+					sprintf(__('%1$s<br/>Name on Bank Account: %2$s<br/>Bank Account Number: %3$s<br/>Bank Name: %4$s<br/>Bank Address:%5$s', 'event_espresso'), $old_gateway_settings['bank_instructions'], $old_gateway_settings['account_name'], $old_gateway_settings['account_number'], $old_gateway_settings['bank_name'], $old_gateway_settings['bank_address']) );
+				$desc = __('Make payment using an electronic funds transfer from your bank.', 'event_espresso');
 				break;
 			case 'Check':
 				$extra_meta_key_values = array(
@@ -131,7 +131,7 @@ 
 					'payment_instructions'=>$old_gateway_settings['check_instructions'],
 					'address_to_send_payment'=>$old_gateway_settings['payment_address']
 				);
-				$desc = __( 'On the next page you will be given instructions on how to make a payment by check.', 'event_espresso' );
+				$desc = __('On the next page you will be given instructions on how to make a payment by check.', 'event_espresso');
 				break;
 			case 'Invoice':
 				$extra_meta_key_values = array(
@@ -139,23 +139,23 @@ 
 					'pdf_payee_email' => $old_gateway_settings['template_invoice_email'],
 					'pdf_payee_tax_number' => $old_gateway_settings['template_invoice_tax_number'],
 					'pdf_payee_address' => $old_gateway_settings['template_invoice_address'],
-					'pdf_instructions' => $old_gateway_settings[ 'template_payment_instructions' ],
-					'pdf_logo_image' => $old_gateway_settings[ 'invoice_logo_url' ],
-					'page_confirmation_text' => isset( $old_gateway_settings[ 'page_instructions' ] ) ? $old_gateway_settings[ 'page_instructions' ] : '',
-					'page_extra_info' => isset( $old_gateway_settings[ 'payment_address' ] ) ? $old_gateway_settings[ 'payment_address' ] : '',
+					'pdf_instructions' => $old_gateway_settings['template_payment_instructions'],
+					'pdf_logo_image' => $old_gateway_settings['invoice_logo_url'],
+					'page_confirmation_text' => isset($old_gateway_settings['page_instructions']) ? $old_gateway_settings['page_instructions'] : '',
+					'page_extra_info' => isset($old_gateway_settings['payment_address']) ? $old_gateway_settings['payment_address'] : '',
 					'legacy_invoice_css' => $old_gateway_settings['invoice_css']
 				);
 				//if they didnt want the invoiec gateway to show, pretend it was inactive
-				if( ! $old_gateway_settings['show'] ){
+				if ( ! $old_gateway_settings['show']) {
 					$active = FALSE;
 				}
-				$desc = __( 'On the next page you will be able to access your invoice and instructions on how to pay it.', 'event_espresso' );
+				$desc = __('On the next page you will be able to access your invoice and instructions on how to pay it.', 'event_espresso');
 				break;
 			case 'Mijireh':
 				$extra_meta_key_values = array(
-					'access_key' => $old_gateway_settings[ 'access_key' ]
+					'access_key' => $old_gateway_settings['access_key']
 				);
-				$desc =  __( 'On the next page you will be able to enter your billing information to make the payment.', 'event_espresso' );
+				$desc = __('On the next page you will be able to enter your billing information to make the payment.', 'event_espresso');
 				break;
 			case 'Paypal_Pro':
 				$extra_meta_key_values = array(
@@ -164,31 +164,31 @@ 
 					'signature'=>$old_gateway_settings['signature'],
 					'credit_card_types'=>$old_gateway_settings['credit_cards'],
 				);
-				$desc = __( 'Please provide the following billing information.', 'event_espresso' );
+				$desc = __('Please provide the following billing information.', 'event_espresso');
 				break;
 			case 'Paypal_Standard':
 				$extra_meta_key_values = array(
-					'paypal_id' => $old_gateway_settings[ 'paypal_id' ],
-					'image_url' => $old_gateway_settings[ 'image_url' ],
-					'shipping_details' => isset( $old_gateway_settings[ 'no_shipping' ] ) ? $old_gateway_settings[ 'no_shipping' ] : false,
+					'paypal_id' => $old_gateway_settings['paypal_id'],
+					'image_url' => $old_gateway_settings['image_url'],
+					'shipping_details' => isset($old_gateway_settings['no_shipping']) ? $old_gateway_settings['no_shipping'] : false,
 
 				);
-				$desc = sprintf( __( 'After clicking \'Finalize Registration\', you will be forwarded to PayPal to make your payment. Make sure you return to this site in order to properly finalize your registration.', 'event_espresso' ), '<strong>','</strong>' );
+				$desc = sprintf(__('After clicking \'Finalize Registration\', you will be forwarded to PayPal to make your payment. Make sure you return to this site in order to properly finalize your registration.', 'event_espresso'), '<strong>', '</strong>');
 				break;
 			default:
 				//if we don't recognize the payment method, just put everything in it into extra meta. At least this way its preserved somewhere
 				$extra_meta_key_values = $old_gateway_settings;
 				$desc = '';
 		}
-		$pretty_name = isset( $old_gateway_settings[ 'display_name' ] ) ? $old_gateway_settings[ 'display_name' ] : $old_gateway_slug;
-		$offline_gateways = array( 'Bank', 'Check', 'Invoice' );
-		if( $active && in_array( $old_gateway_slug, $offline_gateways ) ) {
-			$scope = array( 'CART', 'ADMIN');
-		}elseif( $active && ! in_array( $old_gateway_slug, $offline_gateways ) ) {
-			$scope = array( 'CART' );
-		}elseif( ! $active && in_array($old_gateway_slug,$offline_gateways ) ) {
-			$scope = array( 'ADMIN' );
-		}else{
+		$pretty_name = isset($old_gateway_settings['display_name']) ? $old_gateway_settings['display_name'] : $old_gateway_slug;
+		$offline_gateways = array('Bank', 'Check', 'Invoice');
+		if ($active && in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array('CART', 'ADMIN');
+		}elseif ($active && ! in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array('CART');
+		}elseif ( ! $active && in_array($old_gateway_slug, $offline_gateways)) {
+			$scope = array('ADMIN');
+		} else {
 			$scope = array();
 		}
 		$payment_method_col_values = array(
@@ -196,25 +196,25 @@ 
 			'PMD_name' => $pretty_name,
 			'PMD_desc' => $desc,
 			'PMD_admin_name' => $pretty_name,
-			'PMD_slug' => sanitize_key( $old_gateway_slug ),
-			'PMD_debug_mode' => isset( $old_gateway_settings[ 'use_sandbox' ] ) ? $old_gateway_settings['use_sandbox'] : FALSE,
-			'PMD_button_url' => isset( $old_gateway_settings[ 'button_url' ] ) ? $old_gateway_settings[ 'button_url' ] : NULL,
-			'PMD_scope' =>  serialize( $scope )
+			'PMD_slug' => sanitize_key($old_gateway_slug),
+			'PMD_debug_mode' => isset($old_gateway_settings['use_sandbox']) ? $old_gateway_settings['use_sandbox'] : FALSE,
+			'PMD_button_url' => isset($old_gateway_settings['button_url']) ? $old_gateway_settings['button_url'] : NULL,
+			'PMD_scope' =>  serialize($scope)
 		);
 		$db_types = array(
-			'%s',//PMD_type
-			'%s',//PMD_name
-			'%s',//PMD_desc
-			'%s',//PMD_admin_name
-			'%s',//PMD_slug
-			'%d',//PMD_debug_mode
-			'%s',//PMD_button_url
-			'%s',//PMD_scope
+			'%s', //PMD_type
+			'%s', //PMD_name
+			'%s', //PMD_desc
+			'%s', //PMD_admin_name
+			'%s', //PMD_slug
+			'%d', //PMD_debug_mode
+			'%s', //PMD_button_url
+			'%s', //PMD_scope
 		);
 		global $wpdb;
 		//first: check if it already exists
-		$id = $wpdb->get_var( $wpdb->prepare( "SELECT PMD_ID FROM {$this->_new_table_name} WHERE PMD_slug=%s", $payment_method_col_values[ 'PMD_slug' ] ) );
-		if( $id ){
+		$id = $wpdb->get_var($wpdb->prepare("SELECT PMD_ID FROM {$this->_new_table_name} WHERE PMD_slug=%s", $payment_method_col_values['PMD_slug']));
+		if ($id) {
 			//just update that payment method instead of creating a new one
 			$success = $wpdb->update(
 					$this->_new_table_name,
@@ -224,27 +224,27 @@ 
 					),
 					$db_types,
 					array(
-						'%d',//PMD_ID
+						'%d', //PMD_ID
 					));
-			if( ! $success ){
-				$this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"),$id,json_encode($payment_method_col_values),$wpdb->last_error));
+			if ( ! $success) {
+				$this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"), $id, json_encode($payment_method_col_values), $wpdb->last_error));
 			}
-		}else{
+		} else {
 			$success = $wpdb->insert(
 					$this->_new_table_name,
 					$payment_method_col_values,
 					$db_types);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error($wpdb->last_error);
 				return false;
-			}else{
+			} else {
 				$id = $wpdb->insert_id;
 			}
 		}
 
-		if( $id ){
-			$this->_convert_extra_meta_values( $id, $extra_meta_key_values );
-			$this->get_migration_script()->set_mapping( 'EE_Gateway_Config', $old_gateway_slug, $this->_new_table_name, $id );
+		if ($id) {
+			$this->_convert_extra_meta_values($id, $extra_meta_key_values);
+			$this->get_migration_script()->set_mapping('EE_Gateway_Config', $old_gateway_slug, $this->_new_table_name, $id);
 			return true;
 		}
 		return false;
@@ -258,26 +258,26 @@ 
 	 * @param int $id
 	 * @param array $extra_meta_key_values
 	 */
-	private function _convert_extra_meta_values($id,$extra_meta_key_values){
+	private function _convert_extra_meta_values($id, $extra_meta_key_values) {
 		global $wpdb;
-		foreach( $extra_meta_key_values as $key => $value ){
+		foreach ($extra_meta_key_values as $key => $value) {
 			$exm_args = array(
 				'OBJ_ID'=>$id,
 				'EXM_type'=>'Payment_Method',
 				'EXM_key'=>$key,
-				'EXM_value'=> maybe_serialize($value )
+				'EXM_value'=> maybe_serialize($value)
 			);
 			$success = $wpdb->insert(
 					$this->_extra_meta_table_name,
 					$exm_args,
 					array(
-						'%d',//OBJ_ID
-						'%s',//EXM_type
-						'%s',//EXM_key
-						'%s',//EXM_value
+						'%d', //OBJ_ID
+						'%s', //EXM_type
+						'%s', //EXM_key
+						'%s', //EXM_value
 					));
-			if( ! $success ){
-				$this->add_error(sprintf(__('Could not insert extra meta key with values %s. %s', "event_espresso"),json_encode($exm_args),$wpdb->last_error));
+			if ( ! $success) {
+				$this->add_error(sprintf(__('Could not insert extra meta key with values %s. %s', "event_espresso"), json_encode($exm_args), $wpdb->last_error));
 			}
 		}
 	}

Braces +5 added lines, -5 removed lines

@@ -184,11 +184,11 @@ 
 		$offline_gateways = array( 'Bank', 'Check', 'Invoice' );
 		if( $active && in_array( $old_gateway_slug, $offline_gateways ) ) {
 			$scope = array( 'CART', 'ADMIN');
-		}elseif( $active && ! in_array( $old_gateway_slug, $offline_gateways ) ) {
+		} elseif( $active && ! in_array( $old_gateway_slug, $offline_gateways ) ) {
 			$scope = array( 'CART' );
-		}elseif( ! $active && in_array($old_gateway_slug,$offline_gateways ) ) {
+		} elseif( ! $active && in_array($old_gateway_slug,$offline_gateways ) ) {
 			$scope = array( 'ADMIN' );
-		}else{
+		} else{
 			$scope = array();
 		}
 		$payment_method_col_values = array(
@@ -229,7 +229,7 @@ 
 			if( ! $success ){
 				$this->add_error(sprintf(__('Could not update payment method %d with properties %s because %s', "event_espresso"),$id,json_encode($payment_method_col_values),$wpdb->last_error));
 			}
-		}else{
+		} else{
 			$success = $wpdb->insert(
 					$this->_new_table_name,
 					$payment_method_col_values,
@@ -237,7 +237,7 @@ 
 			if ( ! $success ) {
 				$this->add_error($wpdb->last_error);
 				return false;
-			}else{
+			} else{
 				$id = $wpdb->insert_id;
 			}
 		}

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

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
 	 */
 	public function __construct() {
 		global $wpdb;
-		$this->_pretty_name = __( 'Question Types', 'event_espresso' );
+		$this->_pretty_name = __('Question Types', 'event_espresso');
 		$this->_old_table = $wpdb->prefix.'esp_question';
 		$this->_question_type_conversions = array(
 			'MULTIPLE' 			=> 'CHECKBOX',
@@ -35,8 +35,8 @@ 
 		//when fetching rows, because we automatically use a limit and offset
 		//rows counted before migrating any rows, need to ALSO be counted after a bunch of rows were counted
 		//so we need to include both the migrated rows as well as the non-migrated rows
-		$QST_types_to_count = array_merge( array_keys( $this->_question_type_conversions ), $this->_question_type_conversions );
-		$this->_extra_where_sql = "WHERE QST_type IN ('" . implode( "', '", $QST_types_to_count ) . "')" ;
+		$QST_types_to_count = array_merge(array_keys($this->_question_type_conversions), $this->_question_type_conversions);
+		$this->_extra_where_sql = "WHERE QST_type IN ('".implode("', '", $QST_types_to_count)."')";
 		parent::__construct();
 	}
 
@@ -44,21 +44,21 @@ 
 	 * @param array $question an associative array where keys are column names and values are their values.
 	 * @return null
 	 */
-	protected function _migrate_old_row( $question ) {
+	protected function _migrate_old_row($question) {
 		global $wpdb;
-		if ( $question['QST_ID'] && isset( $this->_question_type_conversions[ $question['QST_type'] ] )) {
+		if ($question['QST_ID'] && isset($this->_question_type_conversions[$question['QST_type']])) {
 			$success = $wpdb->update(
 				$this->_old_table,
-				array( 'QST_type' => $this->_question_type_conversions[ $question['QST_type'] ] ), 	// data
-				array( 'QST_ID' => $question['QST_ID'] ),  // where
-				array( '%s' ),   // data format
-				array( '%d' )  // where format
+				array('QST_type' => $this->_question_type_conversions[$question['QST_type']]), // data
+				array('QST_ID' => $question['QST_ID']), // where
+				array('%s'), // data format
+				array('%d')  // where format
 			);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error(
 					sprintf(
-						__( 'Could not update question type %1$s for question ID=%2$d because "%3$s"', 'event_espresso' ),
-						json_encode( $question['QST_type'] ),
+						__('Could not update question type %1$s for question ID=%2$d because "%3$s"', 'event_espresso'),
+						json_encode($question['QST_type']),
 						$question['QST_ID'],
 						$wpdb->last_error
 					)