eventespresso / event-espresso-core

core/business/EE_Transaction_Payments.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
 	 * @param EE_Transaction $transaction
 	 * @param string         $payment_status One of EEM_Payment's statuses, like 'PAP' (Approved).
 	 *                                       By default, searches for approved payments
-	 * @return float|false   float on success, false on fail
+	 * @return double   float on success, false on fail
 	 * @throws \EE_Error
 	 */
 	public function recalculate_total_payments_for_transaction( EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved ) {

Spacing +47 added lines, -47 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 
 /**
  * Class EE_Transaction_Payments
@@ -42,7 +42,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Transaction_Payments ) {
+		if ( ! self::$_instance instanceof EE_Transaction_Payments) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -59,18 +59,18 @@ 
 	 * @return bool true if TXN total was updated, false if not
 	 * @throws \EE_Error
 	 */
-	public function recalculate_transaction_total( EE_Transaction $transaction, $update_txn = true ) {
+	public function recalculate_transaction_total(EE_Transaction $transaction, $update_txn = true) {
 		$total_line_item = $transaction->total_line_item();
-		if ( ! $total_line_item instanceof EE_Line_Item ) {
+		if ( ! $total_line_item instanceof EE_Line_Item) {
 			EE_Error::add_error(
-				sprintf( __( 'The Total Line Item for Transaction %1$d\'s was not found or is invalid.', 'event_espresso' ), $transaction->ID() ),
+				sprintf(__('The Total Line Item for Transaction %1$d\'s was not found or is invalid.', 'event_espresso'), $transaction->ID()),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 			return false;
 		}
 		$new_total = $total_line_item->recalculate_total_including_taxes();
-		$transaction->set_total( $new_total );
-		if ( $update_txn ) {
+		$transaction->set_total($new_total);
+		if ($update_txn) {
 			return $transaction->save() ? true : false;
 		}
 		return false;
@@ -93,20 +93,20 @@ 
 	 * @return    boolean        whether the TXN was saved
 	 * @throws \EE_Error
 	 */
-	public function calculate_total_payments_and_update_status( EE_Transaction $transaction, $update_txn = true ){
+	public function calculate_total_payments_and_update_status(EE_Transaction $transaction, $update_txn = true) {
 		// verify transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
-			EE_Error::add_error( __( 'Please provide a valid EE_Transaction object.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $transaction instanceof EE_Transaction) {
+			EE_Error::add_error(__('Please provide a valid EE_Transaction object.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// calculate total paid
-		$total_paid = $this->recalculate_total_payments_for_transaction( $transaction );
+		$total_paid = $this->recalculate_total_payments_for_transaction($transaction);
 		// if total paid has changed
-		if ( $total_paid !== false && (float)$total_paid !== $transaction->paid() ) {
-			$transaction->set_paid( $total_paid );
+		if ($total_paid !== false && (float) $total_paid !== $transaction->paid()) {
+			$transaction->set_paid($total_paid);
 			// maybe update status, and make sure to save transaction if not done already
-			if ( ! $transaction->update_status_based_on_total_paid( $update_txn ) ) {
-				if ( $update_txn ) {
+			if ( ! $transaction->update_status_based_on_total_paid($update_txn)) {
+				if ($update_txn) {
 					return $transaction->save() ? true : false;
 				}
 			} else {
@@ -130,18 +130,18 @@ 
 	 * @return float|false   float on success, false on fail
 	 * @throws \EE_Error
 	 */
-	public function recalculate_total_payments_for_transaction( EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved ) {
+	public function recalculate_total_payments_for_transaction(EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved) {
 		// verify transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
-			EE_Error::add_error( __( 'Please provide a valid EE_Transaction object.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $transaction instanceof EE_Transaction) {
+			EE_Error::add_error(__('Please provide a valid EE_Transaction object.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// ensure Payment model is loaded
-		EE_Registry::instance()->load_model( 'Payment' );
+		EE_Registry::instance()->load_model('Payment');
 		// calls EEM_Base::sum()
 		return EEM_Payment::instance()->sum(
 			// query params
-			array( array( 'TXN_ID' => $transaction->ID(), 'STS_ID' => $payment_status )),
+			array(array('TXN_ID' => $transaction->ID(), 'STS_ID' => $payment_status)),
 			// field to sum
 			'PAY_amount'
 		);
@@ -159,17 +159,17 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function delete_payment_and_update_transaction( EE_Payment $payment ) {
+	public function delete_payment_and_update_transaction(EE_Payment $payment) {
 		// verify payment
-		if ( ! $payment instanceof EE_Payment ) {
-			EE_Error::add_error( __( 'A valid Payment object was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $payment instanceof EE_Payment) {
+			EE_Error::add_error(__('A valid Payment object was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( ! $this->delete_registration_payments_and_update_registrations( $payment ) ) {
+		if ( ! $this->delete_registration_payments_and_update_registrations($payment)) {
 			return false;
 		}
-		if ( ! $payment->delete() ) {
-			EE_Error::add_error( __( 'The payment could not be deleted.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $payment->delete()) {
+			EE_Error::add_error(__('The payment could not be deleted.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
@@ -180,14 +180,14 @@ 
 			|| $TXN_status === EEM_Transaction::failed_status_code
 			|| $payment->amount() === 0
 		) {
-			EE_Error::add_success( __( 'The Payment was successfully deleted.', 'event_espresso' ) );
+			EE_Error::add_success(__('The Payment was successfully deleted.', 'event_espresso'));
 			return true;
 		}
 
 
 		//if this fails, that just means that the transaction didn't get its status changed and/or updated.
 		//however the payment was still deleted.
-		if ( ! $this->calculate_total_payments_and_update_status( $transaction ) ) {
+		if ( ! $this->calculate_total_payments_and_update_status($transaction)) {
 
 			EE_Error::add_attention(
 				__(
@@ -221,28 +221,28 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function delete_registration_payments_and_update_registrations( EE_Payment $payment, $reg_payment_query_params = array() ) {
+	public function delete_registration_payments_and_update_registrations(EE_Payment $payment, $reg_payment_query_params = array()) {
 		$save_payment = false;
-		$reg_payment_query_params = ! empty( $reg_payment_query_params ) ? $reg_payment_query_params : array( array( 'PAY_ID' => $payment->ID() ) );
-		$registration_payments = EEM_Registration_Payment::instance()->get_all( $reg_payment_query_params );
-		if ( ! empty( $registration_payments )) {
-			foreach ( $registration_payments as $registration_payment ) {
-				if ( $registration_payment instanceof EE_Registration_Payment ) {
+		$reg_payment_query_params = ! empty($reg_payment_query_params) ? $reg_payment_query_params : array(array('PAY_ID' => $payment->ID()));
+		$registration_payments = EEM_Registration_Payment::instance()->get_all($reg_payment_query_params);
+		if ( ! empty($registration_payments)) {
+			foreach ($registration_payments as $registration_payment) {
+				if ($registration_payment instanceof EE_Registration_Payment) {
 					$amount_paid = $registration_payment->amount();
 					$registration = $registration_payment->registration();
-					if ( $registration instanceof EE_Registration ) {
-						$registration->set_paid( $registration->paid() - $amount_paid );
-						if ( $registration->save() ) {
-							if ( $registration_payment->delete() ) {
-								$registration->_remove_relation_to( $payment, 'Payment' );
-								$payment->_remove_relation_to( $registration, 'Registration' );
+					if ($registration instanceof EE_Registration) {
+						$registration->set_paid($registration->paid() - $amount_paid);
+						if ($registration->save()) {
+							if ($registration_payment->delete()) {
+								$registration->_remove_relation_to($payment, 'Payment');
+								$payment->_remove_relation_to($registration, 'Registration');
 							}
 							$save_payment = true;
 						}
 					} else {
 						EE_Error::add_error(
 							sprintf(
-								__( 'An invalid Registration object was associated with Registration Payment ID# %1$d.', 'event_espresso' ),
+								__('An invalid Registration object was associated with Registration Payment ID# %1$d.', 'event_espresso'),
 								$registration_payment->ID()
 							),
 							__FILE__, __FUNCTION__, __LINE__
@@ -252,7 +252,7 @@ 
 				} else {
 					EE_Error::add_error(
 						sprintf(
-							__( 'An invalid Registration Payment object was associated with payment ID# %1$d.', 'event_espresso' ),
+							__('An invalid Registration Payment object was associated with payment ID# %1$d.', 'event_espresso'),
 							$payment->ID()
 						),
 						__FILE__, __FUNCTION__, __LINE__
@@ -261,7 +261,7 @@ 
 				}
 			}
 		}
-		if ( $save_payment ) {
+		if ($save_payment) {
 			$payment->save();
 		}
 		return true;
@@ -285,7 +285,7 @@ 
 	public function update_transaction_status_based_on_total_paid(EE_Transaction $transaction, $update_txn = true)
 	{
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
+			__CLASS__.'::'.__FUNCTION__,
 			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'),
 				'EE_Transaction::update_status_based_on_total_paid()'),
 			'4.9.1',
@@ -327,7 +327,7 @@ 
 	 * @deprecated 4.9.12
 	 * @param string $old_txn_status
 	 */
-	public function set_old_txn_status( $old_txn_status ) {
+	public function set_old_txn_status($old_txn_status) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -337,7 +337,7 @@ 
 			'4.9.12'
 		);
 		// only set the first time
-		if ( $this->_old_txn_status === null ) {
+		if ($this->_old_txn_status === null) {
 			$this->_old_txn_status = $old_txn_status;
 		}
 	}
@@ -366,7 +366,7 @@ 
 	 * @deprecated 4.9.12
 	 * @param string $new_txn_status
 	 */
-	public function set_new_txn_status( $new_txn_status ) {
+	public function set_new_txn_status($new_txn_status) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(

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

Doc Comments +3 added lines, -3 removed lines

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

Spacing +206 added lines, -206 removed lines

@@ -158,7 +158,7 @@ 
 				'DTT_deleted' => new EE_Trashed_Flag_Field('DTT_deleted', __('Flag indicating datetime is archived', 'event_espresso'), false, false ),
 			));
  */
-class EE_DMS_4_1_0_events extends EE_Data_Migration_Script_Stage{
+class EE_DMS_4_1_0_events extends EE_Data_Migration_Script_Stage {
 	private $_old_table;
 	private $_old_start_end_table;
 	private $_new_table;
@@ -205,43 +205,43 @@ 
 	 * @param int $num_items_to_migrate
 	 * @return int number of items ACTUALLY migrated
 	 */
-	protected function _migration_step( $num_items_to_migrate = 50) {
+	protected function _migration_step($num_items_to_migrate = 50) {
 		global $wpdb;
 		//because the migration of each event can be a LOT more work, make each step smaller
-		$num_items_to_migrate = max(1,$num_items_to_migrate/5);
-		$events = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$this->count_records_migrated(),$num_items_to_migrate),ARRAY_A);
+		$num_items_to_migrate = max(1, $num_items_to_migrate / 5);
+		$events = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $this->count_records_migrated(), $num_items_to_migrate), ARRAY_A);
 		$items_migrated_this_step = 0;
 
-		foreach($events as $event_row){
+		foreach ($events as $event_row) {
 			$guid = null;
 			//insert new 4.1 Attendee object using $wpdb
 			$post_id = $this->_insert_cpt($event_row);
-			if($post_id){
+			if ($post_id) {
 				$this->get_migration_script()->set_mapping($this->_old_table, $event_row['id'], $this->_new_table, $post_id);
 				$meta_id = $this->_insert_event_meta($event_row, $post_id);
-				if($meta_id){
+				if ($meta_id) {
 					$this->get_migration_script()->set_mapping($this->_old_table, $event_row['id'], $this->_new_meta_table, $meta_id);
 				}
-				$this->_convert_start_end_times($event_row,$post_id);
+				$this->_convert_start_end_times($event_row, $post_id);
 				$event_meta = maybe_unserialize($event_row['event_meta']);
 				$guid = isset($event_meta['event_thumbnail_url']) ? $event_meta['event_thumbnail_url'] : null;
-				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid,$post_id,$this);
+				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $post_id, $this);
 
 				//maybe create a venue from info on the event?
 				$new_venue_id = $this->_maybe_create_venue($event_row);
-				if($new_venue_id){
-					$this->_insert_new_venue_to_event($post_id,$new_venue_id);
+				if ($new_venue_id) {
+					$this->_insert_new_venue_to_event($post_id, $new_venue_id);
 				}
 				$this->_add_post_metas($event_row, $post_id);
 			}
 			$items_migrated_this_step++;
-			if($guid){
+			if ($guid) {
 				//if we had to check for an image attachment
 				//then let's call it a day (avoid timing out, because this took a long time)
 				break;
 			}
 		}
-		if($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()){
+		if ($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()) {
 			$this->set_status(EE_Data_Migration_Manager::status_completed);
 		}
 		return $items_migrated_this_step;
@@ -253,28 +253,28 @@ 
 	 * @param int $post_id
 	 * @return void
 	 */
-	private function _add_post_metas($old_event,$post_id){
+	private function _add_post_metas($old_event, $post_id) {
 		$event_meta = maybe_unserialize($old_event['event_meta']);
-		if( ! $event_meta || ! is_array( $event_meta ) ){
+		if ( ! $event_meta || ! is_array($event_meta)) {
 			return;
 		}
-		unset($event_meta['date_submitted']);//factored into CPT
-		unset($event_meta['additional_attendee_reg_info']);//factored into event meta table
-		unset($event_meta['default_payment_status']);//dido
-		unset($event_meta['event_thumbnail_url']);//used to find post featured image
-		foreach($event_meta as $meta_key => $meta_value){
-			if ($meta_key){//if the meta key is just an empty string, ignore it
-				$success = add_post_meta($post_id,$meta_key,$meta_value,true);
-				if( ! $success ){
-					$this->add_error(sprintf(__("Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s", "event_espresso"),$post_id,$meta_key,$meta_value,implode(",",$old_event)));
+		unset($event_meta['date_submitted']); //factored into CPT
+		unset($event_meta['additional_attendee_reg_info']); //factored into event meta table
+		unset($event_meta['default_payment_status']); //dido
+		unset($event_meta['event_thumbnail_url']); //used to find post featured image
+		foreach ($event_meta as $meta_key => $meta_value) {
+			if ($meta_key) {//if the meta key is just an empty string, ignore it
+				$success = add_post_meta($post_id, $meta_key, $meta_value, true);
+				if ( ! $success) {
+					$this->add_error(sprintf(__("Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s", "event_espresso"), $post_id, $meta_key, $meta_value, implode(",", $old_event)));
 				}
 			}
 		}
-		if($old_event['alt_email']){
-			add_post_meta($post_id,'alt_email',$old_event['alt_email']);
+		if ($old_event['alt_email']) {
+			add_post_meta($post_id, 'alt_email', $old_event['alt_email']);
 		}
-		if($old_event['recurrence_id']){
-			add_post_meta($post_id,'recurrence_id',$old_event['recurrence_id']);
+		if ($old_event['recurrence_id']) {
+			add_post_meta($post_id, 'recurrence_id', $old_event['recurrence_id']);
 		}
 	}
 
@@ -289,10 +289,10 @@ 
 	 * @param string $new_post_status a post status
 	 * @return string
 	 */
-	private function _find_unique_slug($event_name, $old_identifier = '', $new_post_status = 'publish'){
+	private function _find_unique_slug($event_name, $old_identifier = '', $new_post_status = 'publish') {
 		$count = 0;
 		$original_name = $event_name ? sanitize_title($event_name) : $old_identifier;
-		return wp_unique_post_slug($original_name, 0, $new_post_status, 'espresso_events', 0 );
+		return wp_unique_post_slug($original_name, 0, $new_post_status, 'espresso_events', 0);
 	}
 
 	/**
@@ -301,11 +301,11 @@ 
 	 * @param string $slug
 	 * @return boolean
 	 */
-	private function _other_post_exists_with_that_slug($slug){
+	private function _other_post_exists_with_that_slug($slug) {
 		global $wpdb;
-		$query = $wpdb->prepare("SELECT COUNT(ID) FROM {$this->_new_table} WHERE post_name = %s",$slug);
+		$query = $wpdb->prepare("SELECT COUNT(ID) FROM {$this->_new_table} WHERE post_name = %s", $slug);
 		$count = $wpdb->get_var($query);
-		return (boolean)intval($count);
+		return (boolean) intval($count);
 	}
 
 
@@ -314,7 +314,7 @@ 
 	 * @param $old_event
 	 * @return int
 	 */
-	private function _insert_cpt( $old_event ){
+	private function _insert_cpt($old_event) {
 		global $wpdb;
 		//convert 3.1 event status to 4.1 CPT status
 		//for reference, 3.1 event stati available for setting are:
@@ -333,66 +333,66 @@ 
 //		and 3 custom ones: cancelled,postponed,sold_out
 		$status_conversions = array(
 			'R'=>'draft',
-			'X'=>'draft',//4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
+			'X'=>'draft', //4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
 			'P'=>'pending',
-			'IA'=>'draft',//draft and in the past
+			'IA'=>'draft', //draft and in the past
 //IA=inactive in 3.1: events were switched to this when they expired. in 4.1 that's just calculated
-			'O'=>'publish',//@todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
+			'O'=>'publish', //@todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
 			'A'=>'publish',
-			'S'=>'draft',//@todo: is it ok to just mark secondary/waitlist events as DRAFTS?
+			'S'=>'draft', //@todo: is it ok to just mark secondary/waitlist events as DRAFTS?
 			'D'=>'trash',
 		);
 		$post_status = $status_conversions[$old_event['event_status']];
 		//check if we've sold out
-		if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])){
+		if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])) {
 			$post_status = 'sold_out';
 		}
 //		FYI postponed and cancelled don't exist in 3.1
 		$cols_n_values = array(
-			'post_title'=>stripslashes($old_event['event_name']),//EVT_name
-			'post_content'=>stripslashes($old_event['event_desc']),//EVT_desc
-			'post_name'=>$this->_find_unique_slug($old_event['event_name'], $old_event['event_identifier'], $post_status ),//EVT_slug
-			'post_date'=>$old_event['submitted'],//EVT_created NOT
+			'post_title'=>stripslashes($old_event['event_name']), //EVT_name
+			'post_content'=>stripslashes($old_event['event_desc']), //EVT_desc
+			'post_name'=>$this->_find_unique_slug($old_event['event_name'], $old_event['event_identifier'], $post_status), //EVT_slug
+			'post_date'=>$old_event['submitted'], //EVT_created NOT
 			'post_date_gmt'=>get_gmt_from_date($old_event['submitted']),
-			'post_excerpt'=>'',//EVT_short_desc
-			'post_modified'=>$old_event['submitted'],//EVT_modified
+			'post_excerpt'=>'', //EVT_short_desc
+			'post_modified'=>$old_event['submitted'], //EVT_modified
 			'post_modified_gmt'=>get_gmt_from_date($old_event['submitted']),
-			'post_author'=>$old_event['wp_user'],//EVT_wp_user
-			'post_parent'=>0,//parent maybe get this from some REM field?
-			'menu_order'=>0,//EVT_order
-			'post_type'=>'espresso_events',//post_type
-			'post_status'=>$post_status,//status
+			'post_author'=>$old_event['wp_user'], //EVT_wp_user
+			'post_parent'=>0, //parent maybe get this from some REM field?
+			'menu_order'=>0, //EVT_order
+			'post_type'=>'espresso_events', //post_type
+			'post_status'=>$post_status, //status
 		);
 		$cols_n_values_with_no_invalid_text = array();
-		foreach( $cols_n_values as $col => $value ) {
-			$value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column( $this->_new_table, $col, $value );
-			if( ! is_wp_error( $value_sans_invalid_chars ) ) {
-				$cols_n_values_with_no_invalid_text[ $col ] = $value_sans_invalid_chars;
+		foreach ($cols_n_values as $col => $value) {
+			$value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column($this->_new_table, $col, $value);
+			if ( ! is_wp_error($value_sans_invalid_chars)) {
+				$cols_n_values_with_no_invalid_text[$col] = $value_sans_invalid_chars;
 			} else {
 				//otherwise leave it as-is. It will blow everything up and stop the migration
-				$cols_n_values_with_no_invalid_text[ $col ] = $value;
+				$cols_n_values_with_no_invalid_text[$col] = $value;
 			}
 		}
 		$cols_n_values = $cols_n_values_with_no_invalid_text;
 		$datatypes = array(
-			'%s',//EVT_name
-			'%s',//EVT_desc
-			'%s',//EVT_slug
-			'%s',//EVT_created
+			'%s', //EVT_name
+			'%s', //EVT_desc
+			'%s', //EVT_slug
+			'%s', //EVT_created
 			'%s',
-			'%s',//EVT_short_desc
-			'%s',//EVT_modified
+			'%s', //EVT_short_desc
+			'%s', //EVT_modified
 			'%s',
-			'%s',//EVT_wp_user
-			'%d',//post_parent
-			'%d',//EVT_order
-			'%s',//post_type
-			'%s',//status
+			'%s', //EVT_wp_user
+			'%d', //post_parent
+			'%d', //EVT_order
+			'%s', //post_type
+			'%s', //status
 		);
 		$success = $wpdb->insert($this->_new_table,
 				$cols_n_values,
 				$datatypes);
-		if( ! $success ){
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -405,9 +405,9 @@ 
 	 * @param int $event_id
 	 * @return int
 	 */
-	public static function count_registrations($event_id){
+	public static function count_registrations($event_id) {
 		global $wpdb;
-		$count = $wpdb->get_var($wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d",$event_id));
+		$count = $wpdb->get_var($wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d", $event_id));
 		return intval($count);
 	}
 
@@ -418,7 +418,7 @@ 
 	 * @param $new_cpt_id
 	 * @return int
 	 */
-	private function _insert_event_meta( $old_event, $new_cpt_id){
+	private function _insert_event_meta($old_event, $new_cpt_id) {
 		global $wpdb;
 		$event_meta = maybe_unserialize($old_event['event_meta']);
 //		for reference, 3.1 'default_payment_status' are: $default_payment_status = array(
@@ -429,10 +429,10 @@ 
 //);
 		$default_reg_status = $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(isset($event_meta['default_payment_status']) ? $event_meta['default_payment_status'] : '', intval($old_event['require_pre_approval']));
 		$cols_n_values = array(
-			'EVT_ID'=>$new_cpt_id,//EVT_ID_fk
+			'EVT_ID'=>$new_cpt_id, //EVT_ID_fk
 			'EVT_display_desc'=> 'Y' == $old_event['display_desc'],
-			'EVT_display_ticket_selector'=> 'Y'== $old_event['display_reg_form'],
-			'EVT_visible_on'=> $this->get_migration_script()->convert_date_string_to_utc($this,$old_event,current_time('mysql'),$old_event['timezone_string']),//don't use the old 'visible_on', as it wasn't ever used
+			'EVT_display_ticket_selector'=> 'Y' == $old_event['display_reg_form'],
+			'EVT_visible_on'=> $this->get_migration_script()->convert_date_string_to_utc($this, $old_event, current_time('mysql'), $old_event['timezone_string']), //don't use the old 'visible_on', as it wasn't ever used
 			'EVT_additional_limit'=> $old_event['allow_multiple'] == 'N' ? 1 : $old_event['additional_limit'],
 			'EVT_default_registration_status' => $default_reg_status,
 			'EVT_member_only'=>$old_event['member_only'],
@@ -444,23 +444,23 @@ 
 
 		);
 		$datatypes = array(
-			'%s',//EVT_ID
-			'%d',//EVT_display_desc
-			'%d',//EVT_display_ticket_selector
-			'%s',//EVT_visible_on
-			'%d',//EVT_additional_limit
-			'%s',//EVT_default_registration_status
-			'%d',//EVT_member_only
-			'%s',//EVT_phone
-			'%d',//EVT_allow_overflow
-			'%s',//EVT_timezone_string
-			'%s',//EVT_external_URL
-			'%d',//EVT_donations
+			'%s', //EVT_ID
+			'%d', //EVT_display_desc
+			'%d', //EVT_display_ticket_selector
+			'%s', //EVT_visible_on
+			'%d', //EVT_additional_limit
+			'%s', //EVT_default_registration_status
+			'%d', //EVT_member_only
+			'%s', //EVT_phone
+			'%d', //EVT_allow_overflow
+			'%s', //EVT_timezone_string
+			'%s', //EVT_external_URL
+			'%d', //EVT_donations
 		);
 		$success = $wpdb->insert($this->_new_meta_table,
 				$cols_n_values,
 				$datatypes);
-		if( ! $success ){
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $cols_n_values, $datatypes));
 			return 0;
 		}
@@ -473,8 +473,8 @@ 
 	 * @param $old_event
 	 * @return int
 	 */
-	private function _maybe_create_venue( $old_event){
-		if(		$old_event['address'] ||
+	private function _maybe_create_venue($old_event) {
+		if ($old_event['address'] ||
 				$old_event['address2'] ||
 				$old_event['city'] ||
 				$old_event['state'] ||
@@ -485,21 +485,21 @@ 
 				$old_event['venue_phone'] ||
 				$old_event['virtual_url'] ||
 				$old_event['virtual_phone']
-				){
-			$old_id = $this->_duplicate_venue_exists( $old_event );
-			if( $old_id ){
+				) {
+			$old_id = $this->_duplicate_venue_exists($old_event);
+			if ($old_id) {
 				return $old_id;
 			}
 			$new_id = $this->_insert_venue_into_posts($old_event);
-			if( $new_id ){
+			if ($new_id) {
 				$this->_insert_venue_into_meta_table($new_id, $old_event);
-				$guid = isset($old_event['venue_image']) ? $old_event['venue_image']  : null;
-				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id,$this);
+				$guid = isset($old_event['venue_image']) ? $old_event['venue_image'] : null;
+				$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post($guid, $new_id, $this);
 			}
 			//we don't bother recording the conversion from old events to venues as that
 			//will complicate finding the conversion from old venues to new events
 			return $new_id;
-		}else{
+		} else {
 			return 0;
 		}
 	}
@@ -510,29 +510,29 @@ 
 	 * @param array $old_event
 	 * @return int duplicate venue id
 	 */
-	private function _duplicate_venue_exists($old_event){
+	private function _duplicate_venue_exists($old_event) {
 		global $wpdb;
 		$conditions = array(
-			'VNU_address' => $old_event [ 'address' ],
-			'VNU_address2' => $old_event[ 'address2' ],
-			'VNU_city' => $old_event[ 'city' ],
-			'VNU_zip' => $old_event[ 'zip' ],
-			'post_title'=> $this->_get_venue_title_for_event( $old_event ),
-			'VNU_phone'=>$old_event['venue_phone'],//VNU_phone
-			'VNU_url'=>$old_event['venue_url'],//VNU_url
-			'VNU_virtual_phone'=>$old_event['virtual_phone'],//VNU_virtual_phone
-			'VNU_virtual_url'=>$old_event['virtual_url'],//VNU_virtual_url
+			'VNU_address' => $old_event ['address'],
+			'VNU_address2' => $old_event['address2'],
+			'VNU_city' => $old_event['city'],
+			'VNU_zip' => $old_event['zip'],
+			'post_title'=> $this->_get_venue_title_for_event($old_event),
+			'VNU_phone'=>$old_event['venue_phone'], //VNU_phone
+			'VNU_url'=>$old_event['venue_url'], //VNU_url
+			'VNU_virtual_phone'=>$old_event['virtual_phone'], //VNU_virtual_phone
+			'VNU_virtual_url'=>$old_event['virtual_url'], //VNU_virtual_url
 		);
 		$sql_conditions = array();
-		foreach($conditions as $column => $value){
-			$sql_conditions [] = $wpdb->prepare("$column = %s", $value );
+		foreach ($conditions as $column => $value) {
+			$sql_conditions [] = $wpdb->prepare("$column = %s", $value);
 		}
 		$query = "SELECT VNU_ID
 					FROM
 		{$wpdb->posts} as p INNER JOIN
 		{$wpdb->prefix}esp_venue_meta as v ON p.ID = v.VNU_ID
-			WHERE " . implode( " AND ",$sql_conditions ) . " LIMIT 1";
-		$id = $wpdb->get_var( $query );
+			WHERE ".implode(" AND ", $sql_conditions)." LIMIT 1";
+		$id = $wpdb->get_var($query);
 		return $id;
 	}
 
@@ -541,8 +541,8 @@ 
 	 * @param array $event_data_array keys are events_details columns and values are their values
 	 * @return string
 	 */
-	protected function _get_venue_title_for_event( $event_data_array ) {
-		return $event_data_array['venue_title'] ? stripslashes($event_data_array['venue_title']) : stripslashes( sprintf( __( 'Venue of %s', 'event_espresso' ), $event_data_array['event_name']));
+	protected function _get_venue_title_for_event($event_data_array) {
+		return $event_data_array['venue_title'] ? stripslashes($event_data_array['venue_title']) : stripslashes(sprintf(__('Venue of %s', 'event_espresso'), $event_data_array['event_name']));
 	}
 
 	/**
@@ -551,40 +551,40 @@ 
 	 * @param array $old_event keys are cols, values are col values
 	 * @return int
 	 */
-	private function _insert_venue_into_posts($old_event){
+	private function _insert_venue_into_posts($old_event) {
 		global $wpdb;
 		$insertion_array = array(
-					'post_title'=> $this->_get_venue_title_for_event( $old_event ),//VNU_name
-					'post_content'=>'',//VNU_desc
-					'post_name'=> $this->_find_unique_slug( $old_event['venue_title'], sanitize_title( 'venue-of-' . $old_event['event_name'] ) ),//VNU_identifier
-					'post_date'=>current_time('mysql'),//VNU_created
+					'post_title'=> $this->_get_venue_title_for_event($old_event), //VNU_name
+					'post_content'=>'', //VNU_desc
+					'post_name'=> $this->_find_unique_slug($old_event['venue_title'], sanitize_title('venue-of-'.$old_event['event_name'])), //VNU_identifier
+					'post_date'=>current_time('mysql'), //VNU_created
 					'post_date_gmt'=>get_gmt_from_date(current_time('mysql')),
-					'post_excerpt'=>'',//VNU_short_desc arbitrary only 50 characters
-					'post_modified'=>current_time('mysql'),//VNU_modified
+					'post_excerpt'=>'', //VNU_short_desc arbitrary only 50 characters
+					'post_modified'=>current_time('mysql'), //VNU_modified
 					'post_modified_gmt'=>get_gmt_from_date(current_time('mysql')),
-					'post_author'=>$old_event['wp_user'],//VNU_wp_user
-					'post_parent'=>0,//parent
-					'menu_order'=>0,//VNU_order
+					'post_author'=>$old_event['wp_user'], //VNU_wp_user
+					'post_parent'=>0, //parent
+					'menu_order'=>0, //VNU_order
 					'post_type'=>'espresso_venues'//post_type
 				);
 		$datatypes_array = array(
-					'%s',//VNU_name
-					'%s',//VNU_desc
-					'%s',//VNU_identifier
-					'%s',//VNU_created
+					'%s', //VNU_name
+					'%s', //VNU_desc
+					'%s', //VNU_identifier
+					'%s', //VNU_created
 					'%s',
-					'%s',//VNU_short_desc
-					'%s',//VNU_modified
+					'%s', //VNU_short_desc
+					'%s', //VNU_modified
 					'%s',
-					'%d',//VNU_wp_user
-					'%d',//parent
-					'%d',//VNU_order
-					'%s',//post_type
+					'%d', //VNU_wp_user
+					'%d', //parent
+					'%d', //VNU_order
+					'%s', //post_type
 				);
 		$success = $wpdb->insert($wpdb->posts,
 				$insertion_array,
 				$datatypes_array);
-		if( ! $success ){
+		if ( ! $success) {
 			$this->add_error(
 				$this->get_migration_script()->_create_error_message_for_db_insertion(
 					$this->_old_table,
@@ -605,64 +605,64 @@ 
 	 * @param array $old_event
 	 * @return int
 	 */
-	private function _insert_venue_into_meta_table($cpt_id,$old_event){
+	private function _insert_venue_into_meta_table($cpt_id, $old_event) {
 		global $wpdb;
 
 		//assume the country is the same as the organization's old settings
 		$country_iso = $this->get_migration_script()->get_default_country_iso();
 		//find the state from the venue, or the organization, or just guess california
-		if( ! $old_event['state']){
+		if ( ! $old_event['state']) {
 			$old_org_options = get_option('events_organization_settings');
 			$state_name = stripslashes($old_org_options['organization_state']);
-		}else{
+		} else {
 			$state_name = $old_event['state'];
 		}
-		if ( ! $state_name ){
+		if ( ! $state_name) {
 			$state_name = 'CA';
 		}
 		//get a state ID with the same name, if possible
-		try{
-			$state = $this->get_migration_script()->get_or_create_state($state_name,$country_iso);
+		try {
+			$state = $this->get_migration_script()->get_or_create_state($state_name, $country_iso);
 			$state_id = $state['STA_ID'];
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			$this->add_error($e->getMessage());
 			$state_id = 0;
 		}
 		//now insert into meta table
 		$insertion_array = array(
-			'VNU_ID'=>$cpt_id,//VNU_ID_fk
-			'VNU_address'=>stripslashes($old_event['address']),//VNU_address
-			'VNU_address2'=>stripslashes($old_event['address2']),//VNU_address2
-			'VNU_city'=>stripslashes($old_event['city']),//VNU_city
-			'STA_ID'=>$state_id,//STA_ID
-			'CNT_ISO'=>$country_iso,//CNT_ISO
-			'VNU_zip'=>$old_event['zip'],//VNU_zip
-			'VNU_phone'=>$old_event['venue_phone'],//VNU_phone
-			'VNU_capacity'=>-1,//VNU_capacity
-			'VNU_url'=>$old_event['venue_url'],//VNU_url
-			'VNU_virtual_phone'=>$old_event['virtual_phone'],//VNU_virtual_phone
-			'VNU_virtual_url'=>$old_event['virtual_url'],//VNU_virtual_url
-			'VNU_google_map_link'=>'',//VNU_google_map_link
+			'VNU_ID'=>$cpt_id, //VNU_ID_fk
+			'VNU_address'=>stripslashes($old_event['address']), //VNU_address
+			'VNU_address2'=>stripslashes($old_event['address2']), //VNU_address2
+			'VNU_city'=>stripslashes($old_event['city']), //VNU_city
+			'STA_ID'=>$state_id, //STA_ID
+			'CNT_ISO'=>$country_iso, //CNT_ISO
+			'VNU_zip'=>$old_event['zip'], //VNU_zip
+			'VNU_phone'=>$old_event['venue_phone'], //VNU_phone
+			'VNU_capacity'=>-1, //VNU_capacity
+			'VNU_url'=>$old_event['venue_url'], //VNU_url
+			'VNU_virtual_phone'=>$old_event['virtual_phone'], //VNU_virtual_phone
+			'VNU_virtual_url'=>$old_event['virtual_url'], //VNU_virtual_url
+			'VNU_google_map_link'=>'', //VNU_google_map_link
 			'VNU_enable_for_gmap'=>true	//VNU_enable_for_gmap
 		);
 		$datatypes = array(
-			'%d',//VNU_ID_fk
-			'%s',//VNU_address
-			'%s',//VNU_address2
-			'%s',//VNU_city
-			'%d',//STA_ID
-			'%s',//CNT_ISO
-			'%s',//VNU_zip
-			'%s',//VNU_phone
-			'%d',//VNU_capacity
-			'%s',//VNU_url
-			'%s',//VNU_virtual_phone
-			'%s',//VNU_virtual_url
-			'%s',//VNU_google_map_link
-			'%d',//VNU_enable_for_gmap
+			'%d', //VNU_ID_fk
+			'%s', //VNU_address
+			'%s', //VNU_address2
+			'%s', //VNU_city
+			'%d', //STA_ID
+			'%s', //CNT_ISO
+			'%s', //VNU_zip
+			'%s', //VNU_phone
+			'%d', //VNU_capacity
+			'%s', //VNU_url
+			'%s', //VNU_virtual_phone
+			'%s', //VNU_virtual_url
+			'%s', //VNU_google_map_link
+			'%d', //VNU_enable_for_gmap
 		);
-		$success = $wpdb->insert($wpdb->prefix."esp_venue_meta",$insertion_array,$datatypes);
-		if( ! $success ){
+		$success = $wpdb->insert($wpdb->prefix."esp_venue_meta", $insertion_array, $datatypes);
+		if ( ! $success) {
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event, $this->_new_meta_table, $insertion_array, $datatypes));
 			return 0;
 		}
@@ -676,14 +676,14 @@ 
 	 * @param $new_venue_id
 	 * @return int
 	 */
-	private function _insert_new_venue_to_event( $new_event_id, $new_venue_id){
+	private function _insert_new_venue_to_event($new_event_id, $new_venue_id) {
 		global $wpdb;
-		if( ! $new_event_id){
-			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),$new_event_id));
+		if ( ! $new_event_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $new_event_id));
 			return 0;
 		}
-		if( ! $new_venue_id){
-			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"),$new_venue_id));
+		if ( ! $new_venue_id) {
+			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $new_venue_id));
 			return 0;
 		}
 		$cols_n_values = array(
@@ -692,12 +692,12 @@ 
 			'EVV_primary'=>true
 		);
 		$datatypes = array(
-			'%d',//EVT_ID
-			'%d',//VNU_ID
-			'%d',//EVT_primary
+			'%d', //EVT_ID
+			'%d', //VNU_ID
+			'%d', //EVT_primary
 		);
-		$success = $wpdb->insert($wpdb->prefix."esp_event_venue",$cols_n_values,$datatypes);
-		if ( ! $success){
+		$success = $wpdb->insert($wpdb->prefix."esp_event_venue", $cols_n_values, $datatypes);
+		if ( ! $success) {
 			$this->add_error(
 				$this->get_migration_script()->_create_error_message_for_db_insertion(
 					$this->_old_table,
@@ -719,11 +719,11 @@ 
 	 * @param int $new_cpt_id new post ID
 	 * @return void (if there are errors though, adds them to the stage's error list
 	 */
-	private function _convert_start_end_times($old_event,$new_cpt_id){
+	private function _convert_start_end_times($old_event, $new_cpt_id) {
 		$start_end_times = $this->_get_old_start_end_times($old_event['id']);
-		foreach($start_end_times as $start_end_time){
-			$datetime_id = $this->_insert_new_datetime($start_end_time,$old_event,$new_cpt_id);
-			if($datetime_id){
+		foreach ($start_end_times as $start_end_time) {
+			$datetime_id = $this->_insert_new_datetime($start_end_time, $old_event, $new_cpt_id);
+			if ($datetime_id) {
 				$this->get_migration_script()->set_mapping($this->_old_start_end_table, $start_end_time['id'], $this->_new_datetime_table, $datetime_id);
 			}
 		}
@@ -734,9 +734,9 @@ 
 	 * @param int $old_event_id
 	 * @return array
 	 */
-	private function _get_old_start_end_times($old_event_id){
+	private function _get_old_start_end_times($old_event_id) {
 		global $wpdb;
-		return $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d",$old_event_id),ARRAY_A);
+		return $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d", $old_event_id), ARRAY_A);
 	}
 	/**
 	 * Inserts a 4.1 datetime given the 3.1 start_end db row and event_details row
@@ -745,40 +745,40 @@ 
 	 * @param int $new_cpt_id
 	 * @return int ID of new datetime
 	 */
-	private function _insert_new_datetime($start_end_time_row,$old_event_row,$new_cpt_id){
+	private function _insert_new_datetime($start_end_time_row, $old_event_row, $new_cpt_id) {
 		global $wpdb;
 		$start_date = $old_event_row['start_date'];
 		$start_time = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['start_time']);
 		$end_date = $old_event_row['end_date'];
 		$end_time = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['end_time']);
 		$existing_datetimes = $this->_count_other_datetimes_exist_for_new_event($new_cpt_id);
-		$start_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this,$start_end_time_row,"$start_date $start_time:00",$old_event_row['timezone_string']);
-		$end_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this,$start_end_time_row,"$end_date $end_time:00",$old_event_row['timezone_string']);
+		$start_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$start_date $start_time:00", $old_event_row['timezone_string']);
+		$end_datetime_utc = $this->get_migration_script()->convert_date_string_to_utc($this, $start_end_time_row, "$end_date $end_time:00", $old_event_row['timezone_string']);
 		$cols_n_values = array(
-			'EVT_ID'=>$new_cpt_id,//EVT_ID
-			'DTT_EVT_start'=>$start_datetime_utc,//DTT_EVT_start
-			'DTT_EVT_end'=> $end_datetime_utc,//DTT_EVT_end
-			'DTT_reg_limit'=>intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit'] : $old_event_row['reg_limit'],//DTT_reg_limit
-			'DTT_sold'=>0,//note: we will increment this as registrations are added during the migration
+			'EVT_ID'=>$new_cpt_id, //EVT_ID
+			'DTT_EVT_start'=>$start_datetime_utc, //DTT_EVT_start
+			'DTT_EVT_end'=> $end_datetime_utc, //DTT_EVT_end
+			'DTT_reg_limit'=>intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit'] : $old_event_row['reg_limit'], //DTT_reg_limit
+			'DTT_sold'=>0, //note: we will increment this as registrations are added during the migration
 //			'DTT_is_primary'=> 0 == $existing_datetimes ,//DTT_is_primary... if count==0, then we'll call it the 'primary'
-			'DTT_order'=> $existing_datetimes,//DTT_order, just give it the same order as the count of how many datetimes already exist
+			'DTT_order'=> $existing_datetimes, //DTT_order, just give it the same order as the count of how many datetimes already exist
 			'DTT_parent'=>0,
 			'DTT_deleted'=>false
 		);
 		$datatypes = array(
-			'%d',//EVT_Id
-			'%s',//DTT_EVT_start
-			'%s',//DTT_EVT_end
-			'%d',//DTT_reg_limit
-			'%d',//DTT_sold
+			'%d', //EVT_Id
+			'%s', //DTT_EVT_start
+			'%s', //DTT_EVT_end
+			'%d', //DTT_reg_limit
+			'%d', //DTT_sold
 //			'%d',//DTT_is_primary
-			'%d',//DTT_order
-			'%d',//DTT_parent
-			'%d',//DTT_deleted
+			'%d', //DTT_order
+			'%d', //DTT_parent
+			'%d', //DTT_deleted
 		);
-		$success = $wpdb->insert($this->_new_datetime_table,$cols_n_values,$datatypes);
-		if ( ! $success){
-			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_start_end_table, array_merge($old_event_row,$start_end_time_row), $this->_new_datetime_table, $cols_n_values, $datatypes));
+		$success = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $datatypes);
+		if ( ! $success) {
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_start_end_table, array_merge($old_event_row, $start_end_time_row), $this->_new_datetime_table, $cols_n_values, $datatypes));
 			return 0;
 		}
 		return $wpdb->insert_id;
@@ -791,9 +791,9 @@ 
 	 * @param int $cpt_event_id
 	 * @return int
 	 */
-	private function _count_other_datetimes_exist_for_new_event($cpt_event_id){
+	private function _count_other_datetimes_exist_for_new_event($cpt_event_id) {
 		global $wpdb;
-		$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d",$cpt_event_id));
+		$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d", $cpt_event_id));
 		return intval($count);
 	}
 

core/EE_Cron_Tasks.core.php

Indentation +1 added lines, -2 removed lines

@@ -170,7 +170,7 @@ 
 	 * @param int $PAY_ID
 	 */
 	public static function setup_update_for_transaction_with_payment( $TXN_ID = 0, $PAY_ID = 0 ) {
-            do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
+			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
 		if ( absint( $TXN_ID )) {
 			self::$_update_transactions_with_payment[ $TXN_ID ] = $PAY_ID;
 			add_action(
@@ -303,7 +303,6 @@ 
 
 	/**
 	 * finalize_abandoned_transactions
-
 	 * loops through the self::$_abandoned_transactions array
 	 * and attempts to finalize any TXNs that have not been completed
 	 * but have had their sessions expired, most likely due to a user not

Spacing +64 added lines, -64 removed lines

@@ -28,7 +28,7 @@ 
 	 * @return EE_Cron_Tasks
 	 */
 	public static function instance() {
-		if ( ! self::$_instance instanceof EE_Cron_Tasks ) {
+		if ( ! self::$_instance instanceof EE_Cron_Tasks) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -41,9 +41,9 @@ 
 	 * @return EE_Cron_Tasks
 	 */
 	private function __construct() {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__ );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
 		// verify that WP Cron is enabled
-		if ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON && is_admin() ) {
+		if (defined('DISABLE_WP_CRON') && DISABLE_WP_CRON && is_admin()) {
 			EE_Error::add_persistent_admin_notice(
 				'wp_cron_disabled',
 				sprintf(
@@ -58,26 +58,26 @@ 
 		// UPDATE TRANSACTION WITH PAYMENT
 		add_action(
 			'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
-			array( 'EE_Cron_Tasks', 'setup_update_for_transaction_with_payment' ),
+			array('EE_Cron_Tasks', 'setup_update_for_transaction_with_payment'),
 			10, 2
 		);
 		// FINALIZE ABANDONED TRANSACTIONS
 		add_action(
 			'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
-			array( 'EE_Cron_Tasks', 'check_for_abandoned_transactions' ),
+			array('EE_Cron_Tasks', 'check_for_abandoned_transactions'),
 			10, 1
 		);
 		// CLEAN OUT JUNK TRANSACTIONS AND RELATED DATA
 		add_action(
 				'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
-				array( 'EE_Cron_Tasks', 'clean_out_junk_transactions' )
+				array('EE_Cron_Tasks', 'clean_out_junk_transactions')
 		);
 		// logging
 		add_action(
 			'AHEE__EE_System__load_core_configuration__complete',
-			array( 'EE_Cron_Tasks', 'log_scheduled_ee_crons' )
+			array('EE_Cron_Tasks', 'log_scheduled_ee_crons')
 		);
-		EE_Registry::instance()->load_lib( 'Messages_Scheduler' );
+		EE_Registry::instance()->load_lib('Messages_Scheduler');
 	}
 
 
@@ -92,17 +92,17 @@ 
 			'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
 			'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
 		);
-		$crons = get_option( 'cron' );
-		if ( ! is_array( $crons ) ) {
+		$crons = get_option('cron');
+		if ( ! is_array($crons)) {
 			return;
 		}
-		foreach ( $crons as $timestamp => $cron ) {
-			foreach ( $ee_crons as $ee_cron ) {
-				if ( isset( $cron[ $ee_cron ] ) ) {
-					do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $ee_cron, 'scheduled EE cron' );
-					foreach ( $cron[ $ee_cron ] as $ee_cron_details ) {
-						if ( ! empty( $ee_cron_details[ 'args' ] )) {
-							do_action( 'AHEE_log', __CLASS__, __FUNCTION__, print_r( $ee_cron_details[ 'args' ], true ), "$ee_cron args" );
+		foreach ($crons as $timestamp => $cron) {
+			foreach ($ee_crons as $ee_cron) {
+				if (isset($cron[$ee_cron])) {
+					do_action('AHEE_log', __CLASS__, __FUNCTION__, $ee_cron, 'scheduled EE cron');
+					foreach ($cron[$ee_cron] as $ee_cron_details) {
+						if ( ! empty($ee_cron_details['args'])) {
+							do_action('AHEE_log', __CLASS__, __FUNCTION__, print_r($ee_cron_details['args'], true), "$ee_cron args");
 						}
 					}
 				}
@@ -139,15 +139,15 @@ 
 		$TXN_ID,
 		$PAY_ID
 	) {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__ );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
 		// validate $TXN_ID and $timestamp
-		$TXN_ID = absint( $TXN_ID );
-		$timestamp = absint( $timestamp );
-		if ( $TXN_ID && $timestamp ) {
+		$TXN_ID = absint($TXN_ID);
+		$timestamp = absint($timestamp);
+		if ($TXN_ID && $timestamp) {
 			wp_schedule_single_event(
 				$timestamp,
 				'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
-				array( $TXN_ID, $PAY_ID )
+				array($TXN_ID, $PAY_ID)
 			);
 		}
 	}
@@ -169,13 +169,13 @@ 
 	 * @param int  $TXN_ID
 	 * @param int $PAY_ID
 	 */
-	public static function setup_update_for_transaction_with_payment( $TXN_ID = 0, $PAY_ID = 0 ) {
-            do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
-		if ( absint( $TXN_ID )) {
-			self::$_update_transactions_with_payment[ $TXN_ID ] = $PAY_ID;
+	public static function setup_update_for_transaction_with_payment($TXN_ID = 0, $PAY_ID = 0) {
+            do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
+		if (absint($TXN_ID)) {
+			self::$_update_transactions_with_payment[$TXN_ID] = $PAY_ID;
 			add_action(
 				'shutdown',
-				array( 'EE_Cron_Tasks', 'update_transaction_with_payment' ),
+				array('EE_Cron_Tasks', 'update_transaction_with_payment'),
 				5
 			);
 		}
@@ -194,18 +194,18 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function update_transaction_with_payment() {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__ );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
 		// are there any TXNs that need cleaning up ?
-		if ( ! empty( self::$_update_transactions_with_payment ) ) {
+		if ( ! empty(self::$_update_transactions_with_payment)) {
 			/** @type EE_Payment_Processor $payment_processor */
-			$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
+			$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
 			// set revisit flag for payment processor
-			$payment_processor->set_revisit( false );
+			$payment_processor->set_revisit(false);
 			// load EEM_Transaction
-			EE_Registry::instance()->load_model( 'Transaction' );
-			foreach ( self::$_update_transactions_with_payment as $TXN_ID => $PAY_ID ) {
+			EE_Registry::instance()->load_model('Transaction');
+			foreach (self::$_update_transactions_with_payment as $TXN_ID => $PAY_ID) {
 				// reschedule the cron if we can't hit the db right now
-				if ( ! EE_Maintenance_Mode::instance()->models_can_query() ) {
+				if ( ! EE_Maintenance_Mode::instance()->models_can_query()) {
 					// reset cron job for updating the TXN
 					EE_Cron_Tasks::schedule_update_transaction_with_payment(
 						time() + EE_Cron_Tasks::reschedule_timeout,
@@ -214,14 +214,14 @@ 
 					);
 					continue;
 				}
-				$transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
-				$payment = EEM_Payment::instance()->get_one_by_ID( $PAY_ID );
+				$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
+				$payment = EEM_Payment::instance()->get_one_by_ID($PAY_ID);
 				// verify transaction
-				if ( $transaction instanceof EE_Transaction && $payment instanceof EE_Payment ) {
+				if ($transaction instanceof EE_Transaction && $payment instanceof EE_Payment) {
 					// now try to update the TXN with any payments
-					$payment_processor->update_txn_based_on_payment( $transaction, $payment, true, true );
+					$payment_processor->update_txn_based_on_payment($transaction, $payment, true, true);
 				}
-				unset( self::$_update_transactions_with_payment[ $TXN_ID ] );
+				unset(self::$_update_transactions_with_payment[$TXN_ID]);
 			}
 		}
 	}
@@ -258,14 +258,14 @@ 
 		$TXN_ID
 	) {
 		// validate $TXN_ID and $timestamp
-		$TXN_ID = absint( $TXN_ID );
-		$timestamp = absint( $timestamp );
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
-		if ( $TXN_ID && $timestamp ) {
+		$TXN_ID = absint($TXN_ID);
+		$timestamp = absint($timestamp);
+		do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
+		if ($TXN_ID && $timestamp) {
 			wp_schedule_single_event(
 				$timestamp,
 				'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
-				array( $TXN_ID )
+				array($TXN_ID)
 			);
 		}
 	}
@@ -287,13 +287,13 @@ 
 	 *
 	 * @param int $TXN_ID
 	 */
-	public static function check_for_abandoned_transactions(	$TXN_ID = 0 ) {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
-		if ( absint( $TXN_ID )) {
-			self::$_abandoned_transactions[]  = $TXN_ID;
+	public static function check_for_abandoned_transactions($TXN_ID = 0) {
+		do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
+		if (absint($TXN_ID)) {
+			self::$_abandoned_transactions[] = $TXN_ID;
 			add_action(
 				'shutdown',
-				array( 'EE_Cron_Tasks', 'finalize_abandoned_transactions' ),
+				array('EE_Cron_Tasks', 'finalize_abandoned_transactions'),
 				5
 			);
 		}
@@ -312,21 +312,21 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function finalize_abandoned_transactions() {
-		do_action( 'AHEE_log', __CLASS__, __FUNCTION__ );
+		do_action('AHEE_log', __CLASS__, __FUNCTION__);
 		// are there any TXNs that need cleaning up ?
-		if ( ! empty( self::$_abandoned_transactions ) ) {
+		if ( ! empty(self::$_abandoned_transactions)) {
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// set revisit flag for txn processor
-			$transaction_processor->set_revisit( false );
+			$transaction_processor->set_revisit(false);
 			/** @type EE_Payment_Processor $payment_processor */
-			$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
+			$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
 			// load EEM_Transaction
-			EE_Registry::instance()->load_model( 'Transaction' );
-			foreach ( self::$_abandoned_transactions as $TXN_ID ) {
-				do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID' );
+			EE_Registry::instance()->load_model('Transaction');
+			foreach (self::$_abandoned_transactions as $TXN_ID) {
+				do_action('AHEE_log', __CLASS__, __FUNCTION__, $TXN_ID, '$TXN_ID');
 				// reschedule the cron if we can't hit the db right now
-				if ( ! EE_Maintenance_Mode::instance()->models_can_query() ) {
+				if ( ! EE_Maintenance_Mode::instance()->models_can_query()) {
 					// reset cron job for finalizing the TXN
 					EE_Cron_Tasks::schedule_finalize_abandoned_transactions_check(
 						time() + EE_Cron_Tasks::reschedule_timeout,
@@ -334,17 +334,17 @@ 
 					);
 					continue;
 				}
-				$transaction = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
+				$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
 				// verify transaction
-				if ( $transaction instanceof EE_Transaction ) {
+				if ($transaction instanceof EE_Transaction) {
 					// don't finalize the TXN if it has already been completed
-					if ( $transaction->all_reg_steps_completed() === true ) {
+					if ($transaction->all_reg_steps_completed() === true) {
 						continue;
 					}
 					// let's simulate an IPN here which will trigger any notifications that need to go out
-					$payment_processor->update_txn_based_on_payment( $transaction, $transaction->last_payment(), true, true );
+					$payment_processor->update_txn_based_on_payment($transaction, $transaction->last_payment(), true, true);
 				}
-				unset( self::$_abandoned_transactions[ $TXN_ID ] );
+				unset(self::$_abandoned_transactions[$TXN_ID]);
 			}
 		}
 	}
@@ -360,7 +360,7 @@ 
 	//when a transaction is initially made, schedule this check.
 	//if it has NO REG data by the time it has expired, forget about it
 	public static function clean_out_junk_transactions() {
-		if( EE_Maintenance_Mode::instance()->models_can_query() ) {
+		if (EE_Maintenance_Mode::instance()->models_can_query()) {
 			EEM_Transaction::instance('')->delete_junk_transactions();
 			EEM_Registration::instance('')->delete_registrations_with_no_transaction();
 			EEM_Line_Item::instance('')->delete_line_items_with_no_transaction();

core/libraries/payment_methods/EE_Gateway.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -282,7 +282,7 @@
 	/**
 	 * Gets the first event for this payment (it's possible that it could be for multiple)
 	 * @param EEI_Payment $payment
-	 * @return EEI_Event|null
+	 * @return EE_Event|null
 	 */
 	protected function _get_first_event_for_payment( EEI_Payment $payment ) {
 		$transaction = $payment->transaction();

Spacing +46 added lines, -46 removed lines

@@ -15,7 +15,7 @@ 
  * @subpackage		core/libraries/payment_methods
  * @author			Mike Nelson
  */
-abstract class EE_Gateway{
+abstract class EE_Gateway {
 	/**
 	 * a constant used as a possible value for $_currencies_supported to indicate
 	 * that ALL currencies are supported by this gateway
@@ -93,7 +93,7 @@ 
 	/**
 	 * @return EE_Gateway
 	 */
-	public function __construct(){
+	public function __construct() {
 	}
 
 	/**
@@ -105,9 +105,9 @@ 
 	 * beginning again)
 	 * @return array
 	 */
-	public function __sleep(){
+	public function __sleep() {
 		$properties = get_object_vars($this);
-		unset( $properties[ '_pay_model' ], $properties[ '_pay_log' ] );
+		unset($properties['_pay_model'], $properties['_pay_log']);
 		return array_keys($properties);
 	}
 	/**
@@ -115,7 +115,7 @@ 
 	 * see $_supports_sending_refunds
 	 * @return boolean
 	 */
-	public function supports_sending_refunds(){
+	public function supports_sending_refunds() {
 		return $this->_supports_sending_refunds;
 	}
 	/**
@@ -123,7 +123,7 @@ 
 	 * see $_supports_receiving_refunds
 	 * @return boolean
 	 */
-	public function supports_receiving_refunds(){
+	public function supports_receiving_refunds() {
 		return $this->_supports_receiving_refunds;
 	}
 
@@ -138,7 +138,7 @@ 
 	 * @return EE_Payment for the refund
 	 * @throws EE_Error
 	 */
-	public function do_direct_refund( EE_Payment $payment, $refund_info = null ) {
+	public function do_direct_refund(EE_Payment $payment, $refund_info = null) {
 		return NULL;
 	}
 
@@ -149,8 +149,8 @@ 
 	 * etc
 	 * @param array $settings_array
 	 */
-	public function set_settings($settings_array){
-		foreach($settings_array as $name => $value){
+	public function set_settings($settings_array) {
+		foreach ($settings_array as $name => $value) {
 			$property_name = "_".$name;
 			$this->{$property_name} = $value;
 		}
@@ -159,14 +159,14 @@ 
 	 * See this class description
 	 * @param EEMI_Payment $payment_model
 	 */
-	public function set_payment_model($payment_model){
+	public function set_payment_model($payment_model) {
 		$this->_pay_model = $payment_model;
 	}
 	/**
 	 * See this class description
 	 * @param EEMI_Payment_Log $payment_log_model
 	 */
-	public function set_payment_log($payment_log_model){
+	public function set_payment_log($payment_log_model) {
 		$this->_pay_log = $payment_log_model;
 	}
 
@@ -174,7 +174,7 @@ 
 	 * See this class description
 	 * @param EEHI_Template $template_helper
 	 */
-	public function set_template_helper($template_helper){
+	public function set_template_helper($template_helper) {
 		$this->_template = $template_helper;
 	}
 
@@ -182,7 +182,7 @@ 
 	 * See this class description
 	 * @param EEHI_Line_Item $line_item_helper
 	 */
-	public function set_line_item_helper( $line_item_helper ){
+	public function set_line_item_helper($line_item_helper) {
 		$this->_line_item = $line_item_helper;
 	}
 
@@ -190,7 +190,7 @@ 
 	 * See this class description
 	 * @param EEHI_Money $money_helper
 	 */
-	public function set_money_helper( $money_helper ){
+	public function set_money_helper($money_helper) {
 		$this->_money = $money_helper;
 	}
 
@@ -199,23 +199,23 @@ 
 	 * @param $message
 	 * @param $payment
 	 */
-	public function log($message,$payment){
-		if($payment instanceof EEI_Payment){
-			$type='Payment';
+	public function log($message, $payment) {
+		if ($payment instanceof EEI_Payment) {
+			$type = 'Payment';
 			$id = $payment->ID();
-		}else{
+		} else {
 			$type = 'Payment_Method';
 			$id = $this->_ID;
 		}
-		$this->_pay_log->gateway_log($message,$id,$type);
+		$this->_pay_log->gateway_log($message, $id, $type);
 	}
 	/**
 	 * Formats the amount so it can generally be sent to gateways
 	 * @param float $amount
 	 * @return string
 	 */
-	public function format_currency($amount){
-		return number_format( $amount, 2, '.', '' );
+	public function format_currency($amount) {
+		return number_format($amount, 2, '.', '');
 //		return $this->_template->format_currency($amount, true);
 	}
 
@@ -224,7 +224,7 @@ 
 	 * or a string indicating they're all supported (EE_gateway::all_currencies_supported)
 	 * @return mixed array or string
 	 */
-	public function currencies_supported(){
+	public function currencies_supported() {
 		return $this->_currencies_supported;
 	}
 
@@ -236,14 +236,14 @@ 
 	 * @param EE_Transaction  $transaction
 	 * @return float
 	 */
-	protected function _sum_items_and_taxes( EE_Transaction  $transaction){
+	protected function _sum_items_and_taxes(EE_Transaction  $transaction) {
 		$total_line_item = $transaction->total_line_item();
 		$total = 0;
-		foreach($total_line_item->get_items() as $item_line_item ){
-			$total += max( $item_line_item->total(), 0 );
+		foreach ($total_line_item->get_items() as $item_line_item) {
+			$total += max($item_line_item->total(), 0);
 		}
-		foreach($total_line_item->tax_descendants() as $tax_line_item ){
-			$total += max( $tax_line_item->total(), 0 );
+		foreach ($total_line_item->tax_descendants() as $tax_line_item) {
+			$total += max($tax_line_item->total(), 0);
 		}
 		return $total;
 	}
@@ -254,9 +254,9 @@ 
 	 * @param EEI_Payment $payment
 	 * @return boolean
 	 */
-	protected function _can_easily_itemize_transaction_for( EEI_Payment $payment ){
+	protected function _can_easily_itemize_transaction_for(EEI_Payment $payment) {
 		return  $this->_money->compare_floats(
-					$this->_sum_items_and_taxes( $payment->transaction() ),
+					$this->_sum_items_and_taxes($payment->transaction()),
 					$payment->transaction()->total() ) &&
 				$this->_money->compare_floats(
 					$payment->amount(),
@@ -274,7 +274,7 @@ 
 	 * @param EE_Payment $payment
 	 * @return void
 	 */
-	public function update_txn_based_on_payment( $payment ){
+	public function update_txn_based_on_payment($payment) {
 		//maybe update the transaction or line items or registrations
 		//but most gateways don't need to do this, because they only update the payment
 	}
@@ -284,11 +284,11 @@ 
 	 * @param EEI_Payment $payment
 	 * @return EEI_Event|null
 	 */
-	protected function _get_first_event_for_payment( EEI_Payment $payment ) {
+	protected function _get_first_event_for_payment(EEI_Payment $payment) {
 		$transaction = $payment->transaction();
-		if( $transaction instanceof EEI_Transaction ) {
+		if ($transaction instanceof EEI_Transaction) {
 			$primary_registrant = $transaction->primary_registration();
-			if( $primary_registrant instanceof EE_Registration ) {
+			if ($primary_registrant instanceof EE_Registration) {
 				return $primary_registrant->event_obj();
 			}
 		}
@@ -300,19 +300,19 @@ 
 	 * @param EEI_Payment $payment
 	 * @return string
 	 */
-	protected function _get_first_event_name_for_payment( EEI_Payment $payment ) {
-		$event = $this->_get_first_event_for_payment( $payment );
-		return $event instanceof EEI_Event ? $event->name() : __( 'Event', 'event_espresso' );
+	protected function _get_first_event_name_for_payment(EEI_Payment $payment) {
+		$event = $this->_get_first_event_for_payment($payment);
+		return $event instanceof EEI_Event ? $event->name() : __('Event', 'event_espresso');
 	}
 	/**
 	 * Gets the text to use for a gateway's line item name when this is a partial payment
 	 * @param EE_Payment $payment
 	 * @return string
 	 */
-	protected function _format_partial_payment_line_item_name( EEI_Payment $payment ){
+	protected function _format_partial_payment_line_item_name(EEI_Payment $payment) {
 		return apply_filters( 
 			'EEG_Paypal_Pro__do_direct_payment__partial_amount_line_item_name', 
-			$this->_get_first_event_name_for_payment( $payment ), 
+			$this->_get_first_event_name_for_payment($payment), 
 			$this,
 			$payment
 		);
@@ -322,13 +322,13 @@ 
 	 * @param EEI_Payment $payment
 	 * @return string
 	 */
-	protected function _format_partial_payment_line_item_desc( EEI_Payment $payment ) {
+	protected function _format_partial_payment_line_item_desc(EEI_Payment $payment) {
 		return apply_filters(
 			'FHEE__EE_Gateway___partial_payment_desc',
 			sprintf(
 				__("Payment of %s for %s", "event_espresso"), 
-				$payment->get_pretty( 'PAY_amount', 'no_currency_code' ), 
-				$this->_get_first_event_name_for_payment( $payment ) ),
+				$payment->get_pretty('PAY_amount', 'no_currency_code'), 
+				$this->_get_first_event_name_for_payment($payment) ),
 			$this,
 			$payment
 		);
@@ -340,10 +340,10 @@ 
 	 * @param EEI_Payment $payment
 	 * @return string
 	 */
-	protected function _format_line_item_name( EEI_Line_Item $line_item, EEI_Payment $payment ) {
+	protected function _format_line_item_name(EEI_Line_Item $line_item, EEI_Payment $payment) {
 		return apply_filters( 
 			'FHEE__EE_gateway___line_item_name', 
-			sprintf( _x( '%1$s for %2$s', 'Ticket for Event', 'event_espresso' ), $line_item->name(), $line_item->ticket_event_name() ), 
+			sprintf(_x('%1$s for %2$s', 'Ticket for Event', 'event_espresso'), $line_item->name(), $line_item->ticket_event_name()), 
 			$this,
 			$line_item, 
 			$payment 
@@ -356,7 +356,7 @@ 
 	 * @param EEI_Payment $payment
 	 * @return string
 	 */
-	protected function _format_line_item_desc( EEI_Line_Item $line_item, EEI_Payment $payment ) {
+	protected function _format_line_item_desc(EEI_Line_Item $line_item, EEI_Payment $payment) {
 		return apply_filters( 
 			'FHEE__EE_Gateway___line_item_desc', 
 			$line_item->desc(), 
@@ -371,13 +371,13 @@ 
 	 * @param EEI_Payment $payment
 	 * @return type
 	 */
-	protected function _format_order_description( EEI_Payment $payment ) {
+	protected function _format_order_description(EEI_Payment $payment) {
 		return apply_filters( 
 			'FHEE__EE_Gateway___order_description',
 			sprintf(
 				__('Event Registrations from %1$s for %2$s', "event_espresso"),
 				get_bloginfo('name'),
-				$this->_get_first_event_name_for_payment( $payment ) ),
+				$this->_get_first_event_name_for_payment($payment) ),
 			$this,
 			$payment
 		);

caffeinated/payment_methods/Mijireh/EEG_Mijireh.gateway.php

Spacing +59 added lines, -59 removed lines

@@ -8,7 +8,7 @@ 
  * @author				Mike Nelson
  *
  */
-class EEG_Mijireh extends EE_Offsite_Gateway{
+class EEG_Mijireh extends EE_Offsite_Gateway {
 
 	protected $_access_key;
 
@@ -37,14 +37,14 @@ 
 		$primary_attendee = $primary_registrant->attendee();
 		$items = array();
 		//if we're are charging for the full amount, show the normal line items
-		if( $this->_can_easily_itemize_transaction_for( $payment )){
+		if ($this->_can_easily_itemize_transaction_for($payment)) {
 			$total_line_item = $transaction->total_line_item();
 			$tax_total = $total_line_item->get_total_tax();
-			foreach($total_line_item->get_items() as $line_item){
+			foreach ($total_line_item->get_items() as $line_item) {
 				$items[] = array(
 					'name'=>apply_filters(
 						'FHEE__EEG_Mijireh__set_redirection_info__full_amount_line_item_name',
-						$this->_format_line_item_name( $line_item, $payment ),
+						$this->_format_line_item_name($line_item, $payment),
 						$line_item,
 						$payment,
 						$primary_registrant
@@ -54,13 +54,13 @@ 
 					'quantity'=>$line_item->quantity()
 				);
 			}
-		}else{//its a partial payment
+		} else {//its a partial payment
 			$tax_total = 0;
 			//partial payment, so just add 1 item
 			$items[] = array(
 				'name'=> apply_filters(
 					'FHEE__EEG_Mijireh__set_redirection_info__partial_amount_line_item_name',
-					$this->_format_partial_payment_line_item_name( $payment ),
+					$this->_format_partial_payment_line_item_name($payment),
 					$payment,
 					$primary_registrant
 				),
@@ -72,18 +72,18 @@ 
 		$order = array(
 			'total'=>$this->format_currency($payment->amount()),
 			'return_url'=>$return_url,
-			'items'=>$this->_prepare_for_mijireh( $items ),
+			'items'=>$this->_prepare_for_mijireh($items),
 			'email'=>$primary_attendee->email(),
 			'first_name'=>$primary_attendee->fname(),
 			'last_name'=>$primary_attendee->lname(),
 			'tax'=>$this->format_currency($tax_total),
 			'partner_id'=>'ee');
 		//setup address?
-		if(		$primary_attendee->address()  &&
-				$primary_attendee->city()  &&
-				$primary_attendee->state_ID()  &&
-				$primary_attendee->country_ID()  &&
-				$primary_attendee->zip()  ){
+		if ($primary_attendee->address() &&
+				$primary_attendee->city() &&
+				$primary_attendee->state_ID() &&
+				$primary_attendee->country_ID() &&
+				$primary_attendee->zip()) {
 			$shipping_address = array(
 				'first_name'=>$primary_attendee->fname(),
 				'last_name'=>$primary_attendee->lname(),
@@ -93,62 +93,62 @@ 
 				'zip_code' => $primary_attendee->zip(),
 				'country' => $primary_attendee->country_ID()
 			);
-			if( $primary_attendee->address2() ){
-				$shipping_address[ 'apt_suite' ] = $primary_attendee->address2();
+			if ($primary_attendee->address2()) {
+				$shipping_address['apt_suite'] = $primary_attendee->address2();
 			}
-			if( $primary_attendee->phone() ){
-				$shipping_address[ 'phone' ] = $primary_attendee->phone();
+			if ($primary_attendee->phone()) {
+				$shipping_address['phone'] = $primary_attendee->phone();
 			}
-			$order[ 'shipping_address' ] = $shipping_address;
+			$order['shipping_address'] = $shipping_address;
 		}
-		$order = apply_filters( 'FHEE__EEG_Mijireh__set_redirection_info__order_arguments', $order, $payment, $primary_registrant );
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this)) );
+		$order = apply_filters('FHEE__EEG_Mijireh__set_redirection_info__order_arguments', $order, $payment, $primary_registrant);
+		do_action('AHEE_log', __FILE__, __FUNCTION__, serialize(get_object_vars($this)));
 		$args = array(
 			'headers' => array(
-				'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ),
+				'Authorization' => 'Basic '.base64_encode($this->_access_key.':'),
 				'Accept'=>'application/json'
 			),
 			'body'=>  json_encode($order)
 		);
-		$response = wp_remote_post( $this->_mijireh_api_orders_url, $args );
+		$response = wp_remote_post($this->_mijireh_api_orders_url, $args);
                 $problems_string = false;
-		$this->log(array('get checkout url request_args' => $args, 'response' => $response ), $payment);
-		if( ! $response instanceof WP_Error ){
+		$this->log(array('get checkout url request_args' => $args, 'response' => $response), $payment);
+		if ( ! $response instanceof WP_Error) {
 			$response_body = json_decode($response['body']);
-			if($response_body && isset($response_body->checkout_url)){
+			if ($response_body && isset($response_body->checkout_url)) {
                             $payment->set_redirect_url($response_body->checkout_url);
                             $payment->set_txn_id_chq_nmbr($response_body->order_number);
                             $payment->set_details($response['body']);
 			} else {
-                           if( is_array( $response_body ) || is_object( $response_body)){
-                                    $response_body_as_array = (array)$response_body;
-                                    foreach($response_body_as_array as $problem_parameter => $problems){
-                                            $problems_string.= sprintf(__('\nProblems with %s: %s','event_espresso'),$problem_parameter,implode(", ",$problems));
+                           if (is_array($response_body) || is_object($response_body)) {
+                                    $response_body_as_array = (array) $response_body;
+                                    foreach ($response_body_as_array as $problem_parameter => $problems) {
+                                            $problems_string .= sprintf(__('\nProblems with %s: %s', 'event_espresso'), $problem_parameter, implode(", ", $problems));
                                     }
-                            }else{
+                            } else {
                                     $problems_string = $response['body'];
                             }
-                            if( ! $problems_string ) {
+                            if ( ! $problems_string) {
                                 //no message to show? wack
-                                if( isset( $response[ 'headers' ][ 'status' ] ) ){
-                                        $problems_string = $response[ 'headers' ][ 'status' ];
-                                }else{
-                                        $problems_string = __( 'No response from Mijireh', 'event_espresso' );
+                                if (isset($response['headers']['status'])) {
+                                        $problems_string = $response['headers']['status'];
+                                } else {
+                                        $problems_string = __('No response from Mijireh', 'event_espresso');
                                 }
                             }
                         }
-		}else{
-                    $problems_string = implode( ",", $response->get_error_messages() );
+		} else {
+                    $problems_string = implode(",", $response->get_error_messages());
 		}
                 
-                if( $problems_string ) {
-                    $payment->set_gateway_response( sprintf( __( 'Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string ) );
-                    $payment->set_details( $response );
-                    $payment->set_redirect_url( null );
+                if ($problems_string) {
+                    $payment->set_gateway_response(sprintf(__('Errors occurred communicating with Mijireh: %1$s', 'event_espresso'), $problems_string));
+                    $payment->set_details($response);
+                    $payment->set_redirect_url(null);
                     //even though the payment's status is failed at this point anyways,
                     //let's be explicit about it. The fact that the redirect url is null
                     //should be enough to client code that they can't redirect the user
-                    $payment->set_status( $this->_pay_model->failed_status() );
+                    $payment->set_status($this->_pay_model->failed_status());
                 }
 		return $payment;
 	}
@@ -161,16 +161,16 @@ 
 	 * @param mixed $data
 	 * @return mixed same type as $data
 	 */
-	private function _prepare_for_mijireh( $data ){
-		if( is_array( $data ) ){
+	private function _prepare_for_mijireh($data) {
+		if (is_array($data)) {
 			$prepared_data = array();
-			foreach($data as $key => $datum ){
-				$prepared_data[ $key ] = $this->_prepare_for_mijireh( $datum );
+			foreach ($data as $key => $datum) {
+				$prepared_data[$key] = $this->_prepare_for_mijireh($datum);
 			}
 			return $prepared_data;
-		}elseif(is_string( $data ) ){
-			return str_replace( '%', 'percent', $data );
-		}else{
+		}elseif (is_string($data)) {
+			return str_replace('%', 'percent', $data);
+		} else {
 			return $data;
 		}
 	}
@@ -191,30 +191,30 @@ 
 
 		$payment = $transaction instanceof EEI_Transaction ? $transaction->last_payment() : NULL;
 
-		if ( ! $payment instanceof EEI_Payment ){
-			throw new EE_Error( sprintf( __( "Could not find Mijireh payment for transaction %s", 'event_espresso' ), $transaction->ID() ) );
+		if ( ! $payment instanceof EEI_Payment) {
+			throw new EE_Error(sprintf(__("Could not find Mijireh payment for transaction %s", 'event_espresso'), $transaction->ID()));
 		}
 
 		$request_args = array(
 			'headers' => array(
-				'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ),
+				'Authorization' => 'Basic '.base64_encode($this->_access_key.':'),
 				'Accept'=>'application/json'
 			)
 		);
 
 		$response = wp_remote_get(
-			$this->_mijireh_api_orders_url . '/' . $payment->txn_id_chq_nmbr(),
+			$this->_mijireh_api_orders_url.'/'.$payment->txn_id_chq_nmbr(),
 			$request_args
 		);
 
 		$this->log(
-			array( 'get payment status request_args' => $request_args, 'response' => $response ),
+			array('get payment status request_args' => $request_args, 'response' => $response),
 			$payment
 		);
 		// validate response
-		$response_body = isset( $response[ 'body' ] ) ? json_decode( $response[ 'body' ] ) : '';
-		if( $response && $response_body ){
-			switch( $response_body->status ){
+		$response_body = isset($response['body']) ? json_decode($response['body']) : '';
+		if ($response && $response_body) {
+			switch ($response_body->status) {
 				case 'paid':
 					$payment->set_status($this->_pay_model->approved_status());
 					break;
@@ -226,9 +226,9 @@ 
 			}
 
 		} else {
-			$payment->set_gateway_response( __( 'Response from Mijireh could not be understood.', 'event_espresso' ) );
-			$payment->set_details( $response );
-			$payment->set_status( $this->_pay_model->failed_status() );
+			$payment->set_gateway_response(__('Response from Mijireh could not be understood.', 'event_espresso'));
+			$payment->set_details($response);
+			$payment->set_status($this->_pay_model->failed_status());
 		}
 		// the following is ONLY for testing the Mijireh IPN and should NEVER be uncommented for real usage
 //		$payment->set_status( $this->_pay_model->pending_status() );

caffeinated/payment_methods/Aim/EEG_Aim.gateway.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +45 added lines, -45 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -25,7 +25,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EEG_Aim extends EE_Onsite_Gateway{
+class EEG_Aim extends EE_Onsite_Gateway {
 
 	const LIVE_URL    = 'https://secure2.authorize.net/gateway/transact.dll'; //Authnet URL
 
@@ -157,9 +157,9 @@ 
 	 * @param EEG_Aim $gateway_object
 	 * @return string
 	 */
-	public function possibly_use_deprecated_aim_server( $url, EEG_Aim $gateway_object ) {
-		if(  $gateway_object->_server === 'authorize.net'
-			&& ! $gateway_object->_debug_mode ) {
+	public function possibly_use_deprecated_aim_server($url, EEG_Aim $gateway_object) {
+		if ($gateway_object->_server === 'authorize.net'
+			&& ! $gateway_object->_debug_mode) {
 			return 'https://secure.authorize.net/gateway/transact.dll';
 		} else {
 			return $url;
@@ -182,33 +182,33 @@ 
 	 */
 
 	public function do_direct_payment($payment, $billing_info = null) {
-			add_filter( 'FHEE__EEG_Aim___get_server_url', array( $this, 'possibly_use_deprecated_aim_server' ), 10, 2 );
+			add_filter('FHEE__EEG_Aim___get_server_url', array($this, 'possibly_use_deprecated_aim_server'), 10, 2);
 			// Enable test mode if needed
 			//4007000000027  <-- test successful visa
 			//4222222222222  <-- test failure card number
 
 			$item_num = 1;
 			$transaction = $payment->transaction();
-			$order_description = $this->_format_order_description( $payment );
+			$order_description = $this->_format_order_description($payment);
 			$primary_registrant = $transaction->primary_registration();
 			//if we're are charging for the full amount, show the normal line items
 			//and the itemized total adds up properly
-			if( $this->_can_easily_itemize_transaction_for( $payment ) ){
+			if ($this->_can_easily_itemize_transaction_for($payment)) {
 				$total_line_item = $transaction->total_line_item();
 				foreach ($total_line_item->get_items() as $line_item) {
-					if( $line_item->quantity() == 0 ){
+					if ($line_item->quantity() == 0) {
 						continue;
 					}
 					$this->addLineItem(
 						$item_num++, 
-						$this->_format_line_item_name( $line_item, $payment ), 
-						$this->_format_line_item_desc( $line_item, $payment ), 
+						$this->_format_line_item_name($line_item, $payment), 
+						$this->_format_line_item_desc($line_item, $payment), 
 						$line_item->quantity(),
 						$line_item->unit_price(), 
 						'N');
 					$order_description .= $line_item->desc().', ';
 				}
-				foreach($total_line_item->tax_descendants() as $tax_line_item){
+				foreach ($total_line_item->tax_descendants() as $tax_line_item) {
 					$this->addLineItem($item_num++, $tax_line_item->name(), $tax_line_item->desc(), 1, $tax_line_item->total(), 'N');
 				}
 			}
@@ -219,18 +219,18 @@ 
 			//start transaction
 			//if in debug mode, use authorize.net's sandbox id; otherwise use the Event Espresso partner id
 			$partner_id = $this->_debug_mode ? 'AAA100302' : 'AAA105363';
-			$this->setField( 'solution_id', $partner_id );
+			$this->setField('solution_id', $partner_id);
 			$this->setField('amount', $this->format_currency($payment->amount()));
-			$this->setField('description',substr(rtrim($order_description, ', '), 0, 255));
-			$this->_set_sensitive_billing_data( $billing_info );
+			$this->setField('description', substr(rtrim($order_description, ', '), 0, 255));
+			$this->_set_sensitive_billing_data($billing_info);
 			$this->setField('first_name', $billing_info['first_name']);
 			$this->setField('last_name', $billing_info['last_name']);
 			$this->setField('email', $billing_info['email']);
 			$this->setField('company', $billing_info['company']);
 			$this->setField('address', $billing_info['address'].' '.$billing_info['address2']);
 			$this->setField('city', $billing_info['city']);
-			$this->setField('state', $billing_info['state'] );
-			$this->setField('country', $billing_info['country'] );
+			$this->setField('state', $billing_info['state']);
+			$this->setField('country', $billing_info['country']);
 			$this->setField('zip', $billing_info['zip']);
 			$this->setField('fax', $billing_info['fax']);
 			$this->setField('cust_id', $primary_registrant->ID());
@@ -238,9 +238,9 @@ 
 			//invoice_num would be nice to have it be unique per SPCO page-load, that way if users
 			//press back, they don't submit a duplicate. However, we may be keeping the user on teh same spco page
 			//in which case, we need to generate teh invoice num per request right here...
-			$this->setField('invoice_num', wp_generate_password(12,false));//$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
+			$this->setField('invoice_num', wp_generate_password(12, false)); //$billing_info['_reg-page-billing-invoice-'.$this->_gateway_name]['value']);
 			//tell AIM that any duplicates sent in the next 5 minutes are to be ignored
-            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS );
+            $this->setField('duplicate_window', 5 * MINUTE_IN_SECONDS);
 
 
 			if ($this->_test_transactions) {
@@ -250,7 +250,7 @@ 
 			//Capture response
 			$this->type = "AUTH_CAPTURE";
 			$response = $this->_sendRequest($payment);
-			if (!empty($response)){
+			if ( ! empty($response)) {
 				if ($this->_debug_mode) {
 					$txn_id = $response->invoice_number;
 				} else {
@@ -259,15 +259,15 @@ 
 				$payment_status = $response->approved ? $this->_pay_model->approved_status() : $this->_pay_model->declined_status();
 				$payment->set_status($payment_status);
 				//make sure we interpret the AMT as a float, not an international string (where periods are thousand separators)
-				$payment->set_amount( (float) $response->amount );
-				$payment->set_gateway_response(sprintf("%s (code: %s)",$response->response_reason_text,$response->response_reason_code));
-				$payment->set_txn_id_chq_nmbr( $txn_id );
+				$payment->set_amount((float) $response->amount);
+				$payment->set_gateway_response(sprintf("%s (code: %s)", $response->response_reason_text, $response->response_reason_code));
+				$payment->set_txn_id_chq_nmbr($txn_id);
 				$payment->set_extra_accntng($primary_registrant->reg_code());
-				$payment->set_details(print_r($response,true));
+				$payment->set_details(print_r($response, true));
 			} else {
 				$payment->set_status($this->_pay_model->failed_status());
 				$payment->set_gateway_response(__("There was no response from Authorize.net", 'event_espresso'));
-				$payment->set_details(print_r($response,true));
+				$payment->set_details(print_r($response, true));
 			}
 		return $payment;
 	}
@@ -278,7 +278,7 @@ 
 	 * what billing data gets sent
 	 * @param array $billing_info
 	 */
-	protected function _set_sensitive_billing_data( $billing_info ) {
+	protected function _set_sensitive_billing_data($billing_info) {
 		$this->setField('card_num', $billing_info['credit_card']);
 		$this->setField('exp_date', $billing_info['exp_month'].$billing_info['exp_year']);
 		$this->setField('card_code', $billing_info['cvv']);
@@ -337,22 +337,22 @@ 
 		$this->_x_post_fields['tran_key'] = $this->_transaction_key;
 		$x_keys = array();
 		foreach ($this->_x_post_fields as $key => $value) {
-			$x_keys[] = "x_$key=" . urlencode($value);
+			$x_keys[] = "x_$key=".urlencode($value);
 		}
 		// Add line items
 		foreach ($this->_additional_line_items as $key => $value) {
-			$x_keys[] =  "x_line_item=" . urlencode($value);
+			$x_keys[] = "x_line_item=".urlencode($value);
 		}
 		$this->_log_clean_request($x_keys, $payment);
 		$post_url = $this->_get_server_url();
 		$curl_request = curl_init($post_url);
-		curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&",$x_keys));
+		curl_setopt($curl_request, CURLOPT_POSTFIELDS, implode("&", $x_keys));
 		curl_setopt($curl_request, CURLOPT_HEADER, 0);
 		curl_setopt($curl_request, CURLOPT_TIMEOUT, 45);
 		curl_setopt($curl_request, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($curl_request, CURLOPT_SSL_VERIFYHOST, 2);
 		if ($this->VERIFY_PEER) {
-			curl_setopt($curl_request, CURLOPT_CAINFO, dirname( __DIR__ ) . '/ssl/cert.pem');
+			curl_setopt($curl_request, CURLOPT_CAINFO, dirname(__DIR__).'/ssl/cert.pem');
 		} else {
 			curl_setopt($curl_request, CURLOPT_SSL_VERIFYPEER, false);
 		}
@@ -364,7 +364,7 @@ 
 		$response = curl_exec($curl_request);
 
 		curl_close($curl_request);
-		$response_obj =  new EE_AuthorizeNetAIM_Response($response);
+		$response_obj = new EE_AuthorizeNetAIM_Response($response);
 
 		return $this->_log_and_clean_response($response_obj, $payment);
 	}
@@ -373,18 +373,18 @@ 
 	 * @param array $request_array
 	 * @param EEI_Payment $payment
 	 */
-	protected function _log_clean_request($request_array,$payment){
-		$keys_to_filter_out = array( 'x_card_num', 'x_card_code', 'x_exp_date' );
-		foreach($request_array as $index => $keyvaltogether ) {
-			foreach( $keys_to_filter_out as $key ) {
-				if( strpos( $keyvaltogether, $key ) === 0 ){
+	protected function _log_clean_request($request_array, $payment) {
+		$keys_to_filter_out = array('x_card_num', 'x_card_code', 'x_exp_date');
+		foreach ($request_array as $index => $keyvaltogether) {
+			foreach ($keys_to_filter_out as $key) {
+				if (strpos($keyvaltogether, $key) === 0) {
 					//found it at the first character
 					//so its one of them
-					unset( $request_array[ $index ] );
+					unset($request_array[$index]);
 				}
 			}
 		}
-		$this->log(array('AIM Request sent:'=>$request_array, 'Server URL' => $this->_get_server_url() ),$payment);
+		$this->log(array('AIM Request sent:'=>$request_array, 'Server URL' => $this->_get_server_url()), $payment);
 	}
 
 
@@ -396,9 +396,9 @@ 
 	 * @param EE_Payment                  $payment
 	 * @return \EE_AuthorizeNetAIM_Response
 	 */
-	private function _log_and_clean_response($response_obj,$payment){
+	private function _log_and_clean_response($response_obj, $payment) {
 		$response_obj->account_number = '';
-		$this->log(array('AIM Response received:'=>$response_obj),$payment);
+		$this->log(array('AIM Response received:'=>$response_obj), $payment);
 		return $response_obj;
 	}
 
@@ -497,7 +497,7 @@ 
 			// Split Array
 			$this->response = $response;
 			if ($encap_char) {
-				$this->_response_array = explode($encap_char . $delimiter . $encap_char, substr($response, 1, -1));
+				$this->_response_array = explode($encap_char.$delimiter.$encap_char, substr($response, 1, -1));
 			} else {
 				$this->_response_array = explode($delimiter, $response);
 			}
@@ -567,7 +567,7 @@ 
 			$this->held = ($this->response_code === self::HELD);
 
 			if ($this->error || $this->declined || $this->held) {
-				$this->error_message = '<p><strong class="credit_card_failure">Attention: your transaction was declined for the following reason(s):</strong><br />' . $this->response_reason_text . '<br /><span class="response_code">Response Code: ' . $this->response_code . '<br /></span><span class="response_subcode">Response Subcode: ' . $this->response_subcode . '</span></p><p>To try again, <a href="#payment_options">please click here</a>.</p> ';
+				$this->error_message = '<p><strong class="credit_card_failure">Attention: your transaction was declined for the following reason(s):</strong><br />'.$this->response_reason_text.'<br /><span class="response_code">Response Code: '.$this->response_code.'<br /></span><span class="response_subcode">Response Subcode: '.$this->response_subcode.'</span></p><p>To try again, <a href="#payment_options">please click here</a>.</p> ';
 
 
 				/* $this->error_message = "AuthorizeNet Error:
@@ -586,7 +586,7 @@ 
 
 }
 
-if ( ! class_exists( 'AuthorizeNetException' ) ) {
+if ( ! class_exists('AuthorizeNetException')) {
 	/**
 	 * Class AuthorizeNetException
 	 *
@@ -602,8 +602,8 @@ 
 		 * @param Exception $previous [optional] The previous exception used for the exception chaining. Since 5.3.0
 		 * @since 5.1.0
 		 */
-		public function __construct( $message = "", $code = 0, Exception $previous = null ) {
-			parent::__construct( $message, $code, $previous );
+		public function __construct($message = "", $code = 0, Exception $previous = null) {
+			parent::__construct($message, $code, $previous);
 		}
 	}
 }

core/libraries/shortcodes/EE_Primary_Registration_Details_Shortcodes.lib.php

Spacing +19 added lines, -19 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -45,32 +45,32 @@ 
 			'[PRIMARY_REGISTRANT_ADDRESS2]' => __('Whatever was in the address 2 field for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_CITY]' => __('The city for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_ZIP_PC]' => __('The ZIP (or Postal) Code for the primary registrant for the transaction.', 'event_espresso'),
-			'[PRIMARY_REGISTRANT_ADDRESS_STATE]' => __('The state/province for the primary registrant for the transaction.', 'event_espresso' ),
+			'[PRIMARY_REGISTRANT_ADDRESS_STATE]' => __('The state/province for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_COUNTRY]' => __('The country for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_REGISTRATION_DATE]' => __('The date the registration occured for the primary registration.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' => __('Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso'),
-			'[PRIMARY_REGISTRANT_ANSWER_*]' => __('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this primary registrant, then it will be output in place of this shortcode.', 'event_espresso' )
+			'[PRIMARY_REGISTRANT_ANSWER_*]' => __('This is a special dynamic shortcode.  After the "*", add the exact text of an existing question, and if there is an answer for that question for this primary registrant, then it will be output in place of this shortcode.', 'event_espresso')
 			);
 	}
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$primary_registration = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
-		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
-		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
 
-		if ( ! $primary_registration instanceof EE_Messages_Addressee )
+		if ( ! $primary_registration instanceof EE_Messages_Addressee)
 			return '';
 
 		$attendee = $primary_registration->primary_att_obj;
 		$primary_reg = $primary_registration->primary_reg_obj;
 
-		if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration )
+		if ( ! $attendee instanceof EE_Attendee || ! $primary_reg instanceof EE_Registration)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[PRIMARY_REGISTRANT_FNAME]' :
 				return $attendee->fname();
 				break;
@@ -118,9 +118,9 @@ 
 				break;
 
 			case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration)
 					return '';
-				return $primary_registration->primary_reg_obj->get_i18n_datetime( 'REG_date', get_option( 'date_format' ) );
+				return $primary_registration->primary_reg_obj->get_i18n_datetime('REG_date', get_option('date_format'));
 				break;
 
 			case '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' :
@@ -128,22 +128,22 @@ 
 				break;
 		}
 
-		if ( strpos( $shortcode, '[PRIMARY_REGISTRANT_ANSWER_*' ) !== false ) {
-			$shortcode = str_replace( '[PRIMARY_REGISTRANT_ANSWER_*', '', $shortcode );
-			$shortcode = trim( str_replace( ']', '', $shortcode ) );
+		if (strpos($shortcode, '[PRIMARY_REGISTRANT_ANSWER_*') !== false) {
+			$shortcode = str_replace('[PRIMARY_REGISTRANT_ANSWER_*', '', $shortcode);
+			$shortcode = trim(str_replace(']', '', $shortcode));
 
 
 			//now let's figure out what question has this text
-			if ( empty( $primary_registration->questions ) ) {
+			if (empty($primary_registration->questions)) {
 				return '';
 			}
 
-			foreach ( $primary_registration->questions as $ansid => $question ) {
+			foreach ($primary_registration->questions as $ansid => $question) {
 				if (
-					trim( $question->get( 'QST_display_text' ) ) == trim( $shortcode )
-					&& isset( $primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ] )
+					trim($question->get('QST_display_text')) == trim($shortcode)
+					&& isset($primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid])
 				) {
-					return $primary_registration->registrations[ $primary_reg->ID() ]['ans_objs'][ $ansid ]->get_pretty( 'ANS_value', 'no_wpautop' );
+					return $primary_registration->registrations[$primary_reg->ID()]['ans_objs'][$ansid]->get_pretty('ANS_value', 'no_wpautop');
 				}
 			}
 		}

core/libraries/form_sections/inputs/EE_Country_Select_Input.php

Spacing +14 added lines, -14 removed lines

@@ -1,4 +1,4 @@ 
-<?php  if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit( 'No direct script access allowed' ); }
+<?php  if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
  * Class EE_Country_Select_Input
  *
@@ -11,23 +11,23 @@ 
  * @since 				$VID:$
  *
  */
-class EE_Country_Select_Input extends EE_Select_Input{
+class EE_Country_Select_Input extends EE_Select_Input {
 
 	/**
 	 * @param array $country_options
 	 * @param array $input_settings
 	 * @return EE_Country_Select_Input
 	 */
-	public function __construct( $country_options = NULL, $input_settings = array() ){
+	public function __construct($country_options = NULL, $input_settings = array()) {
 		$country_options = apply_filters(
 			'FHEE__EE_Country_Select_Input____construct__country_options',
-			$this->get_country_answer_options( $country_options ),
+			$this->get_country_answer_options($country_options),
 			$this
 		);
-		$input_settings['html_class'] = isset( $input_settings['html_class'] )
-			? $input_settings['html_class'] . ' ee-country-select-js'
+		$input_settings['html_class'] = isset($input_settings['html_class'])
+			? $input_settings['html_class'].' ee-country-select-js'
 			: 'ee-country-select-js';
-		parent::__construct( $country_options, $input_settings );
+		parent::__construct($country_options, $input_settings);
 	}
 
 
@@ -38,16 +38,16 @@ 
 	 * @param array $country_options
 	 * @return array
 	 */
-	public function get_country_answer_options( $country_options = NULL ){
+	public function get_country_answer_options($country_options = NULL) {
 		// if passed something that is NOT an array
-		if ( ! is_array( $country_options )) {
+		if ( ! is_array($country_options)) {
 			// get possibly cached list of countries
 			$countries = EEM_Country::instance()->get_all_active_countries();
-			if ( ! empty( $countries )) {
-				$country_options[ '' ] = '';
-				foreach( $countries as $country ){
-					if ( $country instanceof EE_Country ) {
-						$country_options[ $country->ID() ] = $country->name();
+			if ( ! empty($countries)) {
+				$country_options[''] = '';
+				foreach ($countries as $country) {
+					if ($country instanceof EE_Country) {
+						$country_options[$country->ID()] = $country->name();
 					}
 				}
 			} else {

core/libraries/form_sections/inputs/EE_State_Select_Input.php

Spacing +12 added lines, -12 removed lines

@@ -6,22 +6,22 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_State_Select_Input extends EE_Select_Input{
+class EE_State_Select_Input extends EE_Select_Input {
 
 	/**
 	 * @param array $state_options
 	 * @param array $input_settings
 	 */
-	function __construct( $state_options, $input_settings = array() ){
+	function __construct($state_options, $input_settings = array()) {
 		$state_options = apply_filters(
 			'FHEE__EE_State_Select_Input____construct__state_options',
-			$this->get_state_answer_options( $state_options ),
+			$this->get_state_answer_options($state_options),
 			$this
 		);
-		$input_settings['html_class'] = isset( $input_settings['html_class'] )
-			? $input_settings['html_class'] . ' ee-state-select-js'
+		$input_settings['html_class'] = isset($input_settings['html_class'])
+			? $input_settings['html_class'].' ee-state-select-js'
 			: 'ee-state-select-js';
-		parent::__construct( $state_options, $input_settings );
+		parent::__construct($state_options, $input_settings);
 	}
 
 
@@ -32,17 +32,17 @@ 
 	 * @param array $state_options
 	 * @return array
 	 */
-	public function get_state_answer_options( $state_options = NULL ){
+	public function get_state_answer_options($state_options = NULL) {
 		// if passed something that is NOT an array
-		if ( ! is_array( $state_options )) {
+		if ( ! is_array($state_options)) {
 			// get possibly cached list of states
 			$states = EEM_State::instance()->get_all_active_states();
-			if ( ! empty( $states )) {
+			if ( ! empty($states)) {
 				//set the default
 				$state_options[''][''] = '';
-				foreach( $states as $state ){
-					if ( $state instanceof EE_State ) {
-						$state_options[ $state->country()->name() ][ $state->ID() ] = $state->name();
+				foreach ($states as $state) {
+					if ($state instanceof EE_State) {
+						$state_options[$state->country()->name()][$state->ID()] = $state->name();
 					}
 				}
 			} else {