eventespresso / event-espresso-core

admin_pages/messages/templates/ee_msg_message_type_help_tab.template.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <h2><?php esc_html_e('What are Message Types?', 'event_espresso'); ?></h2>
-<p><?php printf( esc_html__('Message Types are the %1$skinds%2$s of messages that get delivered.  Think of them as the "type" of package that is being delivered by the messenger.  For example, Event Espresso comes with two Message Types attached to the Email messenger:  Registration Confirmation (which is triggered by frontend event registrations), and Payment Confirmation (which is triggered by frontend payments).', 'event_espresso'), '<em>', '</em>'); ?></p>
+<p><?php printf(esc_html__('Message Types are the %1$skinds%2$s of messages that get delivered.  Think of them as the "type" of package that is being delivered by the messenger.  For example, Event Espresso comes with two Message Types attached to the Email messenger:  Registration Confirmation (which is triggered by frontend event registrations), and Payment Confirmation (which is triggered by frontend payments).', 'event_espresso'), '<em>', '</em>'); ?></p>
 <p><?php esc_html_e('Future iterations of Event Espresso 4.0 (premium versions), will include more and more different message types that can be attached to the various messengers that are available', 'event_espresso'); ?></p>
 
 <h3><?php esc_html_e('Contexts', 'event_espresso'); ?></h3>
-<p><?php printf( esc_html__('Each message type (or %1$skind%1$s of message remember!) has different contexts for messages created for that message type. Contexts are dynamic but generally speaking they tend to represent recipients. So for example, Registration Confirmation message type has three types of recipients for every time a registration confirmation is triggered: Event Administrator, Primary Registrant, and Registrant (which may be multiple messages if there are more than one attendee per event). Whereas the Payment Message Type only has two recipients (Event Administrator, Primary Registrant [the one making the payment]).', 'event_espresso' ), '<em>', '</em>'); ?></p>
+<p><?php printf(esc_html__('Each message type (or %1$skind%1$s of message remember!) has different contexts for messages created for that message type. Contexts are dynamic but generally speaking they tend to represent recipients. So for example, Registration Confirmation message type has three types of recipients for every time a registration confirmation is triggered: Event Administrator, Primary Registrant, and Registrant (which may be multiple messages if there are more than one attendee per event). Whereas the Payment Message Type only has two recipients (Event Administrator, Primary Registrant [the one making the payment]).', 'event_espresso'), '<em>', '</em>'); ?></p>
 <p><?php esc_html_e('You will most likely never see the word "context" in any of the Messages system labelling because they are dynamic per message type.  Usually, contexts will be labelled "Recipients" but there may be cases down the road where a message type might use contexts to represent something totally different', 'event_espresso'); ?></p>
\ No newline at end of file

core/data_migration_scripts/4_6_0_stages/EE_DMS_4_6_0_state_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_state_system_question extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_6_0_state_system_question extends EE_Data_Migration_Script_Stage_Table {
 
 
 
@@ -24,7 +24,7 @@ 
 	 */
 	public function __construct() {
 		global $wpdb;
-		$this->_pretty_name = __( 'State - System Question', 'event_espresso' );
+		$this->_pretty_name = __('State - System Question', 'event_espresso');
 		$this->_old_table = $wpdb->prefix.'esp_question';
 		$this->_extra_where_sql = "WHERE QST_system = 'state'";
 		parent::__construct();
@@ -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'] == 'state' ) {
+	protected function _migrate_old_row($question) {
+		if ($question['QST_ID'] && $question['QST_system'] == 'state') {
 			global $wpdb;
 			$success = $wpdb->update(
 				$this->_old_table,
-				array( 'QST_type' => 'STATE' ),  // data
-				array( 'QST_ID' => $question['QST_ID'] ),  // where
-				array( '%s' ),   // data format
-				array( '%d' )  // where format
+				array('QST_type' => 'STATE'), // data
+				array('QST_ID' => $question['QST_ID']), // where
+				array('%s'), // data format
+				array('%d')  // where format
 			);
-			if ( ! $success ) {
+			if ( ! $success) {
 				$this->add_error(
 					sprintf(
-						__( 'Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso' ),
-						wp_json_encode( $question['QST_system'] ),
+						__('Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso'),
+						wp_json_encode($question['QST_system']),
 						$question['QST_ID'],
 						$wpdb->last_error
 					)

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' ),
-						wp_json_encode( $question['QST_type'] ),
+						__('Could not update question type %1$s for question ID=%2$d because "%3$s"', 'event_espresso'),
+						wp_json_encode($question['QST_type']),
 						$question['QST_ID'],
 						$wpdb->last_error
 					)

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' ),
-						wp_json_encode( $question['QST_system'] ),
+						__('Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso'),
+						wp_json_encode($question['QST_system']),
 						$question['QST_ID'],
 						$wpdb->last_error
 					)

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,wp_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, wp_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"),wp_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"), wp_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,wp_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_9_0_stages/EE_DMS_4_9_0_Email_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_9_0_Email_System_Question extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_9_0_Email_System_Question extends EE_Data_Migration_Script_Stage_Table {
 
 
 
@@ -24,7 +24,7 @@ 
 	 */
 	public function __construct() {
 		global $wpdb;
-		$this->_pretty_name = __( 'Email - System Question', 'event_espresso' );
+		$this->_pretty_name = __('Email - System Question', 'event_espresso');
 		$this->_old_table = $wpdb->prefix.'esp_question';
 		$this->_extra_where_sql = "WHERE QST_system = 'email'";
 		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'] == 'email' ) {
+	protected function _migrate_old_row($question) {
+		if ($question['QST_ID'] && $question['QST_system'] == 'email') {
 			global $wpdb;
 			$success = $wpdb->update(
 				$this->_old_table,
-				array( 'QST_type' => 'EMAIL' ),  // data
-				array( 'QST_ID' => $question['QST_ID'] ),  // where
-				array( '%s' ),   // data format
-				array( '%d' )  // where format
+				array('QST_type' => 'EMAIL'), // 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' ),
-						wp_json_encode( $question['QST_system'] ),
+						__('Could not update question system name "%1$s" for question ID=%2$d because "%3$s"', 'event_espresso'),
+						wp_json_encode($question['QST_system']),
 						$question['QST_ID'],
 						$wpdb->last_error
 					)

admin_pages/events/templates/event_publish_box_extras.template.php

Spacing +7 added lines, -7 removed lines

@@ -1,22 +1,22 @@ 
 
 <div class="misc-pub-section">
 	<span class="dashicons dashicons-groups ee-icon-color-ee-green ee-icon-size-20"></span>
-	<a href="<?php echo $view_approved_reg_url;?>">
-		<?php printf( __('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence') ); ?>
+	<a href="<?php echo $view_approved_reg_url; ?>">
+		<?php printf(__('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_approved, FALSE, 'sentence')); ?>
 	</a>:
 	<?php echo $approved_regs; ?>
 </div>
 <div class="misc-pub-section">
 	<span class="dashicons dashicons-groups ee-icon-color-ee-blue ee-icon-size-20"></span>
-	<a href="<?php echo $view_pending_payment_reg_url;?>">
-		<?php printf( __('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence') ); ?>
+	<a href="<?php echo $view_pending_payment_reg_url; ?>">
+		<?php printf(__('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, FALSE, 'sentence')); ?>
 	</a>:
 	<?php echo $pending_payment_regs; ?>
 </div>
 <div class="misc-pub-section">
 	<span class="dashicons dashicons-groups ee-icon-color-ee-orange ee-icon-size-20"></span>
-	<a href="<?php echo $view_not_approved_reg_url;?>">
-		<?php printf( __('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence') ); ?>
+	<a href="<?php echo $view_not_approved_reg_url; ?>">
+		<?php printf(__('%s Registrations', 'event_espresso'), EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, FALSE, 'sentence')); ?>
 	</a>:
 	<?php echo $not_approved_regs; ?>
 </div>
@@ -29,5 +29,5 @@ 
 	</a>
 </div> /**/ ?>
 
-<?php echo $event_editor_overview_add;?>
+<?php echo $event_editor_overview_add; ?>
 <br/>

admin_pages/transactions/templates/txn_admin_details_side_meta_box_registrant.template.php

Indentation +9 added lines, -9 removed lines

@@ -17,7 +17,7 @@ 
 <?php else : ?>
     <p class="clearfix">
         <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Name',
-                    'event_espresso'); ?></span><?php echo $prime_reg_fname . ' ' . $prime_reg_lname; ?>
+					'event_espresso'); ?></span><?php echo $prime_reg_fname . ' ' . $prime_reg_lname; ?>
     </p>
     <p class="clearfix">
         <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Email', 'event_espresso'); ?></span><a
@@ -25,7 +25,7 @@ 
     </p>
     <p class="clearfix">
         <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Phone #',
-                    'event_espresso'); ?></span><?php echo $prime_reg_phone; ?>
+					'event_espresso'); ?></span><?php echo $prime_reg_phone; ?>
     </p>
     <p class="clearfix">
         <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Address', 'event_espresso'); ?></span>
@@ -36,13 +36,13 @@ 
     </div> <!-- end #admin-side-mbox-primary-registrant-dv -->
 
     <?php
-    /** only show if logged in user has access */
-    if ( EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_contact',
-            'view_or_edit_contact_button',
-            $ATT_ID
-    )
-    ) : ?>
+	/** only show if logged in user has access */
+	if ( EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_contact',
+			'view_or_edit_contact_button',
+			$ATT_ID
+	)
+	) : ?>
     <p style="text-align:right;">
         <a class="button button-small" href="<?php echo $edit_attendee_url; ?>"
            title="<?php esc_attr_e('View details for this contact.', 'event_espresso'); ?>">

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 <?php else : ?>
     <p class="clearfix">
         <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Name',
-                    'event_espresso'); ?></span><?php echo $prime_reg_fname . ' ' . $prime_reg_lname; ?>
+                    'event_espresso'); ?></span><?php echo $prime_reg_fname.' '.$prime_reg_lname; ?>
     </p>
     <p class="clearfix">
         <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Email', 'event_espresso'); ?></span><a
@@ -37,7 +37,7 @@ 
 
     <?php
     /** only show if logged in user has access */
-    if ( EE_Registry::instance()->CAP->current_user_can(
+    if (EE_Registry::instance()->CAP->current_user_can(
             'ee_edit_contact',
             'view_or_edit_contact_button',
             $ATT_ID
@@ -50,4 +50,4 @@ 
         </a>
     </p>
     <?php endif; ?>
-<?php endif;  //end no attendee check?>
+<?php endif; //end no attendee check?>

Braces +5 added lines, -2 removed lines

@@ -14,10 +14,13 @@
         <?php echo $no_attendee_message; ?>
     </p>
 </div> <!-- end #admin-side-mbox-primary-registrant-dv -->
-<?php else : ?>
+<?php else {
+	: ?>
     <p class="clearfix">
         <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Name',
-                    'event_espresso'); ?></span><?php echo $prime_reg_fname . ' ' . $prime_reg_lname; ?>
+                    'event_espresso');
+}
+?></span><?php echo $prime_reg_fname . ' ' . $prime_reg_lname; ?>
     </p>
     <p class="clearfix">
         <span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php _e('Email', 'event_espresso'); ?></span><a

public/Espresso_Arabica_2014/content-espresso_events-datetimes.php

Spacing +4 added lines, -4 removed lines

@@ -1,15 +1,15 @@
 <?php
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
 
-if ( is_single() || ( is_archive() && espresso_display_datetimes_in_event_list() ) ) :
+if (is_single() || (is_archive() && espresso_display_datetimes_in_event_list())) :
 global $post;
-do_action( 'AHEE_event_details_before_event_date', $post );
+do_action('AHEE_event_details_before_event_date', $post);
 ?>
 	<div class="event-datetimes">
-		<?php espresso_list_of_event_dates( $post->ID );?>
+		<?php espresso_list_of_event_dates($post->ID); ?>
 	</div>
 	<!-- .event-datetimes -->
 <?php
-do_action( 'AHEE_event_details_after_event_date', $post );
+do_action('AHEE_event_details_after_event_date', $post);
 endif;
 ?>
\ No newline at end of file