eventespresso / event-espresso-core

admin_pages/venues/help_tours/Venues_Edit_Venue_Help_Tour.class.php

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -109,8 +109,8 @@ 
 
 
 	protected function _stop_one() {
-		$content = '<h3>' . __('Edit Venue', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Venue Editor page will provide an overview of the different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Edit Venue', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Venue Editor page will provide an overview of the different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
 		return $content;
 	}
 
@@ -119,35 +119,35 @@ 
 	}
 
 	protected function _venue_editor_stop() {
-		return '<p>' . __('The rich text editor can be used to edit information about your venue. Images and links can also be added or removed along with your text.', 'event_espresso') . '</p>';
+		return '<p>'.__('The rich text editor can be used to edit information about your venue. Images and links can also be added or removed along with your text.', 'event_espresso').'</p>';
 	}
 	
 	protected function _venue_tags_stop() {
-		return '<p>' . __('Quickly edit tags for your venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('Quickly edit tags for your venue.', 'event_espresso').'</p>';
 	}
 
 	protected function _venue_categories_stop() {
-		return '<p>' . __('Venues can also be categorized if you wish.', 'event_espresso') . '</p>';
+		return '<p>'.__('Venues can also be categorized if you wish.', 'event_espresso').'</p>';
 	}
 
 	protected function _venue_physical_location_stop() {
-		return '<p>' . __('Edit the physical address for your venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('Edit the physical address for your venue.', 'event_espresso').'</p>';
 	}
 
 	protected function _venue_gmap_stop() {
-		return '<p>' . __('Enable or disable a Google Map for your venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('Enable or disable a Google Map for your venue.', 'event_espresso').'</p>';
 	}
 
 	protected function _venue_virtual_location_stop() {
-		return '<p>' . __('Setup a virtual location for your venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('Setup a virtual location for your venue.', 'event_espresso').'</p>';
 	}
 	
 	protected function _stop_featured_image() {
-		return '<p>' . __('Set a feature image for your venue here.', 'event_espresso') . '</p>';
+		return '<p>'.__('Set a feature image for your venue here.', 'event_espresso').'</p>';
 	}
 
 	protected function _stop_publish_box() {
-		return '<p>' . __('Easily control the status of your venue. The main options are Published, Pending Review, and Draft.', 'event_espresso') . '</p>';
+		return '<p>'.__('Easily control the status of your venue. The main options are Published, Pending Review, and Draft.', 'event_espresso').'</p>';
 	}
 	
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

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

admin_pages/venues/help_tours/Venues_Overview_Help_Tour.class.php

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -125,44 +125,44 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Venue Overview', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Venues Overview page will provide an overview of the different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Venue Overview', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Venues Overview page will provide an overview of the different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
 		return $content;
 	}
 	
 	protected function _id_stop() {
-		return '<p>' . __('View the venue ID. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the venue ID. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 	
 	protected function _name_stop() {
-		return '<p>' . __('View the name of each venue. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the name of each venue. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 	
 	protected function _address_stop() {
-		return '<p>' . __('View the address for each venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the address for each venue.', 'event_espresso').'</p>';
 	}
 	
 	protected function _city_stop() {
-		return '<p>' . __('View the city for each venue. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the city for each venue. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 	
 	protected function _capacity_stop() {
-		return '<p>' . __('View the capacity for each venue. Can be sorted by ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the capacity for each venue. Can be sorted by ascending or descending order.', 'event_espresso').'</p>';
 	}
 
 	protected function _shortcode_stop() {
-		return '<p>' . __('View the shortcode for a venue. This shortcode can be added to an event, WordPress post, or WordPress page. ', 'event_espresso') . '</p>';
+		return '<p>'.__('View the shortcode for a venue. This shortcode can be added to an event, WordPress post, or WordPress page. ', 'event_espresso').'</p>';
 	}
 
 	protected function _bulk_actions_stop() {
-		return '<p>' . __('Perform bulk actions to multiple venues.', 'event_espresso') . '</p>';
+		return '<p>'.__('Perform bulk actions to multiple venues.', 'event_espresso').'</p>';
 	}
 
 	protected function _search_stop() {
-		return '<p>' . __('Search through venues. The following sources will be searched: Venue Name, Venue Description, Venue Short Description, Venue Address, Venue City, Venue Zip/Postal Code, Venue Phone, Venue URL, Venue Virtual Phone, Venue Google Map link, Event Name, Event Description, Event Phone, and Event External URL.', 'event_espresso') . '</p>';
+		return '<p>'.__('Search through venues. The following sources will be searched: Venue Name, Venue Description, Venue Short Description, Venue Address, Venue City, Venue Zip/Postal Code, Venue Phone, Venue URL, Venue Virtual Phone, Venue Google Map link, Event Name, Event Description, Event Phone, and Event External URL.', 'event_espresso').'</p>';
 	}
 	
 	protected function _new_venue_stop() {
-		return '<p>' . __('Click here to add a new venue.', 'event_espresso') . '</p>';
+		return '<p>'.__('Click here to add a new venue.', 'event_espresso').'</p>';
 	}
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

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

admin_pages/venues/templates/event_venues_metabox_content_from_manager.template.php

Spacing +5 added lines, -5 removed lines

@@ -3,11 +3,11 @@ 
 		<td valign="top" class="use-ven-manager">
 		<label><?php _e('Select from Venue Manager List', 'event_espresso'); ?></label>
 		<?php echo $venue_selector; ?>
-		<?php foreach ( $venues as $venue ) :
+		<?php foreach ($venues as $venue) :
 			$selected = $evt_venue_id == $venue->ID() ? '' : ' style="display:none;"';
-			$edit_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'edit', 'post' => $venue->ID() ), EE_VENUES_ADMIN_URL );
-			$state_name = is_object( $venue->state_obj() ) ? $venue->state_obj()->name() : NULL;
-			$country_name = is_object( $venue->country_obj() ) ? $venue->country_obj()->name() : NULL;
+			$edit_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'edit', 'post' => $venue->ID()), EE_VENUES_ADMIN_URL);
+			$state_name = is_object($venue->state_obj()) ? $venue->state_obj()->name() : NULL;
+			$country_name = is_object($venue->country_obj()) ? $venue->country_obj()->name() : NULL;
 			?>
 			<fieldset id="eebox_<?php echo $venue->ID(); ?>" class="eebox"<?php echo $selected; ?>>
 				<ul class="address-view">
@@ -18,7 +18,7 @@ 
 							<span><?php _e('State:', 'event_espresso'); ?></span> <?php echo $state_name; ?><br />
 							<span><?php _e('Country:', 'event_espresso'); ?></span> <?php echo $country_name; ?><br />
 							<span><?php _e('Venue ID:', 'event_espresso'); ?></span> <?php echo $venue->ID(); ?><br /></p>
-							<!-- <?php printf( __('This venue\'s shortcode: %s[ESPRESSO_VENUE id="%d"]%s', 'event_espresso'), '<strong class="highlight">', $venue->ID(), '</strong>' ); ?><br /> -->
+							<!-- <?php printf(__('This venue\'s shortcode: %s[ESPRESSO_VENUE id="%d"]%s', 'event_espresso'), '<strong class="highlight">', $venue->ID(), '</strong>'); ?><br /> -->
 							<a href="<?php echo $edit_url; ?>" target="_blank"><?php _e('Edit this Venue', 'event_espresso'); ?></a>
 					</li>	
 				</ul>

admin_pages/venues/templates/venue_gmap_metabox_content.template.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 	<tr>
 		<td valign="top">
 			<fieldset>
-				<?php if( isset( EE_Registry::instance()->CFG->map_settings ) && isset( EE_Registry::instance()->CFG->map_settings->use_google_maps ) && EE_Registry::instance()->CFG->map_settings->use_google_maps ) { ?>
+				<?php if (isset(EE_Registry::instance()->CFG->map_settings) && isset(EE_Registry::instance()->CFG->map_settings->use_google_maps) && EE_Registry::instance()->CFG->map_settings->use_google_maps) { ?>
 				<p>
 					<label for="enable_for_gmap">
 						<?php _e('Display Google Map for this venue? ', 'event_espresso') ?>
@@ -14,11 +14,11 @@ 
 					<input type="text" name="vnu_google_map_link" value="<?php echo $vnu_google_map_link; ?>" class="all-options" /> 
 				</p> -->
 				<?php } ?>
-				<?php if( ! isset( EE_Registry::instance()->CFG->map_settings ) || ! isset( EE_Registry::instance()->CFG->map_settings->use_google_maps ) || ! EE_Registry::instance()->CFG->map_settings->use_google_maps ) { ?>
+				<?php if ( ! isset(EE_Registry::instance()->CFG->map_settings) || ! isset(EE_Registry::instance()->CFG->map_settings->use_google_maps) || ! EE_Registry::instance()->CFG->map_settings->use_google_maps) { ?>
 					<p class="ee-notice">
 						<?php
 							echo sprintf( 
-								__('To display a Google Map for event venues, go to %sEvent Espresso General Settings%sGoogle Maps%s, and set "Activate Google Maps" to "Yes"', 'event_espresso' ),
+								__('To display a Google Map for event venues, go to %sEvent Espresso General Settings%sGoogle Maps%s, and set "Activate Google Maps" to "Yes"', 'event_espresso'),
 								'<b>',
 								'</b> &raquo; <b>',
 								'</b>'

caffeinated/payment_methods/Mijireh/EEG_Mijireh.gateway.php

Braces +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
 					'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(
@@ -113,19 +113,19 @@ 
                                     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 ) {
                                 //no message to show? wack
                                 if( isset( $response[ 'headers' ][ 'status' ] ) ){
                                         $problems_string = $response[ 'headers' ][ 'status' ];
-                                }else{
+                                } else{
                                         $problems_string = __( 'No response from Mijireh', 'event_espresso' );
                                 }
                             }
                         }
-		}else{
+		} else{
                     $problems_string = implode( ",", $response->get_error_messages() );
 		}
                 
@@ -156,9 +156,9 @@ 
 				$prepared_data[ $key ] = $this->_prepare_for_mijireh( $datum );
 			}
 			return $prepared_data;
-		}elseif(is_string( $data ) ){
+		} elseif(is_string( $data ) ){
 			return str_replace( '%', 'percent', $data );
-		}else{
+		} else{
 			return $data;
 		}
 	}

Indentation +84 added lines, -84 removed lines

@@ -103,7 +103,7 @@ 
 		}
 		$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 = $this->_get_unsupported_character_remover()->formatArray($order);
+		$order = $this->_get_unsupported_character_remover()->formatArray($order);
 
 		$args = array(
 			'headers' => array(
@@ -113,45 +113,45 @@ 
 			'body'=>  wp_json_encode($order)
 		);
 		$response = wp_remote_post( $this->_mijireh_api_orders_url, $args );
-                $problems_string = false;
+				$problems_string = false;
 		$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)){
-                            $payment->set_redirect_url($response_body->checkout_url);
-                            $payment->set_txn_id_chq_nmbr($response_body->order_number);
-                            $payment->set_details($response['body']);
+							$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));
-                                    }
-                            }else{
-                                    $problems_string = $response['body'];
-                            }
-                            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( 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{
+									$problems_string = $response['body'];
+							}
+							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' );
+								}
+							}
+						}
 		}else{
-                    $problems_string = implode( ",", $response->get_error_messages() );
+					$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 );
-                    //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() );
-                }
+				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() );
+				}
 		return $payment;
 	}
 
@@ -188,70 +188,70 @@ 
 	 * @param array $update_info unused. We just use the $transaction
 	 * @param EEI_Transaction $transaction
 	 * @return \EEI_Payment
-     * @throws EE_Error
+	 * @throws EE_Error
 	 */
 	public function handle_payment_update($update_info, $transaction) {
-        foreach( $transaction->pending_payments() as $payment){
-		    $payment = $this->check_payment_in_mijireh($payment);
-            if( $payment->status() === $this->_pay_model->approved_status()){
-                return $payment;
-            }
-        }
-        $payment = $transaction instanceof EEI_Transaction ? $transaction->last_payment() : NULL;
+		foreach( $transaction->pending_payments() as $payment){
+			$payment = $this->check_payment_in_mijireh($payment);
+			if( $payment->status() === $this->_pay_model->approved_status()){
+				return $payment;
+			}
+		}
+		$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() ) );
-        }
-        return $payment;
+		if ( ! $payment instanceof EEI_Payment ){
+			throw new EE_Error( sprintf( __( "Could not find Mijireh payment for transaction %s", 'event_espresso' ), $transaction->ID() ) );
+		}
+		return $payment;
 	}
 
 
 
-    /**
-     * Checks the payment's status in Mijireh for this specific payment
-     * @param \EEI_Payment $payment
-     * @return \EEI_Payment
-     */
+	/**
+	 * Checks the payment's status in Mijireh for this specific payment
+	 * @param \EEI_Payment $payment
+	 * @return \EEI_Payment
+	 */
 	public function check_payment_in_mijireh( EEI_Payment $payment ){
-        $request_args = array(
-            'headers' => array(
-                'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ),
-                'Accept'=>'application/json'
-            )
-        );
+		$request_args = array(
+			'headers' => array(
+				'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ),
+				'Accept'=>'application/json'
+			)
+		);
 
-        $response = wp_remote_get(
-            $this->_mijireh_api_orders_url . '/' . $payment->txn_id_chq_nmbr(),
-            $request_args
-        );
+		$response = wp_remote_get(
+			$this->_mijireh_api_orders_url . '/' . $payment->txn_id_chq_nmbr(),
+			$request_args
+		);
 
-        $this->log(
-            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 ){
-                case 'paid':
-                    $payment->set_status($this->_pay_model->approved_status());
-                    break;
-                case 'pending':
-                    $payment->set_status($this->_pay_model->pending_status());
-                    break;
-                default:
-                    $payment->set_status($this->_pay_model->declined_status());
-            }
+		$this->log(
+			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 ){
+				case 'paid':
+					$payment->set_status($this->_pay_model->approved_status());
+					break;
+				case 'pending':
+					$payment->set_status($this->_pay_model->pending_status());
+					break;
+				default:
+					$payment->set_status($this->_pay_model->declined_status());
+			}
 
-        } 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() );
-        }
-        // the following is ONLY for testing the Mijireh IPN and should NEVER be uncommented for real usage
+		} 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() );
+		}
+		// 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() );
-        return $payment;
-    }
+		return $payment;
+	}
 
 }
 

Spacing +62 added lines, -62 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,64 +93,64 @@ 
 				'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)));
         $order = $this->_get_unsupported_character_remover()->formatArray($order);
 
 		$args = array(
 			'headers' => array(
-				'Authorization' => 'Basic ' . base64_encode( $this->_access_key . ':' ),
+				'Authorization' => 'Basic '.base64_encode($this->_access_key.':'),
 				'Accept'=>'application/json'
 			),
 			'body'=>  wp_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;
 	}
@@ -163,16 +163,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,16 +191,16 @@ 
      * @throws EE_Error
 	 */
 	public function handle_payment_update($update_info, $transaction) {
-        foreach( $transaction->pending_payments() as $payment){
+        foreach ($transaction->pending_payments() as $payment) {
 		    $payment = $this->check_payment_in_mijireh($payment);
-            if( $payment->status() === $this->_pay_model->approved_status()){
+            if ($payment->status() === $this->_pay_model->approved_status()) {
                 return $payment;
             }
         }
         $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()));
         }
         return $payment;
 	}
@@ -212,27 +212,27 @@ 
      * @param \EEI_Payment $payment
      * @return \EEI_Payment
      */
-	public function check_payment_in_mijireh( EEI_Payment $payment ){
+	public function check_payment_in_mijireh(EEI_Payment $payment) {
         $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;
@@ -244,9 +244,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/Mijireh/templates/mijireh_settings_after_form.template.php

Indentation +6 added lines, -6 removed lines

@@ -1,12 +1,12 @@
 <?php if (!defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
- * mijireh_settings_after_form
- *
- * @package			Event Espresso
- * @subpackage
- * @author				Mike Nelson
- */
+	 * mijireh_settings_after_form
+	 *
+	 * @package			Event Espresso
+	 * @subpackage
+	 * @author				Mike Nelson
+	 */
 do_action('AHEE__EE_Mijireh__settings_end');
 ?><br/><?php
 // End of file mijireh_settings_after_form.template.php
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if (!defined('EVENT_ESPRESSO_VERSION'))
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 /**
  * mijireh_settings_after_form

Braces +2 added lines, -1 removed lines

@@ -1,5 +1,6 @@
-<?php if (!defined('EVENT_ESPRESSO_VERSION'))
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 /**
  * mijireh_settings_after_form
  *

core/db_classes/EE_Export.class.php

Indentation +5 added lines, -5 removed lines

@@ -500,11 +500,11 @@
 					}else{
 						$question_label = sprintf( __( 'Question $s', 'event_espresso' ), $answer_row[ 'Answer.QST_ID' ] );
 					}
-                                        if( isset( $answer_row[ 'Question.QST_type'] ) && $answer_row[ 'Question.QST_type' ] == EEM_Question::QST_type_state ) {
-                                            $reg_csv_array[ $question_label ] = EEM_State::instance()->get_state_name_by_ID( $answer_row[ 'Answer.ANS_value' ] );
-                                        } else {
-                                            $reg_csv_array[ $question_label ] = $this->_prepare_value_from_db_for_display( EEM_Answer::instance(), 'ANS_value', $answer_row[ 'Answer.ANS_value' ] );
-                                        }
+										if( isset( $answer_row[ 'Question.QST_type'] ) && $answer_row[ 'Question.QST_type' ] == EEM_Question::QST_type_state ) {
+											$reg_csv_array[ $question_label ] = EEM_State::instance()->get_state_name_by_ID( $answer_row[ 'Answer.ANS_value' ] );
+										} else {
+											$reg_csv_array[ $question_label ] = $this->_prepare_value_from_db_for_display( EEM_Answer::instance(), 'ANS_value', $answer_row[ 'Answer.ANS_value' ] );
+										}
 				}
 				$registrations_csv_ready_array[] = apply_filters( 'FHEE__EE_Export__report_registrations__reg_csv_array', $reg_csv_array, $reg_row );
 			}

Spacing +170 added lines, -170 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 /**
  * EE_Export class
  * 
@@ -39,11 +39,11 @@ 
 	  * @access private
 	  * @param array $request_data
 	  */
- 	private function __construct( $request_data = array() ) {
+ 	private function __construct($request_data = array()) {
 		$this->_req_data = $request_data;
-		$this->today = date("Y-m-d",time());
-		require_once( EE_CLASSES . 'EE_CSV.class.php' );
-		$this->EE_CSV= EE_CSV::instance();
+		$this->today = date("Y-m-d", time());
+		require_once(EE_CLASSES.'EE_CSV.class.php');
+		$this->EE_CSV = EE_CSV::instance();
 	}
 
 
@@ -55,10 +55,10 @@ 
 	  * @param array $request_data
 	  * @return \EE_Export
 	  */
-	public static function instance( $request_data = array() ) {
+	public static function instance($request_data = array()) {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Export )) {
-			self::$_instance = new self( $request_data );
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Export)) {
+			self::$_instance = new self($request_data);
 		}
 		return self::$_instance;
 	}
@@ -72,15 +72,15 @@ 
 	public function export() {
 
 		// in case of bulk exports, the "actual" action will be in action2, but first check regular action for "export" keyword
-		if ( isset( $this->_req_data['action'] ) && strpos( $this->_req_data['action'], 'export' ) === FALSE ) {
+		if (isset($this->_req_data['action']) && strpos($this->_req_data['action'], 'export') === FALSE) {
 			// check if action2 has export action
-			if ( isset( $this->_req_data['action2'] ) && strpos( $this->_req_data['action2'], 'export' ) !== FALSE ) {
+			if (isset($this->_req_data['action2']) && strpos($this->_req_data['action2'], 'export') !== FALSE) {
 				// whoop! there it is!
 				$this->_req_data['action'] = $this->_req_data['action2'];
 			}
 		}
 
-		$this->_req_data['export'] = isset( $this->_req_data['export'] ) ? $this->_req_data['export'] : '';
+		$this->_req_data['export'] = isset($this->_req_data['export']) ? $this->_req_data['export'] : '';
 
 		switch ($this->_req_data['export']) {
 			case 'report':
@@ -94,7 +94,7 @@ 
 					break;
 
 					case 'registrations_report_for_event':
-						$this->report_registrations_for_event( $this->_req_data['EVT_ID'] );
+						$this->report_registrations_for_event($this->_req_data['EVT_ID']);
 					break;
 
 					case 'attendees':
@@ -106,7 +106,7 @@ 
 					break;
 
 					default:
-						EE_Error::add_error(__('An error occurred! The requested export report could not be found.','event_espresso'), __FILE__, __FUNCTION__, __LINE__ ) ;
+						EE_Error::add_error(__('An error occurred! The requested export report could not be found.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 						return FALSE;
 					break;
 
@@ -124,7 +124,7 @@ 
 	 * Downloads a CSV file with all the columns, but no data. This should be used for importing
 	 * @return null kills execution
 	 */
-	function export_sample(){
+	function export_sample() {
 		$event = EEM_Event::instance()->get_one();
 		$this->_req_data['EVT_ID'] = $event->ID();
 		$this->export_all_event_data();
@@ -150,23 +150,23 @@ 
 		$state_country_query_params = array();
 		$question_group_query_params = array();
 		$question_query_params = array();
-		if ( isset( $this->_req_data['EVT_ID'] )) {
+		if (isset($this->_req_data['EVT_ID'])) {
 			// do we have an array of IDs ?
 
-			if ( is_array( $this->_req_data['EVT_ID'] )) {
-				$EVT_IDs =  array_map( 'sanitize_text_field', $this->_req_data['EVT_ID'] );
-				$value_to_equal = array('IN',$EVT_IDs);
+			if (is_array($this->_req_data['EVT_ID'])) {
+				$EVT_IDs = array_map('sanitize_text_field', $this->_req_data['EVT_ID']);
+				$value_to_equal = array('IN', $EVT_IDs);
 				$filename = 'events';
 			} else {
 				// generate regular where = clause
-				$EVT_ID = absint( $this->_req_data['EVT_ID'] );
+				$EVT_ID = absint($this->_req_data['EVT_ID']);
 				$value_to_equal = $EVT_ID;
 				$event = EE_Registry::instance()->load_model('Event')->get_one_by_ID($EVT_ID);
 
-				$filename = 'event-' . ( $event instanceof EE_Event ? $event->slug() : __( 'unknown', 'event_espresso' ) );
+				$filename = 'event-'.($event instanceof EE_Event ? $event->slug() : __('unknown', 'event_espresso'));
 
 			}
-			$event_query_params[0]['EVT_ID'] =$value_to_equal;
+			$event_query_params[0]['EVT_ID'] = $value_to_equal;
 			$related_models_query_params[0]['Event.EVT_ID'] = $value_to_equal;
 			$related_through_reg_query_params[0]['Registration.EVT_ID'] = $value_to_equal;
 			$datetime_ticket_query_params[0]['Datetime.EVT_ID'] = $value_to_equal;
@@ -210,42 +210,42 @@ 
 
 			);
 
-		$model_data = $this->_get_export_data_for_models( $models_to_export );
+		$model_data = $this->_get_export_data_for_models($models_to_export);
 
-		$filename = $this->generate_filename ( $filename );
+		$filename = $this->generate_filename($filename);
 
-		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename, $model_data )) {
-			EE_Error::add_error(__("'An error occurred and the Event details could not be exported from the database.'", "event_espresso"), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv($filename, $model_data)) {
+			EE_Error::add_error(__("'An error occurred and the Event details could not be exported from the database.'", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
-	function report_attendees(){
+	function report_attendees() {
 		$attendee_rows = EEM_Attendee::instance()->get_all_wpdb_results( 
 			array( 
-				'force_join' => array( 'State', 'Country' ), 
+				'force_join' => array('State', 'Country'), 
 				'caps' => EEM_Base::caps_read_admin 
 			) 
 		);
 		$csv_data = array();
-		foreach( $attendee_rows as $attendee_row ){
+		foreach ($attendee_rows as $attendee_row) {
 			$csv_row = array();
-			foreach( EEM_Attendee::instance()->field_settings() as $field_name => $field_obj ){
-				if( $field_name == 'STA_ID' ){
-					$state_name_field = EEM_State::instance()->field_settings_for( 'STA_name' );
-					$csv_row[ __( 'State', 'event_espresso' ) ] = $attendee_row[ $state_name_field->get_qualified_column() ];
-				}elseif( $field_name == 'CNT_ISO' ){
-					$country_name_field = EEM_Country::instance()->field_settings_for( 'CNT_name' );
-					$csv_row[ __( 'Country', 'event_espresso' ) ] = $attendee_row[ $country_name_field->get_qualified_column() ];
-				}else{
-					$csv_row[ $field_obj->get_nicename() ] = $attendee_row[ $field_obj->get_qualified_column() ];
+			foreach (EEM_Attendee::instance()->field_settings() as $field_name => $field_obj) {
+				if ($field_name == 'STA_ID') {
+					$state_name_field = EEM_State::instance()->field_settings_for('STA_name');
+					$csv_row[__('State', 'event_espresso')] = $attendee_row[$state_name_field->get_qualified_column()];
+				}elseif ($field_name == 'CNT_ISO') {
+					$country_name_field = EEM_Country::instance()->field_settings_for('CNT_name');
+					$csv_row[__('Country', 'event_espresso')] = $attendee_row[$country_name_field->get_qualified_column()];
+				} else {
+					$csv_row[$field_obj->get_nicename()] = $attendee_row[$field_obj->get_qualified_column()];
 				}
 			}
 			$csv_data[] = $csv_row;
 		}
 
-		$filename = $this->generate_filename ( 'contact-list-report' );
+		$filename = $this->generate_filename('contact-list-report');
 
-		$handle = $this->EE_CSV->begin_sending_csv( $filename);
+		$handle = $this->EE_CSV->begin_sending_csv($filename);
 		$this->EE_CSV->write_data_array_to_csv($handle, $csv_data);
 		$this->EE_CSV->end_sending_csv($handle);
 	}
@@ -262,18 +262,18 @@ 
 		$countries_that_have_an_attendee = EEM_Country::instance()->get_all(array(0=>array('Attendee.ATT_ID'=>array('IS NOT NULL'))));
 //		$states_to_export_query_params
 		$models_to_export = array(
-			'Country'=>array(array('CNT_ISO'=>array('IN',array_keys($countries_that_have_an_attendee)))),
-			'State'=>array(array('STA_ID'=>array('IN',array_keys($states_that_have_an_attendee)))),
+			'Country'=>array(array('CNT_ISO'=>array('IN', array_keys($countries_that_have_an_attendee)))),
+			'State'=>array(array('STA_ID'=>array('IN', array_keys($states_that_have_an_attendee)))),
 			'Attendee'=>array(),
 		);
 
 
 
-		$model_data = $this->_get_export_data_for_models( $models_to_export );
-		$filename = $this->generate_filename ( 'all-attendees' );
+		$model_data = $this->_get_export_data_for_models($models_to_export);
+		$filename = $this->generate_filename('all-attendees');
 
-		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename, $model_data )) {
-			EE_Error::add_error(__('An error occurred and the Attendee data could not be exported from the database.','event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv($filename, $model_data)) {
+			EE_Error::add_error(__('An error occurred and the Attendee data could not be exported from the database.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -285,19 +285,19 @@ 
 	 * @param boolean|string $pretty_schema true to display pretty, a string to use a specific "Schema", or false to NOT display pretty
 	 * @return string
 	 */
-	protected function _prepare_value_from_db_for_display( $model, $field_name,  $raw_db_value, $pretty_schema = true ) {
-		$field_obj = $model->field_settings_for( $field_name );
-		$value_on_model_obj = $field_obj->prepare_for_set_from_db( $raw_db_value );
-		if( $field_obj instanceof EE_Datetime_Field ) {
-			$field_obj->set_date_format( EE_CSV::instance()->get_date_format_for_csv( $field_obj->get_date_format( $pretty_schema ) ), $pretty_schema );
-			$field_obj->set_time_format( EE_CSV::instance()->get_time_format_for_csv( $field_obj->get_time_format( $pretty_schema ) ), $pretty_schema );
+	protected function _prepare_value_from_db_for_display($model, $field_name, $raw_db_value, $pretty_schema = true) {
+		$field_obj = $model->field_settings_for($field_name);
+		$value_on_model_obj = $field_obj->prepare_for_set_from_db($raw_db_value);
+		if ($field_obj instanceof EE_Datetime_Field) {
+			$field_obj->set_date_format(EE_CSV::instance()->get_date_format_for_csv($field_obj->get_date_format($pretty_schema)), $pretty_schema);
+			$field_obj->set_time_format(EE_CSV::instance()->get_time_format_for_csv($field_obj->get_time_format($pretty_schema)), $pretty_schema);
 		}
-		if( $pretty_schema === true){
-			return $field_obj->prepare_for_pretty_echoing( $value_on_model_obj );
-		}elseif( is_string( $pretty_schema ) ) {
-			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema );
-		}else{
-			return $field_obj->prepare_for_get( $value_on_model_obj );
+		if ($pretty_schema === true) {
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj);
+		}elseif (is_string($pretty_schema)) {
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema);
+		} else {
+			return $field_obj->prepare_for_get($value_on_model_obj);
 		}
 	}
 
@@ -306,7 +306,7 @@ 
 	 * and the questions associated with the registrations
 	 * @param int $event_id
 	 */
-	function report_registrations_for_event( $event_id = NULL ){
+	function report_registrations_for_event($event_id = NULL) {
 		$reg_fields_to_include = array(
 				'TXN_ID',
 				'ATT_ID',
@@ -338,126 +338,126 @@ 
 				array(
 					'OR' => array(
 						//don't include registrations from failed or abandoned transactions...
-						'Transaction.STS_ID' => array( 'NOT IN', array( EEM_Transaction::failed_status_code, EEM_Transaction::abandoned_status_code ) ),
+						'Transaction.STS_ID' => array('NOT IN', array(EEM_Transaction::failed_status_code, EEM_Transaction::abandoned_status_code)),
 						//unless the registration is approved, in which case include it regardless of transaction status
 						'STS_ID' => EEM_Registration::status_id_approved
 						),
-					'Ticket.TKT_deleted' => array( 'IN', array( true, false ) )
+					'Ticket.TKT_deleted' => array('IN', array(true, false))
 					),
-				'order_by' => array('Transaction.TXN_ID'=>'asc','REG_count'=>'asc'),
-				'force_join' => array( 'Transaction', 'Ticket', 'Attendee' ),
+				'order_by' => array('Transaction.TXN_ID'=>'asc', 'REG_count'=>'asc'),
+				'force_join' => array('Transaction', 'Ticket', 'Attendee'),
 				'caps' => EEM_Base::caps_read_admin
 			),
 			$event_id
 		);
-		if( $event_id ){
-			$query_params[0]['EVT_ID'] =  $event_id;
-		}else{
-			$query_params[ 'force_join' ][] = 'Event';
+		if ($event_id) {
+			$query_params[0]['EVT_ID'] = $event_id;
+		} else {
+			$query_params['force_join'][] = 'Event';
 		}
-		$registration_rows = $reg_model->get_all_wpdb_results( $query_params );
+		$registration_rows = $reg_model->get_all_wpdb_results($query_params);
 		//get all questions which relate to someone in this group
 		$registration_ids = array();
-		foreach( $registration_rows as $reg_row ) {
-			$registration_ids[] = intval( $reg_row[ 'Registration.REG_ID'] );
+		foreach ($registration_rows as $reg_row) {
+			$registration_ids[] = intval($reg_row['Registration.REG_ID']);
 		}
 //		EEM_Question::instance()->show_next_x_db_queries();
-		$questions_for_these_regs_rows = EEM_Question::instance()->get_all_wpdb_results(array(array('Answer.REG_ID'=>array('IN',$registration_ids))));
-		foreach($registration_rows as $reg_row){
-			if ( is_array( $reg_row ) ) {
+		$questions_for_these_regs_rows = EEM_Question::instance()->get_all_wpdb_results(array(array('Answer.REG_ID'=>array('IN', $registration_ids))));
+		foreach ($registration_rows as $reg_row) {
+			if (is_array($reg_row)) {
 				$reg_csv_array = array();
-				if( ! $event_id ){
+				if ( ! $event_id) {
 					//get the event's name and Id
-					$reg_csv_array[ __( 'Event', 'event_espresso' ) ] = sprintf( __( '%1$s (%2$s)', 'event_espresso' ), $this->_prepare_value_from_db_for_display( EEM_Event::instance(), 'EVT_name', $reg_row[ 'Event_CPT.post_title'] ), $reg_row[ 'Event_CPT.ID' ] );
+					$reg_csv_array[__('Event', 'event_espresso')] = sprintf(__('%1$s (%2$s)', 'event_espresso'), $this->_prepare_value_from_db_for_display(EEM_Event::instance(), 'EVT_name', $reg_row['Event_CPT.post_title']), $reg_row['Event_CPT.ID']);
 				}
-				$is_primary_reg = $reg_row[ 'Registration.REG_count' ] == '1' ? true : false;
+				$is_primary_reg = $reg_row['Registration.REG_count'] == '1' ? true : false;
 				/*@var $reg_row EE_Registration */
-				foreach($reg_fields_to_include as $field_name){
+				foreach ($reg_fields_to_include as $field_name) {
 					$field = $reg_model->field_settings_for($field_name);
-					if($field_name == 'REG_final_price'){
-						$value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ 'Registration.REG_final_price'], 'localized_float' );
-					}elseif( $field_name == 'REG_count' ){
-						$value = sprintf( __( '%s of %s', 'event_espresso' ), $this->_prepare_value_from_db_for_display( $reg_model, 'REG_count', $reg_row['Registration.REG_count'] ), $this->_prepare_value_from_db_for_display( $reg_model, 'REG_group_size', $reg_row['Registration.REG_group_size' ] ) );
-					}elseif( $field_name == 'REG_date' ) {
-						$value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ 'Registration.REG_date'], 'no_html' );
-					}else{
-						$value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ $field->get_qualified_column() ] );
+					if ($field_name == 'REG_final_price') {
+						$value = $this->_prepare_value_from_db_for_display($reg_model, $field_name, $reg_row['Registration.REG_final_price'], 'localized_float');
+					}elseif ($field_name == 'REG_count') {
+						$value = sprintf(__('%s of %s', 'event_espresso'), $this->_prepare_value_from_db_for_display($reg_model, 'REG_count', $reg_row['Registration.REG_count']), $this->_prepare_value_from_db_for_display($reg_model, 'REG_group_size', $reg_row['Registration.REG_group_size']));
+					}elseif ($field_name == 'REG_date') {
+						$value = $this->_prepare_value_from_db_for_display($reg_model, $field_name, $reg_row['Registration.REG_date'], 'no_html');
+					} else {
+						$value = $this->_prepare_value_from_db_for_display($reg_model, $field_name, $reg_row[$field->get_qualified_column()]);
 					}
 					$reg_csv_array[$this->_get_column_name_for_field($field)] = $value;
-					if($field_name == 'REG_final_price'){
+					if ($field_name == 'REG_final_price') {
 						//add a column named Currency after the final price
 						$reg_csv_array[__("Currency", "event_espresso")] = EE_Config::instance()->currency->code;
 					}
 				}
 				//get pretty status
-				$stati = EEM_Status::instance()->localized_status( array(
-					$reg_row[ 'Registration.STS_ID' ] => __( 'unknown', 'event_espresso' ),
-					$reg_row[ 'TransactionTable.STS_ID' ] => __( 'unknown', 'event_espresso' ) ),
+				$stati = EEM_Status::instance()->localized_status(array(
+					$reg_row['Registration.STS_ID'] => __('unknown', 'event_espresso'),
+					$reg_row['TransactionTable.STS_ID'] => __('unknown', 'event_espresso') ),
 						FALSE,
-						'sentence' );
-				$reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[ $reg_row[ 'Registration.STS_ID' ] ];
+						'sentence');
+				$reg_csv_array[__("Registration Status", 'event_espresso')] = $stati[$reg_row['Registration.STS_ID']];
 				//get pretty trnasaction status
-				$reg_csv_array[__("Transaction Status", 'event_espresso')] = $stati[ $reg_row[ 'TransactionTable.STS_ID' ] ];
-				$reg_csv_array[ __( 'Transaction Amount Due', 'event_espresso' ) ] = $is_primary_reg ? $this->_prepare_value_from_db_for_display( EEM_Transaction::instance(), 'TXN_total', $reg_row[ 'TransactionTable.TXN_total' ], 'localized_float' ) : '0.00';
-				$reg_csv_array[ __( 'Amount Paid', 'event_espresso' )] = $is_primary_reg ? $this->_prepare_value_from_db_for_display( EEM_Transaction::instance(), 'TXN_paid', $reg_row[ 'TransactionTable.TXN_paid' ], 'localized_float' ) : '0.00';
+				$reg_csv_array[__("Transaction Status", 'event_espresso')] = $stati[$reg_row['TransactionTable.STS_ID']];
+				$reg_csv_array[__('Transaction Amount Due', 'event_espresso')] = $is_primary_reg ? $this->_prepare_value_from_db_for_display(EEM_Transaction::instance(), 'TXN_total', $reg_row['TransactionTable.TXN_total'], 'localized_float') : '0.00';
+				$reg_csv_array[__('Amount Paid', 'event_espresso')] = $is_primary_reg ? $this->_prepare_value_from_db_for_display(EEM_Transaction::instance(), 'TXN_paid', $reg_row['TransactionTable.TXN_paid'], 'localized_float') : '0.00';
 				$payment_methods = array();
 				$gateway_txn_ids_etc = array();
 				$payment_times = array();
-				if( $is_primary_reg && $reg_row[ 'TransactionTable.TXN_ID' ] ){
+				if ($is_primary_reg && $reg_row['TransactionTable.TXN_ID']) {
 					$payments_info = EEM_Payment::instance()->get_all_wpdb_results(
 							array(
 								array(
-									'TXN_ID' => $reg_row[ 'TransactionTable.TXN_ID' ],
+									'TXN_ID' => $reg_row['TransactionTable.TXN_ID'],
 									'STS_ID' => EEM_Payment::status_id_approved
 								),
-								'force_join' => array( 'Payment_Method' ),
+								'force_join' => array('Payment_Method'),
 
 							),
 							ARRAY_A,
 							'Payment_Method.PMD_admin_name as name, Payment.PAY_txn_id_chq_nmbr as gateway_txn_id, Payment.PAY_timestamp as payment_time' );
 
-					foreach( $payments_info as $payment_method_and_gateway_txn_id ){
-						$payment_methods[] = isset( $payment_method_and_gateway_txn_id[ 'name' ] ) ? $payment_method_and_gateway_txn_id[ 'name' ] : __( 'Unknown', 'event_espresso' );
-						$gateway_txn_ids_etc[] = isset( $payment_method_and_gateway_txn_id[ 'gateway_txn_id' ] ) ? $payment_method_and_gateway_txn_id[ 'gateway_txn_id' ] : '';
-						$payment_times[] = isset( $payment_method_and_gateway_txn_id[ 'payment_time' ] ) ? $payment_method_and_gateway_txn_id[ 'payment_time' ] : '';
+					foreach ($payments_info as $payment_method_and_gateway_txn_id) {
+						$payment_methods[] = isset($payment_method_and_gateway_txn_id['name']) ? $payment_method_and_gateway_txn_id['name'] : __('Unknown', 'event_espresso');
+						$gateway_txn_ids_etc[] = isset($payment_method_and_gateway_txn_id['gateway_txn_id']) ? $payment_method_and_gateway_txn_id['gateway_txn_id'] : '';
+						$payment_times[] = isset($payment_method_and_gateway_txn_id['payment_time']) ? $payment_method_and_gateway_txn_id['payment_time'] : '';
 					}
 
 				}
-				$reg_csv_array[ __( 'Payment Date(s)', 'event_espresso' ) ] = implode( ',', $payment_times );
-				$reg_csv_array[ __( 'Payment Method(s)', 'event_espresso' ) ] = implode( ",", $payment_methods );
-				$reg_csv_array[ __( 'Gateway Transaction ID(s)', 'event_espresso' )] = implode( ',', $gateway_txn_ids_etc );
+				$reg_csv_array[__('Payment Date(s)', 'event_espresso')] = implode(',', $payment_times);
+				$reg_csv_array[__('Payment Method(s)', 'event_espresso')] = implode(",", $payment_methods);
+				$reg_csv_array[__('Gateway Transaction ID(s)', 'event_espresso')] = implode(',', $gateway_txn_ids_etc);
 
 				//get whether or not the user has checked in
-				$reg_csv_array[__("Check-Ins", "event_espresso")] = $reg_model->count_related( $reg_row[ 'Registration.REG_ID'] , 'Checkin' );
+				$reg_csv_array[__("Check-Ins", "event_espresso")] = $reg_model->count_related($reg_row['Registration.REG_ID'], 'Checkin');
 				//get ticket of registration and its price
 				$ticket_model = EE_Registry::instance()->load_model('Ticket');
-				if( $reg_row[ 'Ticket.TKT_ID'] ) {
-					$ticket_name = $this->_prepare_value_from_db_for_display( $ticket_model, 'TKT_name', $reg_row[ 'Ticket.TKT_name' ] );
+				if ($reg_row['Ticket.TKT_ID']) {
+					$ticket_name = $this->_prepare_value_from_db_for_display($ticket_model, 'TKT_name', $reg_row['Ticket.TKT_name']);
 					$datetimes_strings = array();
-					foreach( EEM_Datetime::instance()->get_all_wpdb_results( array( array( 'Ticket.TKT_ID' => $reg_row[ 'Ticket.TKT_ID' ] ), 'order_by' => array( 'DTT_EVT_start' => 'ASC' ), 'default_where_conditions' => 'none' ) ) as $datetime){
-						$datetimes_strings[] = $this->_prepare_value_from_db_for_display( EEM_Datetime::instance(), 'DTT_EVT_start', $datetime[ 'Datetime.DTT_EVT_start'] );
+					foreach (EEM_Datetime::instance()->get_all_wpdb_results(array(array('Ticket.TKT_ID' => $reg_row['Ticket.TKT_ID']), 'order_by' => array('DTT_EVT_start' => 'ASC'), 'default_where_conditions' => 'none')) as $datetime) {
+						$datetimes_strings[] = $this->_prepare_value_from_db_for_display(EEM_Datetime::instance(), 'DTT_EVT_start', $datetime['Datetime.DTT_EVT_start']);
 					}
 
 				} else {
-					$ticket_name = __( 'Unknown', 'event_espresso' );
-					$datetimes_strings = array( __( 'Unknown', 'event_espresso' ) );
+					$ticket_name = __('Unknown', 'event_espresso');
+					$datetimes_strings = array(__('Unknown', 'event_espresso'));
 				}
 				$reg_csv_array[$ticket_model->field_settings_for('TKT_name')->get_nicename()] = $ticket_name;
 				$reg_csv_array[__("Datetimes of Ticket", "event_espresso")] = implode(", ", $datetimes_strings);
 				//get datetime(s) of registration
 
 				//add attendee columns
-				foreach($att_fields_to_include as $att_field_name){
+				foreach ($att_fields_to_include as $att_field_name) {
 					$field_obj = EEM_Attendee::instance()->field_settings_for($att_field_name);
-					if( $reg_row[ 'Attendee_CPT.ID' ]){
-						if($att_field_name == 'STA_ID'){
-							$value = EEM_State::instance()->get_var( array( array( 'STA_ID' => $reg_row[ 'Attendee_Meta.STA_ID' ] ) ), 'STA_name' );
-						}elseif($att_field_name == 'CNT_ISO'){
-							$value = EEM_Country::instance()->get_var( array( array( 'CNT_ISO' => $reg_row[ 'Attendee_Meta.CNT_ISO' ] ) ), 'CNT_name' );
-						}else{
-							$value = $this->_prepare_value_from_db_for_display( EEM_Attendee::instance(), $att_field_name, $reg_row[ $field_obj->get_qualified_column() ] );
+					if ($reg_row['Attendee_CPT.ID']) {
+						if ($att_field_name == 'STA_ID') {
+							$value = EEM_State::instance()->get_var(array(array('STA_ID' => $reg_row['Attendee_Meta.STA_ID'])), 'STA_name');
+						}elseif ($att_field_name == 'CNT_ISO') {
+							$value = EEM_Country::instance()->get_var(array(array('CNT_ISO' => $reg_row['Attendee_Meta.CNT_ISO'])), 'CNT_name');
+						} else {
+							$value = $this->_prepare_value_from_db_for_display(EEM_Attendee::instance(), $att_field_name, $reg_row[$field_obj->get_qualified_column()]);
 						}
-					}else{
+					} else {
 						$value = '';
 					}
 
@@ -465,56 +465,56 @@ 
 				}
 
 				//make sure each registration has the same questions in the same order
-				foreach($questions_for_these_regs_rows as $question_row){
-					if( ! isset($reg_csv_array[$question_row[ 'Question.QST_admin_label']])){
-						$reg_csv_array[$question_row[ 'Question.QST_admin_label' ] ] = null;
+				foreach ($questions_for_these_regs_rows as $question_row) {
+					if ( ! isset($reg_csv_array[$question_row['Question.QST_admin_label']])) {
+						$reg_csv_array[$question_row['Question.QST_admin_label']] = null;
 					}
 				}
 				//now fill out the questions THEY answered
-				foreach( EEM_Answer::instance()->get_all_wpdb_results( array( array( 'REG_ID' => $reg_row[ 'Registration.REG_ID' ] ), 'force_join' => array( 'Question' ) ) ) as $answer_row){
+				foreach (EEM_Answer::instance()->get_all_wpdb_results(array(array('REG_ID' => $reg_row['Registration.REG_ID']), 'force_join' => array('Question'))) as $answer_row) {
 					/* @var $answer EE_Answer */
-					if( $answer_row[ 'Question.QST_ID' ] ){
-						$question_label = $this->_prepare_value_from_db_for_display( EEM_Question::instance(), 'QST_admin_label', $answer_row[ 'Question.QST_admin_label' ] );
-					}else{
-						$question_label = sprintf( __( 'Question $s', 'event_espresso' ), $answer_row[ 'Answer.QST_ID' ] );
+					if ($answer_row['Question.QST_ID']) {
+						$question_label = $this->_prepare_value_from_db_for_display(EEM_Question::instance(), 'QST_admin_label', $answer_row['Question.QST_admin_label']);
+					} else {
+						$question_label = sprintf(__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
 					}
-                                        if( isset( $answer_row[ 'Question.QST_type'] ) && $answer_row[ 'Question.QST_type' ] == EEM_Question::QST_type_state ) {
-                                            $reg_csv_array[ $question_label ] = EEM_State::instance()->get_state_name_by_ID( $answer_row[ 'Answer.ANS_value' ] );
+                                        if (isset($answer_row['Question.QST_type']) && $answer_row['Question.QST_type'] == EEM_Question::QST_type_state) {
+                                            $reg_csv_array[$question_label] = EEM_State::instance()->get_state_name_by_ID($answer_row['Answer.ANS_value']);
                                         } else {
-                                            $reg_csv_array[ $question_label ] = $this->_prepare_value_from_db_for_display( EEM_Answer::instance(), 'ANS_value', $answer_row[ 'Answer.ANS_value' ] );
+                                            $reg_csv_array[$question_label] = $this->_prepare_value_from_db_for_display(EEM_Answer::instance(), 'ANS_value', $answer_row['Answer.ANS_value']);
                                         }
 				}
-				$registrations_csv_ready_array[] = apply_filters( 'FHEE__EE_Export__report_registrations__reg_csv_array', $reg_csv_array, $reg_row );
+				$registrations_csv_ready_array[] = apply_filters('FHEE__EE_Export__report_registrations__reg_csv_array', $reg_csv_array, $reg_row);
 			}
 		}
 
 		//if we couldn't export anything, we want to at least show the column headers
-		if(empty($registrations_csv_ready_array)){
+		if (empty($registrations_csv_ready_array)) {
 			$reg_csv_array = array();
 			$model_and_fields_to_include = array(
 				'Registration' => $reg_fields_to_include,
 				'Attendee' => $att_fields_to_include
 			);
-			foreach($model_and_fields_to_include as $model_name => $field_list){
+			foreach ($model_and_fields_to_include as $model_name => $field_list) {
 				$model = EE_Registry::instance()->load_model($model_name);
-				foreach($field_list as $field_name){
+				foreach ($field_list as $field_name) {
 					$field = $model->field_settings_for($field_name);
-					$reg_csv_array[$this->_get_column_name_for_field($field)] = null;//$registration->get($field->get_name());
+					$reg_csv_array[$this->_get_column_name_for_field($field)] = null; //$registration->get($field->get_name());
 				}
 			}
 			$registrations_csv_ready_array [] = $reg_csv_array;
 		}
-		if( $event_id ){
-			$event_slug =  EEM_Event::instance()->get_var( array( array( 'EVT_ID' => $event_id ) ), 'EVT_slug' );
-			if( ! $event_slug ) {
-				$event_slug = __( 'unknown', 'event_espresso' );
+		if ($event_id) {
+			$event_slug = EEM_Event::instance()->get_var(array(array('EVT_ID' => $event_id)), 'EVT_slug');
+			if ( ! $event_slug) {
+				$event_slug = __('unknown', 'event_espresso');
 			}
-		}else{
-			$event_slug = __( 'all', 'event_espresso' );
+		} else {
+			$event_slug = __('all', 'event_espresso');
 		}
-		$filename = sprintf( "registrations-for-%s", $event_slug );
+		$filename = sprintf("registrations-for-%s", $event_slug);
 
-		$handle = $this->EE_CSV->begin_sending_csv( $filename);
+		$handle = $this->EE_CSV->begin_sending_csv($filename);
 		$this->EE_CSV->write_data_array_to_csv($handle, $registrations_csv_ready_array);
 		$this->EE_CSV->end_sending_csv($handle);
 	}
@@ -524,7 +524,7 @@ 
 	 * @param EE_Model_Field_Base $field
 	 * @return string
 	 */
-	protected function _get_column_name_for_field(EE_Model_Field_Base $field){
+	protected function _get_column_name_for_field(EE_Model_Field_Base $field) {
 		return $field->get_nicename()."[".$field->get_name()."]";
 	}
 
@@ -537,17 +537,17 @@ 
 	function export_categories() {
 		// are any Event IDs set?
 		$query_params = array();
-		if ( isset( $this->_req_data['EVT_CAT_ID'] )) {
+		if (isset($this->_req_data['EVT_CAT_ID'])) {
 			// do we have an array of IDs ?
-			if ( is_array( $this->_req_data['EVT_CAT_ID'] )) {
+			if (is_array($this->_req_data['EVT_CAT_ID'])) {
 				// generate an "IN (CSV)" where clause
-				$EVT_CAT_IDs = array_map( 'sanitize_text_field', $this->_req_data['EVT_CAT_ID'] );
+				$EVT_CAT_IDs = array_map('sanitize_text_field', $this->_req_data['EVT_CAT_ID']);
 				$filename = 'event-categories';
-				$query_params[0]['term_taxonomy_id'] = array('IN',$EVT_CAT_IDs);
+				$query_params[0]['term_taxonomy_id'] = array('IN', $EVT_CAT_IDs);
 			} else {
 				// generate regular where = clause
-				$EVT_CAT_ID = absint( $this->_req_data['EVT_CAT_ID'] );
-				$filename = 'event-category#' . $EVT_CAT_ID;
+				$EVT_CAT_ID = absint($this->_req_data['EVT_CAT_ID']);
+				$filename = 'event-category#'.$EVT_CAT_ID;
 				$query_params[0]['term_taxonomy_id'] = $EVT_CAT_ID;
 			}
 		} else {
@@ -559,11 +559,11 @@ 
 				'Term_Taxonomy' => $query_params
 			);
 
-		$table_data = $this->_get_export_data_for_models( $tables_to_export );
-		$filename = $this->generate_filename ( $filename );
+		$table_data = $this->_get_export_data_for_models($tables_to_export);
+		$filename = $this->generate_filename($filename);
 
-		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename, $table_data )) {
-			EE_Error::add_error(__('An error occurred and the Category details could not be exported from the database.','event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv($filename, $table_data)) {
+			EE_Error::add_error(__('An error occurred and the Category details could not be exported from the database.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -574,13 +574,13 @@ 
 	 *		  @param string - export_name
 	 *			@return string on success, FALSE on fail
 	 */
-	private function generate_filename ( $export_name = '' ) {
-		if ( $export_name != '' ) {
-			$filename = get_bloginfo('name') . '-' . $export_name;
-			$filename = sanitize_key( $filename ) . '-' . $this->today;
+	private function generate_filename($export_name = '') {
+		if ($export_name != '') {
+			$filename = get_bloginfo('name').'-'.$export_name;
+			$filename = sanitize_key($filename).'-'.$this->today;
 			return $filename;
-		}	 else {
-			EE_Error::add_error(__("No filename was provided", "event_espresso"), __FILE__, __FUNCTION__, __LINE__ );
+		} else {
+			EE_Error::add_error(__("No filename was provided", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return false;
 	}
@@ -593,12 +593,12 @@ 
 	 *	@param array $models_to_export keys are model names (eg 'Event', 'Attendee', etc.) and values are arrays of query params like on EEM_Base::get_all
 	 *	@return array on success, FALSE on fail
 	 */
-	private function _get_export_data_for_models( $models_to_export = array() ) {
+	private function _get_export_data_for_models($models_to_export = array()) {
 		$table_data = FALSE;
-		if ( is_array( $models_to_export ) ) {
-			foreach ( $models_to_export as $model_name => $query_params ) {
+		if (is_array($models_to_export)) {
+			foreach ($models_to_export as $model_name => $query_params) {
 				//check for a numerically-indexed array. in that case, $model_name is the value!!
-				if(is_int($model_name)){
+				if (is_int($model_name)) {
 					$model_name = $query_params;
 					$query_params = array();
 				}
@@ -606,17 +606,17 @@ 
 				$model_objects = $model->get_all($query_params);
 
 				$table_data[$model_name] = array();
-				foreach($model_objects as $model_object){
+				foreach ($model_objects as $model_object) {
 					$model_data_array = array();
 					$fields = $model->field_settings();
-					foreach($fields as $field){
+					foreach ($fields as $field) {
 						$column_name = $field->get_nicename()."[".$field->get_name()."]";
-						if($field instanceof EE_Datetime_Field){
+						if ($field instanceof EE_Datetime_Field) {
 //							$field->set_date_format('Y-m-d');
 //							$field->set_time_format('H:i:s');
-							$model_data_array[$column_name] = $model_object->get_datetime($field->get_name(),'Y-m-d','H:i:s');
+							$model_data_array[$column_name] = $model_object->get_datetime($field->get_name(), 'Y-m-d', 'H:i:s');
 						}
-						else{
+						else {
 							$model_data_array[$column_name] = $model_object->get($field->get_name());
 						}
 					}

Braces +18 added lines, -17 removed lines

@@ -1,4 +1,6 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 /**
  * EE_Export class
@@ -233,10 +235,10 @@ 
 				if( $field_name == 'STA_ID' ){
 					$state_name_field = EEM_State::instance()->field_settings_for( 'STA_name' );
 					$csv_row[ __( 'State', 'event_espresso' ) ] = $attendee_row[ $state_name_field->get_qualified_column() ];
-				}elseif( $field_name == 'CNT_ISO' ){
+				} elseif( $field_name == 'CNT_ISO' ){
 					$country_name_field = EEM_Country::instance()->field_settings_for( 'CNT_name' );
 					$csv_row[ __( 'Country', 'event_espresso' ) ] = $attendee_row[ $country_name_field->get_qualified_column() ];
-				}else{
+				} else{
 					$csv_row[ $field_obj->get_nicename() ] = $attendee_row[ $field_obj->get_qualified_column() ];
 				}
 			}
@@ -294,9 +296,9 @@ 
 		}
 		if( $pretty_schema === true){
 			return $field_obj->prepare_for_pretty_echoing( $value_on_model_obj );
-		}elseif( is_string( $pretty_schema ) ) {
+		} elseif( is_string( $pretty_schema ) ) {
 			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema );
-		}else{
+		} else{
 			return $field_obj->prepare_for_get( $value_on_model_obj );
 		}
 	}
@@ -352,7 +354,7 @@ 
 		);
 		if( $event_id ){
 			$query_params[0]['EVT_ID'] =  $event_id;
-		}else{
+		} else{
 			$query_params[ 'force_join' ][] = 'Event';
 		}
 		$registration_rows = $reg_model->get_all_wpdb_results( $query_params );
@@ -376,11 +378,11 @@ 
 					$field = $reg_model->field_settings_for($field_name);
 					if($field_name == 'REG_final_price'){
 						$value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ 'Registration.REG_final_price'], 'localized_float' );
-					}elseif( $field_name == 'REG_count' ){
+					} elseif( $field_name == 'REG_count' ){
 						$value = sprintf( __( '%s of %s', 'event_espresso' ), $this->_prepare_value_from_db_for_display( $reg_model, 'REG_count', $reg_row['Registration.REG_count'] ), $this->_prepare_value_from_db_for_display( $reg_model, 'REG_group_size', $reg_row['Registration.REG_group_size' ] ) );
-					}elseif( $field_name == 'REG_date' ) {
+					} elseif( $field_name == 'REG_date' ) {
 						$value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ 'Registration.REG_date'], 'no_html' );
-					}else{
+					} else{
 						$value = $this->_prepare_value_from_db_for_display( $reg_model, $field_name, $reg_row[ $field->get_qualified_column() ] );
 					}
 					$reg_csv_array[$this->_get_column_name_for_field($field)] = $value;
@@ -452,12 +454,12 @@ 
 					if( $reg_row[ 'Attendee_CPT.ID' ]){
 						if($att_field_name == 'STA_ID'){
 							$value = EEM_State::instance()->get_var( array( array( 'STA_ID' => $reg_row[ 'Attendee_Meta.STA_ID' ] ) ), 'STA_name' );
-						}elseif($att_field_name == 'CNT_ISO'){
+						} elseif($att_field_name == 'CNT_ISO'){
 							$value = EEM_Country::instance()->get_var( array( array( 'CNT_ISO' => $reg_row[ 'Attendee_Meta.CNT_ISO' ] ) ), 'CNT_name' );
-						}else{
+						} else{
 							$value = $this->_prepare_value_from_db_for_display( EEM_Attendee::instance(), $att_field_name, $reg_row[ $field_obj->get_qualified_column() ] );
 						}
-					}else{
+					} else{
 						$value = '';
 					}
 
@@ -475,7 +477,7 @@ 
 					/* @var $answer EE_Answer */
 					if( $answer_row[ 'Question.QST_ID' ] ){
 						$question_label = $this->_prepare_value_from_db_for_display( EEM_Question::instance(), 'QST_admin_label', $answer_row[ 'Question.QST_admin_label' ] );
-					}else{
+					} else{
 						$question_label = sprintf( __( 'Question $s', 'event_espresso' ), $answer_row[ 'Answer.QST_ID' ] );
 					}
                                         if( isset( $answer_row[ 'Question.QST_type'] ) && $answer_row[ 'Question.QST_type' ] == EEM_Question::QST_type_state ) {
@@ -509,7 +511,7 @@ 
 			if( ! $event_slug ) {
 				$event_slug = __( 'unknown', 'event_espresso' );
 			}
-		}else{
+		} else{
 			$event_slug = __( 'all', 'event_espresso' );
 		}
 		$filename = sprintf( "registrations-for-%s", $event_slug );
@@ -579,7 +581,7 @@ 
 			$filename = get_bloginfo('name') . '-' . $export_name;
 			$filename = sanitize_key( $filename ) . '-' . $this->today;
 			return $filename;
-		}	 else {
+		} else {
 			EE_Error::add_error(__("No filename was provided", "event_espresso"), __FILE__, __FUNCTION__, __LINE__ );
 		}
 		return false;
@@ -615,8 +617,7 @@ 
 //							$field->set_date_format('Y-m-d');
 //							$field->set_time_format('H:i:s');
 							$model_data_array[$column_name] = $model_object->get_datetime($field->get_name(),'Y-m-d','H:i:s');
-						}
-						else{
+						} else{
 							$model_data_array[$column_name] = $model_object->get($field->get_name());
 						}
 					}

core/db_classes/EE_Post_Meta.class.php

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -30,9 +30,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Post_Meta|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -41,8 +41,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Post_Meta
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -52,7 +52,7 @@ 
 	 * @return int
 	 */
 	function meta_id() {
-		return $this->get( 'meta_id' );
+		return $this->get('meta_id');
 	}
 
 
@@ -62,15 +62,15 @@ 
 	 * @param int $meta_id
 	 * @return boolean
 	 */
-	function set_meta_id( $meta_id) {
-		return $this->set( 'meta_id', $meta_id);
+	function set_meta_id($meta_id) {
+		return $this->set('meta_id', $meta_id);
 	}
 	/**
 	 * Gets post_id
 	 * @return int
 	 */
 	function post_id() {
-		return $this->get( 'post_id' );
+		return $this->get('post_id');
 	}
 
 
@@ -80,15 +80,15 @@ 
 	 * @param int $post_id
 	 * @return boolean
 	 */
-	function set_post_id( $post_id) {
-		return $this->set( 'post_id', $post_id);
+	function set_post_id($post_id) {
+		return $this->set('post_id', $post_id);
 	}
 	/**
 	 * Gets meta_key
 	 * @return string
 	 */
 	function meta_key() {
-		return $this->get( 'meta_key' );
+		return $this->get('meta_key');
 	}
 
 
@@ -98,15 +98,15 @@ 
 	 * @param string $meta_key
 	 * @return boolean
 	 */
-	function set_meta_key( $meta_key) {
-		return $this->set( 'meta_key', $meta_key);
+	function set_meta_key($meta_key) {
+		return $this->set('meta_key', $meta_key);
 	}
 	/**
 	 * Gets meta_value
 	 * @return mixed
 	 */
 	function meta_value() {
-		return $this->get( 'meta_value' );
+		return $this->get('meta_value');
 	}
 
 
@@ -116,8 +116,8 @@ 
 	 * @param mixed $meta_value
 	 * @return boolean
 	 */
-	function set_meta_value( $meta_value) {
-		return $this->set( 'meta_value', $meta_value);
+	function set_meta_value($meta_value) {
+		return $this->set('meta_value', $meta_value);
 	}
 
 

core/db_models/EEM_Answer.model.php

Braces +5 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -90,7 +92,7 @@ 
 			if( $answer_obj instanceof EE_Answer ){
 				if($pretty_answer){
 					$value = $answer_obj->pretty_value();
-				}else{
+				} else{
 					$value = $answer_obj->value();
 				}
 			}
@@ -148,7 +150,7 @@ 
 						$value = $registration->attendee()->get_pretty( $field_name );
 					}
 					//if field name is blank, leave the value as null too
-				}else{
+				} else{
 					$value = $registration->attendee()->get( $field_name );
 				}
 			}

Indentation +8 added lines, -8 removed lines

@@ -125,14 +125,14 @@
 	public function get_attendee_property_answer_value( EE_Registration $registration, $question_system_id = NULL, $pretty_answer = FALSE ){
 		$field_name = NULL;
 		$value = NULL;
-                //backward compat: we still want to find the question's ID
-                if( is_numeric( $question_system_id ) ) {
-                    //find this question's QST_system value
-                    $question_id = $question_system_id;
-                    $question_system_id = EEM_Question::instance()->get_var( array( array( 'QST_ID' => $question_system_id ) ), 'QST_system' );
-                } else {
-                    $question_id = (int) EEM_Question::instance()->get_var( array( array( 'QST_system' => $question_system_id ) ), 'QST_ID' );
-                }
+				//backward compat: we still want to find the question's ID
+				if( is_numeric( $question_system_id ) ) {
+					//find this question's QST_system value
+					$question_id = $question_system_id;
+					$question_system_id = EEM_Question::instance()->get_var( array( array( 'QST_ID' => $question_system_id ) ), 'QST_system' );
+				} else {
+					$question_id = (int) EEM_Question::instance()->get_var( array( array( 'QST_system' => $question_system_id ) ), 'QST_ID' );
+				}
 		//only bother checking if the registration has an attendee
 		if( $registration->attendee() instanceof EE_Attendee ) {
 			$field_name = EEM_Attendee::instance()->get_attendee_field_for_system_question( $question_system_id );

Spacing +35 added lines, -35 removed lines

@@ -51,18 +51,18 @@ 
 	/**
 	 * 	constructor
 	 */
-	protected function __construct( $timezone = NULL ){
-		$this->singular_item = __('Answer','event_espresso');
-		$this->plural_item = __('Answers','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Answer', 'event_espresso');
+		$this->plural_item = __('Answers', 'event_espresso');
 		$this->_tables = array(
 			'Answer'=> new EE_Primary_Table('esp_answer', 'ANS_ID')
 		);
 		$this->_fields = array(
 			'Answer'=>array(
-				'ANS_ID'=> new EE_Primary_Key_Int_Field('ANS_ID', __('Answer ID','event_espresso')),
-				'REG_ID'=>new EE_Foreign_Key_Int_Field('REG_ID', __('Registration ID','event_espresso'), false, 0, 'Registration'),
-				'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID','event_espresso'), false, 0, 'Question'),
-				'ANS_value'=>new EE_Maybe_Serialized_Simple_HTML_Field('ANS_value', __('Answer Value','event_espresso'), false, '')
+				'ANS_ID'=> new EE_Primary_Key_Int_Field('ANS_ID', __('Answer ID', 'event_espresso')),
+				'REG_ID'=>new EE_Foreign_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso'), false, 0, 'Registration'),
+				'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso'), false, 0, 'Question'),
+				'ANS_value'=>new EE_Maybe_Serialized_Simple_HTML_Field('ANS_value', __('Answer Value', 'event_espresso'), false, '')
 			));
 		$this->_model_relations = array(
 			'Registration'=>new EE_Belongs_To_Relation(),
@@ -70,7 +70,7 @@ 
 		);
 		$this->_model_chain_to_wp_user = 'Registration.Event';
 		$this->_caps_slug = 'registrations';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -83,19 +83,19 @@ 
 	 * @param boolean $pretty_answer whether to call 'pretty_value' or just 'value'
 	 * @return string
 	 */
-	public function get_answer_value_to_question( EE_Registration $registration, $question_id = NULL,$pretty_answer = FALSE ){
-		$value = $this->get_attendee_property_answer_value( $registration, $question_id, $pretty_answer );
-		if (  $value === NULL ){
-			$answer_obj = $this->get_registration_question_answer_object( $registration, $question_id);
-			if( $answer_obj instanceof EE_Answer ){
-				if($pretty_answer){
+	public function get_answer_value_to_question(EE_Registration $registration, $question_id = NULL, $pretty_answer = FALSE) {
+		$value = $this->get_attendee_property_answer_value($registration, $question_id, $pretty_answer);
+		if ($value === NULL) {
+			$answer_obj = $this->get_registration_question_answer_object($registration, $question_id);
+			if ($answer_obj instanceof EE_Answer) {
+				if ($pretty_answer) {
 					$value = $answer_obj->pretty_value();
-				}else{
+				} else {
 					$value = $answer_obj->value();
 				}
 			}
 		}
-		return apply_filters( 'FHEE__EEM_Answer__get_answer_value_to_question__answer_value', $value, $registration, $question_id );
+		return apply_filters('FHEE__EEM_Answer__get_answer_value_to_question__answer_value', $value, $registration, $question_id);
 	}
 
 
@@ -106,9 +106,9 @@ 
 	 * @param int $question_id
 	 * @return EE_Answer
 	 */
-	public function get_registration_question_answer_object( EE_Registration $registration, $question_id = NULL){
-		$answer_obj = $this->get_one( array( array( 'QST_ID'=>$question_id, 'REG_ID'=>$registration->ID() )));
-		return apply_filters( 'FHEE__EEM_Answer__get_registration_question_answer_object__answer_obj', $answer_obj, $registration, $question_id );
+	public function get_registration_question_answer_object(EE_Registration $registration, $question_id = NULL) {
+		$answer_obj = $this->get_one(array(array('QST_ID'=>$question_id, 'REG_ID'=>$registration->ID())));
+		return apply_filters('FHEE__EEM_Answer__get_registration_question_answer_object__answer_obj', $answer_obj, $registration, $question_id);
 	}
 
 
@@ -122,39 +122,39 @@ 
 	 * @return string|null (if the registration has no attendee, or the question_system_id is not a QST_ID or QST_system for
 	 * a question corresponding to an attendee field, returns null)
 	 */
-	public function get_attendee_property_answer_value( EE_Registration $registration, $question_system_id = NULL, $pretty_answer = FALSE ){
+	public function get_attendee_property_answer_value(EE_Registration $registration, $question_system_id = NULL, $pretty_answer = FALSE) {
 		$field_name = NULL;
 		$value = NULL;
                 //backward compat: we still want to find the question's ID
-                if( is_numeric( $question_system_id ) ) {
+                if (is_numeric($question_system_id)) {
                     //find this question's QST_system value
                     $question_id = $question_system_id;
-                    $question_system_id = EEM_Question::instance()->get_var( array( array( 'QST_ID' => $question_system_id ) ), 'QST_system' );
+                    $question_system_id = EEM_Question::instance()->get_var(array(array('QST_ID' => $question_system_id)), 'QST_system');
                 } else {
-                    $question_id = (int) EEM_Question::instance()->get_var( array( array( 'QST_system' => $question_system_id ) ), 'QST_ID' );
+                    $question_id = (int) EEM_Question::instance()->get_var(array(array('QST_system' => $question_system_id)), 'QST_ID');
                 }
 		//only bother checking if the registration has an attendee
-		if( $registration->attendee() instanceof EE_Attendee ) {
-			$field_name = EEM_Attendee::instance()->get_attendee_field_for_system_question( $question_system_id );
-			if( $field_name ) {
-				if( $pretty_answer ) {
-					if( $field_name === 'STA_ID' ) {
+		if ($registration->attendee() instanceof EE_Attendee) {
+			$field_name = EEM_Attendee::instance()->get_attendee_field_for_system_question($question_system_id);
+			if ($field_name) {
+				if ($pretty_answer) {
+					if ($field_name === 'STA_ID') {
 						$state = $registration->attendee()->state_obj();
-						$value = $state instanceof EE_State ? $state->name() : sprintf( __('Unknown State (%s)', 'event_espresso'), $registration->attendee()->state_ID() );
-					} else if($field_name === 'CNT_ISO') {
+						$value = $state instanceof EE_State ? $state->name() : sprintf(__('Unknown State (%s)', 'event_espresso'), $registration->attendee()->state_ID());
+					} else if ($field_name === 'CNT_ISO') {
 						$country = $registration->attendee()->country_obj();
-						$value = $country instanceof EE_Country ? $country->name() : sprintf(__('Unknown Country (%s)', "event_espresso"),$registration->attendee()->country_ID());
+						$value = $country instanceof EE_Country ? $country->name() : sprintf(__('Unknown Country (%s)', "event_espresso"), $registration->attendee()->country_ID());
 					} else {
-						$value = $registration->attendee()->get_pretty( $field_name );
+						$value = $registration->attendee()->get_pretty($field_name);
 					}
 					//if field name is blank, leave the value as null too
-				}else{
-					$value = $registration->attendee()->get( $field_name );
+				} else {
+					$value = $registration->attendee()->get($field_name);
 				}
 			}
 			//if no field was found, leave value blank
 		}
-		return apply_filters( 'FHEE__EEM_Answer__get_attendee_question_answer_value__answer_value', $value, $registration, $question_id, $question_system_id );
+		return apply_filters('FHEE__EEM_Answer__get_attendee_question_answer_value__answer_value', $value, $registration, $question_id, $question_system_id);
 	}