eventespresso / event-espresso-core

core/data_migration_scripts/4_7_0_stages/EE_DMS_4_7_0_Registration_Payments.dmsstage.php

Doc Comments +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
 	 *
 	 * @param stdClass $payment
 	 * @param array $registrations
-	 * @return bool
+	 * @return boolean|null
 	 */
 	protected function _process_registration_payments( $payment, $registrations = array() ){
 		// how much is available to apply to registrations?

Spacing +50 added lines, -50 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 /**
@@ -12,7 +12,7 @@ 
  * @author				Brent Christensen
  *
  */
-class EE_DMS_4_7_0_Registration_Payments extends EE_Data_Migration_Script_Stage_Table{
+class EE_DMS_4_7_0_Registration_Payments extends EE_Data_Migration_Script_Stage_Table {
 
 	protected $_payment_table;
 
@@ -20,15 +20,15 @@ 
 
 	protected $_registration_payment_table;
 
-	function __construct(){
+	function __construct() {
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		$this->_pretty_name = __( 'Registration Payment Record Generation', 'event_espresso' );
+		$this->_pretty_name = __('Registration Payment Record Generation', 'event_espresso');
 		// define tables
-		$this->_old_table 									= $wpdb->prefix . 'esp_transaction';
-		$this->_payment_table 						= $wpdb->prefix . 'esp_payment';
-		$this->_registration_table 					= $wpdb->prefix . 'esp_registration';
-		$this->_registration_payment_table 	= $wpdb->prefix . 'esp_registration_payment';
+		$this->_old_table = $wpdb->prefix.'esp_transaction';
+		$this->_payment_table = $wpdb->prefix.'esp_payment';
+		$this->_registration_table = $wpdb->prefix.'esp_registration';
+		$this->_registration_payment_table = $wpdb->prefix.'esp_registration_payment';
 		// build SQL WHERE clauses
 		$this->_extra_where_sql = "WHERE STS_ID IN ( 'TIN', 'TCM' ) AND TXN_Total != '0.000'";
 		parent::__construct();
@@ -40,14 +40,14 @@ 
 	 * @param array $transaction
 	 * @return void
 	 */
-	protected function _migrate_old_row( $transaction ) {
+	protected function _migrate_old_row($transaction) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		$TXN_ID = absint( $transaction[ 'TXN_ID' ] );
-		if ( ! $TXN_ID ) {
+		$TXN_ID = absint($transaction['TXN_ID']);
+		if ( ! $TXN_ID) {
 			$this->add_error(
 				sprintf(
-					__( 'Invalid transaction with ID=%1$d. Error: "%2$s"', 'event_espresso' ),
+					__('Invalid transaction with ID=%1$d. Error: "%2$s"', 'event_espresso'),
 					$TXN_ID,
 					$wpdb->last_error
 				)
@@ -55,19 +55,19 @@ 
 			return;
 		}
 		// get all payments for the TXN
-		$payments = $this->_get_payments( $TXN_ID );
-		if ( empty( $payments ) ) {
+		$payments = $this->_get_payments($TXN_ID);
+		if (empty($payments)) {
 			return;
 		}
 		// then the registrants
-		$registrations = $this->_get_registrations( $TXN_ID );
-		if ( empty( $registrations ) ) {
+		$registrations = $this->_get_registrations($TXN_ID);
+		if (empty($registrations)) {
 			return;
 		}
 		// now loop thru each payment and apply it to each of the registrations
-		foreach ( $payments as $PAY_ID => $payment ) {
-			if ( $payment->STS_ID === 'PAP' && $payment->PAY_amount > 0 ) {
-				$this->_process_registration_payments( $payment, $registrations );
+		foreach ($payments as $PAY_ID => $payment) {
+			if ($payment->STS_ID === 'PAP' && $payment->PAY_amount > 0) {
+				$this->_process_registration_payments($payment, $registrations);
 			}
 		}
 	}
@@ -80,11 +80,11 @@ 
 	 * @param int $TXN_ID
 	 * @return array
 	 */
-	protected function _get_registrations( $TXN_ID ) {
+	protected function _get_registrations($TXN_ID) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$SQL = "SELECT * FROM {$this->_registration_table} WHERE TXN_ID = %d AND STS_ID IN ( 'RPP', 'RAP' )";
-		return $wpdb->get_results( $wpdb->prepare( $SQL, $TXN_ID ), OBJECT_K );
+		return $wpdb->get_results($wpdb->prepare($SQL, $TXN_ID), OBJECT_K);
 	}
 
 
@@ -95,10 +95,10 @@ 
 	 * @param int $TXN_ID
 	 * @return array
 	 */
-	protected function _get_payments( $TXN_ID ) {
+	protected function _get_payments($TXN_ID) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$this->_payment_table} WHERE TXN_ID = %d", $TXN_ID ), OBJECT_K );
+		return $wpdb->get_results($wpdb->prepare("SELECT * FROM {$this->_payment_table} WHERE TXN_ID = %d", $TXN_ID), OBJECT_K);
 	}
 
 
@@ -109,10 +109,10 @@ 
 	 * @param int $REG_ID
 	 * @return array
 	 */
-	protected function _get_possibly_updated_REG_paid( $REG_ID ) {
+	protected function _get_possibly_updated_REG_paid($REG_ID) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		return $wpdb->get_var( $wpdb->prepare( "SELECT REG_paid FROM {$this->_registration_table} WHERE REG_ID = %d", $REG_ID ) );
+		return $wpdb->get_var($wpdb->prepare("SELECT REG_paid FROM {$this->_registration_table} WHERE REG_ID = %d", $REG_ID));
 	}
 
 
@@ -127,40 +127,40 @@ 
 	 * @param array $registrations
 	 * @return bool
 	 */
-	protected function _process_registration_payments( $payment, $registrations = array() ){
+	protected function _process_registration_payments($payment, $registrations = array()) {
 		// how much is available to apply to registrations?
 		$available_payment_amount = $payment->PAY_amount;
-		foreach ( $registrations as $REG_ID => $registration ) {
+		foreach ($registrations as $REG_ID => $registration) {
 			// nothing left, then we are done here?
-			if ( ! $available_payment_amount > 0 ) {
+			if ( ! $available_payment_amount > 0) {
 				break;
 			}
 			// ensure REG_final_price has a valid value, and skip if it turns out to be zero
-			$registration->REG_final_price = ! empty( $registration->REG_final_price ) ? (float)$registration->REG_final_price : 0.00;
-			if ( ! $registration->REG_final_price > 0 ) {
+			$registration->REG_final_price = ! empty($registration->REG_final_price) ? (float) $registration->REG_final_price : 0.00;
+			if ( ! $registration->REG_final_price > 0) {
 				continue;
 			}
 			// because REG_paid may have been updated by a previous payment, we need to retrieve the value from the db
-			$possibly_updated_REG_paid = $this->_get_possibly_updated_REG_paid( $REG_ID );
-			if ( is_float( $possibly_updated_REG_paid ) ) {
+			$possibly_updated_REG_paid = $this->_get_possibly_updated_REG_paid($REG_ID);
+			if (is_float($possibly_updated_REG_paid)) {
 				$registration->REG_paid = $possibly_updated_REG_paid;
 			}
 			// and ensure REG_paid has a valid value
-			$registration->REG_paid = ! empty( $registration->REG_paid ) ? (float)$registration->REG_paid : 0.00;
+			$registration->REG_paid = ! empty($registration->REG_paid) ? (float) $registration->REG_paid : 0.00;
 			// calculate amount owing, and skip if it turns out to be zero
 			$owing = $registration->REG_final_price - $registration->REG_paid;
-			if ( ! $owing > 0 ) {
+			if ( ! $owing > 0) {
 				continue;
 			}
 			// don't allow payment amount to exceed the available payment amount, OR the amount owing
-			$payment_amount = min( $available_payment_amount, $owing );
+			$payment_amount = min($available_payment_amount, $owing);
 			// update $available_payment_amount
 			$available_payment_amount = $available_payment_amount - $payment_amount;
 			// add relation between registration and payment and set amount
-			if ( $this->_insert_registration_payment( $registration->REG_ID, $payment->PAY_ID, $payment_amount )) {
+			if ($this->_insert_registration_payment($registration->REG_ID, $payment->PAY_ID, $payment_amount)) {
 				//calculate and set new REG_paid
 				$registration->REG_paid = $registration->REG_paid + $payment_amount;
-				$this->_update_registration_paid( $registration->REG_ID, $registration->REG_paid );
+				$this->_update_registration_paid($registration->REG_ID, $registration->REG_paid);
 			}
 		}
 	}
@@ -175,18 +175,18 @@ 
 	 * @param float $PAY_amount
 	 * @return bool
 	 */
-	protected function _insert_registration_payment( $REG_ID = 0, $PAY_ID = 0, $PAY_amount = 0.00 ){
+	protected function _insert_registration_payment($REG_ID = 0, $PAY_ID = 0, $PAY_amount = 0.00) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$success = $wpdb->insert(
 			$this->_registration_payment_table,
-			array( 'REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount, ),  // data
-			array( '%f' )   // data format
+			array('REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount,), // data
+			array('%f')   // data format
 		);
-		if ( $success === false ) {
+		if ($success === false) {
 			$this->add_error(
 				sprintf(
-					__( 'Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso' ),
+					__('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
 					$REG_ID,
 					$wpdb->last_error
 				)
@@ -205,20 +205,20 @@ 
 	 * @param float $REG_paid
 	 * @return bool
 	 */
-	protected function _update_registration_paid( $REG_ID = 0, $REG_paid = 0.00 ) {
+	protected function _update_registration_paid($REG_ID = 0, $REG_paid = 0.00) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$success = $wpdb->update(
 			$this->_registration_table,
-			array( 'REG_paid' => $REG_paid ),  // data
-			array( 'REG_ID' => $REG_ID ),  // where
-			array( '%f' ),   // data format
-			array( '%d' )  // where format
+			array('REG_paid' => $REG_paid), // data
+			array('REG_ID' => $REG_ID), // where
+			array('%f'), // data format
+			array('%d')  // where format
 		);
-		if ( $success === false ) {
+		if ($success === false) {
 			$this->add_error(
 				sprintf(
-					__( 'Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso' ),
+					__('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
 					$REG_ID,
 					$wpdb->last_error
 				)

core/data_migration_scripts/EE_Data_Migration_Class_Base.core.php

Doc Comments +1 added lines, -1 removed lines

@@ -234,7 +234,7 @@
 	 * @param array $old_row_as_array
 	 * @param string $new_table
 	 * @param array $new_row_as_array columns=>values like used in wpdb->insert
-	 * @param array $data_types numerically indexed
+	 * @param string[] $data_types numerically indexed
 	 * @return string
 	 */
 	protected function _create_error_message_for_db_insertion($old_table, $old_row_as_array, $new_table, $new_row_as_array, $data_types){

Indentation +3 added lines, -3 removed lines

@@ -264,9 +264,9 @@
 	/**
 	 * Same as json_encode, just avoids putting
 	 * serialized arrays into the http build query, as that would
-	* @param array $array_of_data
-	* @return string
-	*/
+	 * @param array $array_of_data
+	 * @return string
+	 */
 	protected function _json_encode($array_of_data){
 		//we'd rather NOT serialize the transaction details
 		$fields_to_include = array();

Spacing +46 added lines, -46 removed lines

@@ -17,7 +17,7 @@ 
 
 
 
-abstract class EE_Data_Migration_Class_Base{
+abstract class EE_Data_Migration_Class_Base {
 	/**
 	 * @var $records_to_migrate int count of all that have been migrated
 	 */
@@ -50,7 +50,7 @@ 
 	 * Just initializes the status of the migration
 	 * @throws EE_Error
 	 */
-	public function __construct(){
+	public function __construct() {
 		$this->set_status(EE_Data_Migration_Manager::status_continue);
 	}
 
@@ -61,9 +61,9 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function pretty_name(){
-		if($this->_pretty_name === null){
-			throw new EE_Error(sprintf(__("Please give a pretty name to the migration script stage %s by assigning the property _pretty_name in the constructor", "event_espresso"),get_class($this)));
+	public function pretty_name() {
+		if ($this->_pretty_name === null) {
+			throw new EE_Error(sprintf(__("Please give a pretty name to the migration script stage %s by assigning the property _pretty_name in the constructor", "event_espresso"), get_class($this)));
 		}
 		return $this->_pretty_name;
 	}
@@ -71,8 +71,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function count_records_to_migrate(){
-		if( $this->_records_to_migrate == null){
+	public function count_records_to_migrate() {
+		if ($this->_records_to_migrate == null) {
 			$this->_records_to_migrate = $this->_count_records_to_migrate();
 		}
 		return $this->_records_to_migrate;
@@ -92,9 +92,9 @@ 
 	 * @return string one of EE_Data_Migration_Manager::status_* constants
 	 * @throws EE_Error
 	 */
-	public function get_status(){
-		if($this->_status === null){
-			throw new EE_Error(sprintf(__("Trying to get status of Migration class %s, but it has not been initialized yet. It should be set in the constructor.", "event_espresso"),get_class($this)));
+	public function get_status() {
+		if ($this->_status === null) {
+			throw new EE_Error(sprintf(__("Trying to get status of Migration class %s, but it has not been initialized yet. It should be set in the constructor.", "event_espresso"), get_class($this)));
 		}
 		return $this->_status;
 	}
@@ -103,7 +103,7 @@ 
 	 * @param string $status
 	 * @return void
 	 */
-	protected function set_status($status){
+	protected function set_status($status) {
 		$this->_status = $status;
 	}
 	/**
@@ -115,11 +115,11 @@ 
 	 * Returns the last error that occurred. If none occurred, returns null
 	 * @return string
 	 */
-	public function get_last_error(){
+	public function get_last_error() {
 		$errors = $this->get_errors();
-		if($errors){
+		if ($errors) {
 			return end($errors);
-		}else{
+		} else {
 			return null;
 		}
 	}
@@ -128,26 +128,26 @@ 
 	 * @param string $error a string describing the error that will be useful for debugging. Consider including all the data that led to the error, and a stack trace etc.
 	 * @param boolean $force force the error to be added (because otherwise we have a limit). If forcing and errors are already at their limit, we will purposefully forget the first half
 	 */
-	public function add_error($error, $force = FALSE ){
-		if( ! defined( 'EE_DMS_ERROR_LIMIT' ) ){
+	public function add_error($error, $force = FALSE) {
+		if ( ! defined('EE_DMS_ERROR_LIMIT')) {
 			$limit = 50;
-		}else{
+		} else {
 			$limit = EE_DMS_ERROR_LIMIT;
 		}
 		//make sure errors is an array, see ticket #8261
-		if( is_string( $this->_errors ) ){
-			$this->_errors = array( $this->_errors );
+		if (is_string($this->_errors)) {
+			$this->_errors = array($this->_errors);
 		}
-		if(count($this->_errors) >= $limit ){
-			if( $force ){
+		if (count($this->_errors) >= $limit) {
+			if ($force) {
 				//get rid of the first half of the errors and any above the limit
-				$this->_errors = array_slice( $this->_errors, $limit / 2, $limit / 2 );
+				$this->_errors = array_slice($this->_errors, $limit / 2, $limit / 2);
 				$this->_errors[] = "Limit reached; removed first half of errors to save space";
 				$this->_errors[] = $error;
-			}else{
-				$this->_errors[ $limit ] = 'More, but limit reached...';
+			} else {
+				$this->_errors[$limit] = 'More, but limit reached...';
 			}
-		}else{
+		} else {
 			$this->_errors[] = $error;
 		}
 	}
@@ -156,57 +156,57 @@ 
 	 * Indicates there was a fatal error and the migration cannot possibly continue
 	 * @return boolean
 	 */
-	public function is_broken(){
+	public function is_broken() {
 		return $this->get_status() == EE_Data_Migration_Manager::status_fatal_error;
 	}
 	/**
 	 * @deprecated since 4.6.12
 	 */
-	public function is_borked(){
-		EE_Error::doing_it_wrong('is_borked', __( 'The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso' ), '4.6.12');
+	public function is_borked() {
+		EE_Error::doing_it_wrong('is_borked', __('The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso'), '4.6.12');
 		return $this->is_broken();
 	}
 	/**
 	 * Sets the status to as having a fatal error
 	 */
-	public function set_broken(){
+	public function set_broken() {
 		$this->_status = EE_Data_Migration_Manager::status_fatal_error;
 	}
 	/**
 	 *
 	 * @deprecated since 4.6.12
 	 */
-	public function set_borked(){
-		EE_Error::doing_it_wrong('is_borked', __( 'The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso' ), '4.6.12');
+	public function set_borked() {
+		EE_Error::doing_it_wrong('is_borked', __('The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso'), '4.6.12');
 		return $this->set_broken();
 	}
 	/**
 	 * Checks if this thing believes it is completed
 	 * @return boolean
 	 */
-	public function is_completed(){
+	public function is_completed() {
 		return $this->get_status() == EE_Data_Migration_Manager::status_completed;
 	}
 	/**
 	 * Checks if the current script has more to do or not (ie, if it's status is CONTINUE)
 	 * @return boolean
 	 */
-	public function has_more_to_do(){
+	public function has_more_to_do() {
 		return $this->get_status() == EE_Data_Migration_Manager::status_continue;
 	}
 	/**
 	 * Marks that we believe this migration thing is completed
 	 */
-	public function set_completed(){
+	public function set_completed() {
 		$this->_status = EE_Data_Migration_Manager::status_completed;
 	}
 
 	/**
 	 * Marks that we think this migration class can continue to migrate
 	 */
-	public function reattempt(){
+	public function reattempt() {
 		$this->_status = EE_Data_Migration_Manager::status_continue;
-		$this->add_error( __( 'Reattempt migration', 'event_espresso' ), TRUE );
+		$this->add_error(__('Reattempt migration', 'event_espresso'), TRUE);
 	}
 
 	/**
@@ -215,8 +215,8 @@ 
 	 * possible that this class is defined when it goes to sleep, but NOT available when it
 	 * awakes (eg, this class is part of an addon that is deactivated at some point).
 	 */
-	public function properties_as_array(){
-		$properties =  get_object_vars($this);
+	public function properties_as_array() {
+		$properties = get_object_vars($this);
 		$properties['class'] = get_class($this);
 		unset($properties['_migration_script']);
 		return $properties;
@@ -237,22 +237,22 @@ 
 	 * @param array $data_types numerically indexed
 	 * @return string
 	 */
-	protected function _create_error_message_for_db_insertion($old_table, $old_row_as_array, $new_table, $new_row_as_array, $data_types){
+	protected function _create_error_message_for_db_insertion($old_table, $old_row_as_array, $new_table, $new_row_as_array, $data_types) {
 		global $wpdb;
 		$old_columns_and_values_for_string = array();
-		foreach($old_row_as_array as $column => $value){
+		foreach ($old_row_as_array as $column => $value) {
 			$old_columns_and_values_for_string[] = "$column => $value";
 		}
 		$new_columns_and_values_for_string = array();
 		$count = 0;
-		foreach($new_row_as_array as $column => $value){
+		foreach ($new_row_as_array as $column => $value) {
 			$new_columns_and_values_for_string[] = " $column => $value (".$data_types[$count++].")";
 		}
 		return sprintf(
 			__('Received error "%6$s" inserting row %5$s %1$s %5$s into table %2$s.%5$s Data used was %5$s %3$s %5$s from table %4%s.', "event_espresso"),
-			implode(", ",$new_columns_and_values_for_string),
+			implode(", ", $new_columns_and_values_for_string),
 			$new_table,
-			implode(", ",$old_columns_and_values_for_string),
+			implode(", ", $old_columns_and_values_for_string),
 			$old_table,
 			'<br/>',
 			$wpdb->last_error
@@ -267,12 +267,12 @@ 
 	* @param array $array_of_data
 	* @return string
 	*/
-	protected function _json_encode($array_of_data){
+	protected function _json_encode($array_of_data) {
 		//we'd rather NOT serialize the transaction details
 		$fields_to_include = array();
-		foreach($array_of_data as $name => $value){
+		foreach ($array_of_data as $name => $value) {
 			$unserialized_data = @unserialize($value);
-			if($unserialized_data === FALSE){
+			if ($unserialized_data === FALSE) {
 				$fields_to_include[$name] = $value;
 			}
 		}

Braces +4 added lines, -4 removed lines

@@ -119,7 +119,7 @@ 
 		$errors = $this->get_errors();
 		if($errors){
 			return end($errors);
-		}else{
+		} else{
 			return null;
 		}
 	}
@@ -131,7 +131,7 @@ 
 	public function add_error($error, $force = FALSE ){
 		if( ! defined( 'EE_DMS_ERROR_LIMIT' ) ){
 			$limit = 50;
-		}else{
+		} else{
 			$limit = EE_DMS_ERROR_LIMIT;
 		}
 		//make sure errors is an array, see ticket #8261
@@ -144,10 +144,10 @@ 
 				$this->_errors = array_slice( $this->_errors, $limit / 2, $limit / 2 );
 				$this->_errors[] = "Limit reached; removed first half of errors to save space";
 				$this->_errors[] = $error;
-			}else{
+			} else{
 				$this->_errors[ $limit ] = 'More, but limit reached...';
 			}
-		}else{
+		} else{
 			$this->_errors[] = $error;
 		}
 	}

core/data_migration_scripts/EE_DMS_Core_4_1_0.dms.php

Doc Comments +2 added lines, -3 removed lines

@@ -1434,7 +1434,6 @@ 
 	/**
 	 * Makes sure the 3.1's image url is converted to an image attachment post to the 4.1 CPT event
 	 * and sets it as the featured image on the CPT event
-	 * @param type $old_event
 	 * @param type $new_cpt_id
 	 * @param  EE_Data_Migration_Script_Stage $migration_stage the stage which called this, where errors should be added
 	 * @return boolean whether or not we had to do the big job of creating an image attachment
@@ -1482,7 +1481,7 @@ 
 	/**
 	 * Creates an image attachment post for the GUID. If the GUID points to a remote image,
 	 * we download it to our uploads directory so that it can be properly processed (eg, creates different sizes of thumbnails)
-	 * @param type $guid
+	 * @param string $guid
 	 * @param EE_Data_Migration_Script_Stage $migration_stage
 	 * @return int
 	 */
@@ -1558,7 +1557,7 @@ 
 	/**
 	 * Returns a mysql-formatted DATETIME in UTC time, given a $DATETIME_string
 	 * (and optionally a timezone; if none is given, the wp DEFAULT is used)
-	 * @param EE_Data_Migration_Script_base $stage
+	 * @param EE_Data_Migration_Script_Stage $stage
 	 * @param array $row_of_data, the row from the DB (as an array) we're trying to find the UTC time for
 	 * @param string $DATETIME_string
 	 * @param string $timezone

Indentation +13 added lines, -13 removed lines

@@ -1607,19 +1607,19 @@
 	private function timezone_convert_to_string_from_offset($offset){
 		//shamelessly taken from bottom comment at http://ca1.php.net/manual/en/function.timezone-name-from-abbr.php because timezone_name_from_abbr() did NOT work as expected - its not reliable
 		$offset *= 3600; // convert hour offset to seconds
-        $abbrarray = timezone_abbreviations_list();
-        foreach ($abbrarray as $abbr){
-                foreach ($abbr as $city)
-                {
-                        if ($city['offset'] == $offset)
-                        {
-
-                                return $city['timezone_id'];
-                        }
-                }
-        }
-
-        return FALSE;
+		$abbrarray = timezone_abbreviations_list();
+		foreach ($abbrarray as $abbr){
+				foreach ($abbr as $city)
+				{
+						if ($city['offset'] == $offset)
+						{
+
+								return $city['timezone_id'];
+						}
+				}
+		}
+
+		return FALSE;
 	}
 
 	public function migration_page_hooks(){

Spacing +202 added lines, -202 removed lines

@@ -8,15 +8,15 @@ 
 //(all other times it gets resurrected from a wordpress option)
 $stages = glob(EE_CORE.'data_migration_scripts/4_1_0_stages/*');
 $class_to_filepath = array();
-if ( ! empty( $stages ) ) {
-	foreach($stages as $filepath){
+if ( ! empty($stages)) {
+	foreach ($stages as $filepath) {
 		$matches = array();
-		preg_match('~4_1_0_stages/(.*).dmsstage.php~',$filepath,$matches);
+		preg_match('~4_1_0_stages/(.*).dmsstage.php~', $filepath, $matches);
 		$class_to_filepath[$matches[1]] = $filepath;
 	}
 }
 //give addons a chance to autoload their stages too
-$class_to_filepath = apply_filters('FHEE__EE_DMS_4_1_0__autoloaded_stages',$class_to_filepath);
+$class_to_filepath = apply_filters('FHEE__EE_DMS_4_1_0__autoloaded_stages', $class_to_filepath);
 EEH_Autoloader::register_autoloader($class_to_filepath);
 
 /**
@@ -34,7 +34,7 @@ 
  * --a function named update_espresso_config() which saves the EE_Config object to the database
  * --...and all its subclasses... really, you're best off copying the whole thin gwhen 4.1 is released into this file and wrapping its declaration in if( ! class_exists()){...}
  */
-class EE_DMS_Core_4_1_0 extends EE_Data_Migration_Script_Base{
+class EE_DMS_Core_4_1_0 extends EE_Data_Migration_Script_Base {
 
 
 
@@ -67,26 +67,26 @@ 
 	 * @global type $wpdb
 	 * @return boolean
 	 */
-	private function _checkin_table_exists(){
+	private function _checkin_table_exists() {
 		global $wpdb;
 		$results = $wpdb->get_results("SHOW TABLES LIKE '".$wpdb->prefix."events_attendee_checkin"."'");
-		if($results){
+		if ($results) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
 	public function can_migrate_from_version($version_array) {
 		$version_string = $version_array['Core'];
-		if($version_string < '4.0.0' && $version_string > '3.1.26' ){
+		if ($version_string < '4.0.0' && $version_string > '3.1.26') {
 //			echo "$version_string can be migrated fro";
 			return true;
-		}elseif( ! $version_string ){
+		}elseif ( ! $version_string) {
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.1
 			//because since 4.1 we're
-			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+			return false; //changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -96,15 +96,15 @@ 
 	}
 	public function schema_changes_before_migration() {
 		//relies on 4.1's EEH_Activation::create_table
-		require_once( EE_HELPERS . 'EEH_Activation.helper.php' );
+		require_once(EE_HELPERS.'EEH_Activation.helper.php');
 
-		$table_name='esp_answer';
-		$sql=" ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_answer';
+		$sql = " ANS_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					ANS_value TEXT NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_attendee_meta';
 		$sql = "ATTM_ID INT(10) UNSIGNED NOT	NULL AUTO_INCREMENT,
@@ -144,7 +144,7 @@ 
 					  CNT_is_EU TINYINT(1) DEFAULT '0',
 					  CNT_active TINYINT(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -165,7 +165,7 @@ 
 
 
 
-		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 		$table_name = 'esp_event_meta';
 		$sql = "
 			EVTM_ID INT NOT NULL AUTO_INCREMENT,
@@ -182,41 +182,41 @@ 
 			EVT_external_URL VARCHAR(200) NULL,
 			EVT_donations TINYINT(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_question_group';
-		$sql="EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 					QSG_ID INT UNSIGNED NOT NULL,
 					EQG_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_event_venue';
-		$sql="EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID INT(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID BIGINT(20) UNSIGNED NOT NULL,
 				VNU_ID BIGINT(20) UNSIGNED NOT NULL,
 				EVV_primary TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_extra_meta';
-		$sql="EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID INT(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID INT(11) DEFAULT NULL,
 				EXM_type VARCHAR(45) DEFAULT NULL,
 				EXM_key VARCHAR(45) DEFAULT NULL,
 				EXM_value TEXT,
 				PRIMARY KEY  (EXM_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-		$table_name='esp_line_item';
-		$sql="LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID INT(11) NOT NULL AUTO_INCREMENT,
 				LIN_code VARCHAR(245) NOT NULL DEFAULT '',
 				TXN_ID INT(11) DEFAULT NULL,
 				LIN_name VARCHAR(245) NOT NULL DEFAULT '',
@@ -232,7 +232,7 @@ 
 				OBJ_ID INT(11) DEFAULT NULL,
 				OBJ_type VARCHAR(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB' );
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 		$table_name = 'esp_message_template';
 		$sql = "MTP_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -259,7 +259,7 @@ 
 					PRIMARY KEY  (GRP_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY MTP_user_id (MTP_user_id)";
-		$this->_table_is_new_in_this_version( $table_name, $sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -367,8 +367,8 @@ 
 
 
 
-		$table_name='esp_question';
-		$sql='QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question';
+		$sql = 'QST_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QST_display_text TEXT NOT NULL,
 					QST_admin_label VARCHAR(255) NOT NULL,
 					QST_system VARCHAR(25) DEFAULT NULL,
@@ -380,12 +380,12 @@ 
 					QST_wp_user BIGINT UNSIGNED NULL,
 					QST_deleted TINYINT UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
-		EEH_Activation::drop_index( 'esp_question_group', 'QSG_identifier_UNIQUE' );
+		EEH_Activation::drop_index('esp_question_group', 'QSG_identifier_UNIQUE');
 
 		$table_name = 'esp_question_group';
-		$sql='QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$sql = 'QSG_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_name VARCHAR(255) NOT NULL,
 					QSG_identifier VARCHAR(100) NOT NULL,
 					QSG_desc TEXT NULL,
@@ -396,27 +396,27 @@ 
 					QSG_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_group_question';
-		$sql="QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSG_ID INT UNSIGNED NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					PRIMARY KEY  (QGQ_ID) ";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
-		$table_name='esp_question_option';
-		$sql="QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID INT UNSIGNED NOT NULL AUTO_INCREMENT,
 					QSO_value VARCHAR(255) NOT NULL,
 					QSO_desc TEXT NOT NULL,
 					QST_ID INT UNSIGNED NOT NULL,
 					QSO_deleted TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-		$this->_table_is_new_in_this_version($table_name,$sql, 'ENGINE=InnoDB');
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
 
 
 
@@ -449,8 +449,8 @@ 
 
 
 
-		$table_name='esp_checkin';
-		$sql="CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
 					REG_ID INT(10) UNSIGNED NOT NULL,
 					DTT_ID INT(10) UNSIGNED NOT NULL,
 					CHK_in TINYINT(1) UNSIGNED NOT NULL DEFAULT 1,
@@ -557,12 +557,12 @@ 
 
 		global $wpdb;
 		$state_table = $wpdb->prefix."esp_state";
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '" . $state_table . "'") == $state_table ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE '".$state_table."'") == $state_table) {
 
-			$SQL = "SELECT COUNT('STA_ID') FROM " . $state_table;
+			$SQL = "SELECT COUNT('STA_ID') FROM ".$state_table;
 			$states = $wpdb->get_var($SQL);
-			if ( ! $states ) {
-				$SQL = "INSERT INTO " . $state_table . "
+			if ( ! $states) {
+				$SQL = "INSERT INTO ".$state_table."
 				(STA_ID, CNT_ISO, STA_abbrev, STA_name, STA_active) VALUES
 				(1, 'US', 'AK', 'Alaska', 1),
 				(2, 'US', 'AL', 'Alabama', 1),
@@ -649,12 +649,12 @@ 
 
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '" . $country_table . "'") == $country_table ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE '".$country_table."'") == $country_table) {
 
-			$SQL = "SELECT COUNT('CNT_ISO') FROM " . $country_table;
+			$SQL = "SELECT COUNT('CNT_ISO') FROM ".$country_table;
 			$countries = $wpdb->get_var($SQL);
-			if ( ! $countries ) {
-				$SQL = "INSERT INTO " . $country_table . "
+			if ( ! $countries) {
+				$SQL = "INSERT INTO ".$country_table."
 				(CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active) VALUES
 				('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
 				('AE', 'ARE', 0, 'United Arab Emirates', 'AED', 'Dirham', 'Dirhams', 'د.إ', 1, 2, '+971', 0, 0),
@@ -903,18 +903,18 @@ 
 
 		if ($wpdb->get_var("SHOW TABLES LIKE '$price_type_table'") == $price_type_table) {
 
-			$SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
-			$price_types_exist = $wpdb->get_var( $SQL );
+			$SQL = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table;
+			$price_types_exist = $wpdb->get_var($SQL);
 
-			if ( ! $price_types_exist ) {
+			if ( ! $price_types_exist) {
 				$SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_deleted ) VALUES
-							(1, '" . __('Base Price', 'event_espresso') . "', 1,  0, 0, 0),
-							(2, '" . __('Percent Discount', 'event_espresso') . "', 2,  1, 20, 0),
-							(3, '" . __('Fixed Discount', 'event_espresso') . "', 2,  0, 30, 0),
-							(4, '" . __('Percent Surcharge', 'event_espresso') . "', 3,  1, 40, 0),
-							(5, '" . __('Fixed Surcharge', 'event_espresso') . "', 3,  0, 50, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL );
-				$wpdb->query( $SQL );
+							(1, '".__('Base Price', 'event_espresso')."', 1,  0, 0, 0),
+							(2, '" . __('Percent Discount', 'event_espresso')."', 2,  1, 20, 0),
+							(3, '" . __('Fixed Discount', 'event_espresso')."', 2,  0, 30, 0),
+							(4, '" . __('Percent Surcharge', 'event_espresso')."', 3,  1, 40, 0),
+							(5, '" . __('Fixed Surcharge', 'event_espresso')."', 3,  0, 50, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL);
+				$wpdb->query($SQL);
 			}
 		}
 	}
@@ -936,14 +936,14 @@ 
 
 		if ($wpdb->get_var("SHOW TABLES LIKE '$price_table'") == $price_table) {
 
-			$SQL = 'SELECT COUNT(PRC_ID) FROM ' .$price_table;
-			$prices_exist = $wpdb->get_var( $SQL );
+			$SQL = 'SELECT COUNT(PRC_ID) FROM '.$price_table;
+			$prices_exist = $wpdb->get_var($SQL);
 
-			if ( ! $prices_exist ) {
+			if ( ! $prices_exist) {
 				$SQL = "INSERT INTO $price_table
 							(PRC_ID, PRT_ID, PRC_amount, PRC_name, PRC_desc,  PRC_is_default, PRC_overrides, PRC_order, PRC_deleted, PRC_parent ) VALUES
 							(1, 1, '0.00', 'Free Admission', '', 1, NULL, 0, 0, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_prices__SQL', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_prices__SQL', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
@@ -960,34 +960,34 @@ 
 
 		global $wpdb;
 		$ticket_table = $wpdb->prefix."esp_ticket";
-		if ( $wpdb->get_var("SHOW TABLES LIKE'$ticket_table'") == $ticket_table ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE'$ticket_table'") == $ticket_table) {
 
-			$SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
+			$SQL = 'SELECT COUNT(TKT_ID) FROM '.$ticket_table;
 			$tickets_exist = $wpdb->get_var($SQL);
 
-			if ( ! $tickets_exist ) {
+			if ( ! $tickets_exist) {
 				$SQL = "INSERT INTO $ticket_table
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_deleted ) VALUES
-					( 1, 0, '" . __("Free Ticket", "event_espresso") . "', '', 100, 0, -1, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL );
+					( 1, 0, '".__("Free Ticket", "event_espresso")."', '', 100, 0, -1, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
 		$ticket_price_table = $wpdb->prefix."esp_ticket_price";
 
-		if ( $wpdb->get_var("SHOW TABLES LIKE'$ticket_price_table'") == $ticket_price_table ) {
+		if ($wpdb->get_var("SHOW TABLES LIKE'$ticket_price_table'") == $ticket_price_table) {
 
-			$SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
+			$SQL = 'SELECT COUNT(TKP_ID) FROM '.$ticket_price_table;
 			$ticket_prc_exist = $wpdb->get_var($SQL);
 
-			if ( ! $ticket_prc_exist ) {
+			if ( ! $ticket_prc_exist) {
 
 				$SQL = "INSERT INTO $ticket_price_table
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
 				( 1, 1, 1 )
 				";
 
-				$SQL = apply_filters( 'FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL );
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL);
 				$wpdb->query($SQL);
 			}
 		}
@@ -1000,20 +1000,20 @@ 
 	 * @param string $country_name
 	 * @return array where keys are columns, values are column values
 	 */
-	public function get_or_create_country($country_name){
-		if( ! $country_name ){
+	public function get_or_create_country($country_name) {
+		if ( ! $country_name) {
 			throw new EE_Error(__("Could not get a country because country name is blank", "event_espresso"));
 		}
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
-		if(is_int($country_name)){
+		if (is_int($country_name)) {
 			$country_name = $this->get_iso_from_3_1_country_id($country_name);
 		}
 		$country = $wpdb->get_row($wpdb->prepare("SELECT * FROM $country_table WHERE
 			CNT_ISO LIKE %s OR
 			CNT_ISO3 LIKE %s OR
-			CNT_name LIKE %s LIMIT 1",$country_name,$country_name,$country_name),ARRAY_A);
-		if( ! $country ){
+			CNT_name LIKE %s LIMIT 1", $country_name, $country_name, $country_name), ARRAY_A);
+		if ( ! $country) {
 			//insert a new one then
 			$cols_n_values = array(
 				'CNT_ISO'=> $this->_find_available_country_iso(2),
@@ -1033,26 +1033,26 @@ 
 				'CNT_active'=>true
 			);
 			$data_types = array(
-				'%s',//CNT_ISO
-				'%s',//CNT_ISO3
-				'%d',//RGN_ID
-				'%s',//CNT_name
-				'%s',//CNT_cur_code
-				'%s',//CNT_cur_single
-				'%s',//CNT_cur_plural
-				'%s',//CNT_cur_sign
-				'%d',//CNT_cur_sign_b4
-				'%d',//CNT_cur_dec_plc
-				'%s',//CNT_cur_dec_mrk
-				'%s',//CNT_cur_thsnds
-				'%s',//CNT_tel_code
-				'%d',//CNT_is_EU
-				'%d',//CNT_active
+				'%s', //CNT_ISO
+				'%s', //CNT_ISO3
+				'%d', //RGN_ID
+				'%s', //CNT_name
+				'%s', //CNT_cur_code
+				'%s', //CNT_cur_single
+				'%s', //CNT_cur_plural
+				'%s', //CNT_cur_sign
+				'%d', //CNT_cur_sign_b4
+				'%d', //CNT_cur_dec_plc
+				'%s', //CNT_cur_dec_mrk
+				'%s', //CNT_cur_thsnds
+				'%s', //CNT_tel_code
+				'%d', //CNT_is_EU
+				'%d', //CNT_active
 			);
 			$success = $wpdb->insert($country_table,
 					$cols_n_values,
 					$data_types);
-			if( ! $success){
+			if ( ! $success) {
 				throw new EE_Error($this->_create_error_message_for_db_insertion('N/A', array('country_id'=>$country_name), $country_table, $cols_n_values, $data_types));
 			}
 			$country = $cols_n_values;
@@ -1064,13 +1064,13 @@ 
 	 * @global type $wpdb
 	 * @return string
 	 */
-	private function _find_available_country_iso($num_letters = 2){
+	private function _find_available_country_iso($num_letters = 2) {
 		global $wpdb;
 		$country_table = $wpdb->prefix."esp_country";
-		do{
+		do {
 			$current_iso = strtoupper(wp_generate_password($num_letters, false));
-			$country_with_that_iso = $wpdb->get_var($wpdb->prepare("SELECT count(CNT_ISO) FROM ".$country_table." WHERE CNT_ISO=%s",$current_iso));
-		}while(intval($country_with_that_iso));
+			$country_with_that_iso = $wpdb->get_var($wpdb->prepare("SELECT count(CNT_ISO) FROM ".$country_table." WHERE CNT_ISO=%s", $current_iso));
+		}while (intval($country_with_that_iso));
 		return $current_iso;
 	}
 
@@ -1081,14 +1081,14 @@ 
 	 * @param string $state_name
 	 * @return array where keys are columns, values are column values
 	 */
-	public function get_or_create_state($state_name,$country_name = ''){
-		if( ! $state_name ){
+	public function get_or_create_state($state_name, $country_name = '') {
+		if ( ! $state_name) {
 			throw new EE_Error(__("Could not get-or-create state because no state name was provided", "event_espresso"));
 		}
-		try{
+		try {
 			$country = $this->get_or_create_country($country_name);
 			$country_iso = $country['CNT_ISO'];
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			$country_iso = $this->get_default_country_iso();
 		}
 		global $wpdb;
@@ -1096,24 +1096,24 @@ 
 		$state = $wpdb->get_row($wpdb->prepare("SELECT * FROM $state_table WHERE
 			(STA_abbrev LIKE %s OR
 			STA_name LIKE %s) AND
-			CNT_ISO LIKE %s LIMIT 1",$state_name,$state_name,$country_iso),ARRAY_A);
-		if ( ! $state){
+			CNT_ISO LIKE %s LIMIT 1", $state_name, $state_name, $country_iso), ARRAY_A);
+		if ( ! $state) {
 			//insert a new one then
 			$cols_n_values = array(
 				'CNT_ISO'=>$country_iso,
-				'STA_abbrev'=>substr($state_name,0,6),
+				'STA_abbrev'=>substr($state_name, 0, 6),
 				'STA_name'=>$state_name,
 				'STA_active'=>true
 			);
 			$data_types = array(
-				'%s',//CNT_ISO
-				'%s',//STA_abbrev
-				'%s',//STA_name
-				'%d',//STA_active
+				'%s', //CNT_ISO
+				'%s', //STA_abbrev
+				'%s', //STA_name
+				'%d', //STA_active
 			);
-			$success = $wpdb->insert($state_table,$cols_n_values,$data_types);
-			if ( ! $success ){
-				throw new EE_Error($this->_create_error_message_for_db_insertion('N/A', array('state'=>$state_name,'country_id'=>$country_name), $state_table, $cols_n_values, $data_types));
+			$success = $wpdb->insert($state_table, $cols_n_values, $data_types);
+			if ( ! $success) {
+				throw new EE_Error($this->_create_error_message_for_db_insertion('N/A', array('state'=>$state_name, 'country_id'=>$country_name), $state_table, $cols_n_values, $data_types));
 			}
 			$state = $cols_n_values;
 			$state['STA_ID'] = $wpdb->insert_id;
@@ -1126,21 +1126,21 @@ 
 	 * @param type $timeString
 	 * @return string in the php DATETIME format: "G:i" (24-hour format hour with leading zeros, a colon, and minutes with leading zeros)
 	 */
-	public function convertTimeFromAMPM($timeString){
+	public function convertTimeFromAMPM($timeString) {
 		$matches = array();
-		preg_match("~(\\d*):(\\d*)~",$timeString,$matches);
-		if( ! $matches || count($matches)<3){
+		preg_match("~(\\d*):(\\d*)~", $timeString, $matches);
+		if ( ! $matches || count($matches) < 3) {
 			$hour = '00';
 			$minutes = '00';
-		}else{
+		} else {
 			$hour = intval($matches[1]);
 			$minutes = $matches[2];
 		}
-		if(strpos($timeString, 'PM') || strpos($timeString, 'pm')){
+		if (strpos($timeString, 'PM') || strpos($timeString, 'pm')) {
 			$hour = intval($hour) + 12;
 		}
-		$hour = str_pad( "$hour", 2, '0',STR_PAD_LEFT);
-		$minutes = str_pad( "$minutes", 2, '0',STR_PAD_LEFT);
+		$hour = str_pad("$hour", 2, '0', STR_PAD_LEFT);
+		$minutes = str_pad("$minutes", 2, '0', STR_PAD_LEFT);
 		return "$hour:$minutes";
 	}
 
@@ -1149,7 +1149,7 @@ 
 	 * @param int $country_id
 	 * @return string the country's ISO3 code
 	 */
-	public function get_iso_from_3_1_country_id($country_id){
+	public function get_iso_from_3_1_country_id($country_id) {
 		$old_countries = array(
 			array(64, 'United States', 'US', 'USA', 1),
 			array(15, 'Australia', 'AU', 'AUS', 1),
@@ -1375,9 +1375,9 @@ 
 			array(226, 'Zimbabwe', 'ZW', 'ZWE', 1));
 
 		$country_iso = 'US';
-		foreach($old_countries as $country_array){
+		foreach ($old_countries as $country_array) {
 			//note: index 0 is the 3.1 country ID
-			if($country_array[0] == $country_id){
+			if ($country_array[0] == $country_id) {
 				//note: index 2 is the ISO
 				$country_iso = $country_array[2];
 				break;
@@ -1390,8 +1390,8 @@ 
 	 * Gets the ISO3 for the
 	 * @return string
 	 */
-	public function get_default_country_iso(){
-		$old_org_options= get_option('events_organization_settings');
+	public function get_default_country_iso() {
+		$old_org_options = get_option('events_organization_settings');
 		$iso = $this->get_iso_from_3_1_country_id($old_org_options['organization_country']);
 		return $iso;
 	}
@@ -1403,13 +1403,13 @@ 
 	 * the event's DEFAULT payment status, or the attendee's payment status) required pre-approval.
 	 * @return string STS_ID for use in 4.1
 	 */
-	public function convert_3_1_payment_status_to_4_1_STS_ID($payment_status, $this_thing_required_pre_approval = false){
+	public function convert_3_1_payment_status_to_4_1_STS_ID($payment_status, $this_thing_required_pre_approval = false) {
 
 		//EE team can read the related discussion: https://app.asana.com/0/2400967562914/9418495544455
-		if($this_thing_required_pre_approval){
+		if ($this_thing_required_pre_approval) {
 				return 'RNA';
-		}else{
-				$mapping = $default_reg_stati_conversions=array(
+		} else {
+				$mapping = $default_reg_stati_conversions = array(
 			'Completed'=>'RAP',
 			''=>'RPP',
 			'Incomplete'=>'RPP',
@@ -1439,22 +1439,22 @@ 
 	 * @param  EE_Data_Migration_Script_Stage $migration_stage the stage which called this, where errors should be added
 	 * @return boolean whether or not we had to do the big job of creating an image attachment
 	 */
-	public function convert_image_url_to_attachment_and_attach_to_post($guid,$new_cpt_id,  EE_Data_Migration_Script_Stage $migration_stage){
+	public function convert_image_url_to_attachment_and_attach_to_post($guid, $new_cpt_id, EE_Data_Migration_Script_Stage $migration_stage) {
 		$created_attachment_post = false;
 		$guid = $this->_get_original_guid($guid);
-		if($guid){
+		if ($guid) {
 			//check for an existing attachment post with this guid
 			$attachment_post_id = $this->_get_image_attachment_id_by_GUID($guid);
-			if( ! $attachment_post_id){
+			if ( ! $attachment_post_id) {
 				//post thumbnail with that GUID doesn't exist, we should create one
 				$attachment_post_id = $this->_create_image_attachment_from_GUID($guid, $migration_stage);
 				$created_attachment_post = true;
 			}
 			//double-check we actually have an attachment post
-			if( $attachment_post_id){
-				update_post_meta($new_cpt_id,'_thumbnail_id',$attachment_post_id);
-			}else{
-				$migration_stage->add_error(sprintf(__("Could not update event image %s for CPT with ID %d, but attachments post ID is %d", "event_espresso"),$guid,$new_cpt_id,$attachment_post_id));
+			if ($attachment_post_id) {
+				update_post_meta($new_cpt_id, '_thumbnail_id', $attachment_post_id);
+			} else {
+				$migration_stage->add_error(sprintf(__("Could not update event image %s for CPT with ID %d, but attachments post ID is %d", "event_espresso"), $guid, $new_cpt_id, $attachment_post_id));
 			}
 		}
 		return $created_attachment_post;
@@ -1468,13 +1468,13 @@ 
 	 * @param string $guid_in_old_event
 	 * @return string either the original guid, or $guid_in_old_event if we couldn't figure out what the original was
 	 */
-	private function _get_original_guid($guid_in_old_event){
-		$original_guid = preg_replace('~-\d*x\d*\.~','.',$guid_in_old_event,1);
+	private function _get_original_guid($guid_in_old_event) {
+		$original_guid = preg_replace('~-\d*x\d*\.~', '.', $guid_in_old_event, 1);
 		//do a head request to verify the file exists
 		$head_response = wp_remote_head($original_guid);
-		if( ! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK'){
+		if ( ! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK') {
 			return $original_guid;
-		}else{
+		} else {
 			return $guid_in_old_event;
 		}
 	}
@@ -1486,32 +1486,32 @@ 
 	 * @param EE_Data_Migration_Script_Stage $migration_stage
 	 * @return int
 	 */
-	private function _create_image_attachment_from_GUID($guid, EE_Data_Migration_Script_Stage $migration_stage){
-		if ( ! $guid){
+	private function _create_image_attachment_from_GUID($guid, EE_Data_Migration_Script_Stage $migration_stage) {
+		if ( ! $guid) {
 			$migration_stage->add_error(sprintf(__("Cannot create image attachment for a blank GUID!", "event_espresso")));
 			return 0;
 		}
-		$wp_filetype = wp_check_filetype(basename($guid), null );
+		$wp_filetype = wp_check_filetype(basename($guid), null);
 		$wp_upload_dir = wp_upload_dir();
 		//if the file is located remotely, download it to our uploads DIR, because wp_genereate_attachmnet_metadata needs the file to be local
-		if(strpos($guid,$wp_upload_dir['url']) === FALSE){
+		if (strpos($guid, $wp_upload_dir['url']) === FALSE) {
 			//image is located remotely. download it and place it in the uploads directory
-			if( ! is_readable($guid)){
-				$migration_stage->add_error(sprintf(__("Could not create image attachment from non-existent file: %s", "event_espresso"),$guid));
+			if ( ! is_readable($guid)) {
+				$migration_stage->add_error(sprintf(__("Could not create image attachment from non-existent file: %s", "event_espresso"), $guid));
 				return 0;
 			}
-			$contents= file_get_contents($guid);
-			if($contents === FALSE){
-				$migration_stage->add_error(sprintf(__("Could not read image at %s, and therefore couldnt create an attachment post for it.", "event_espresso"),$guid));
+			$contents = file_get_contents($guid);
+			if ($contents === FALSE) {
+				$migration_stage->add_error(sprintf(__("Could not read image at %s, and therefore couldnt create an attachment post for it.", "event_espresso"), $guid));
 				return false;
 			}
-			$local_filepath  = $wp_upload_dir['path'].DS.basename($guid);
+			$local_filepath = $wp_upload_dir['path'].DS.basename($guid);
 			$savefile = fopen($local_filepath, 'w');
 			fwrite($savefile, $contents);
 			fclose($savefile);
-			$guid = str_replace($wp_upload_dir['path'],$wp_upload_dir['url'],$local_filepath);
-		}else{
-			$local_filepath = str_replace($wp_upload_dir['url'],$wp_upload_dir['path'],$guid);
+			$guid = str_replace($wp_upload_dir['path'], $wp_upload_dir['url'], $local_filepath);
+		} else {
+			$local_filepath = str_replace($wp_upload_dir['url'], $wp_upload_dir['path'], $guid);
 		}
 
 		$attachment = array(
@@ -1521,24 +1521,24 @@ 
 		   'post_content' => '',
 		   'post_status' => 'inherit'
 		);
-		$attach_id = wp_insert_attachment( $attachment, $guid );
-		if( ! $attach_id ){
-			$migration_stage->add_error(sprintf(__("Could not create image attachment post from image '%s'. Attachment data was %s.", "event_espresso"),$guid,$this->_json_encode($attachment)));
+		$attach_id = wp_insert_attachment($attachment, $guid);
+		if ( ! $attach_id) {
+			$migration_stage->add_error(sprintf(__("Could not create image attachment post from image '%s'. Attachment data was %s.", "event_espresso"), $guid, $this->_json_encode($attachment)));
 			return $attach_id;
 		}
 
 		// you must first include the image.php file
 		// for the function wp_generate_attachment_metadata() to work
-		require_once(ABSPATH . 'wp-admin/includes/image.php');
+		require_once(ABSPATH.'wp-admin/includes/image.php');
 
-		$attach_data = wp_generate_attachment_metadata( $attach_id, $local_filepath );
-		if( ! $attach_data){
-			$migration_stage->add_error(sprintf(__("Coudl not genereate attachment metadata for attachment post %d with filepath %s and GUID %s. Please check the file was downloaded properly.", "event_espresso"),$attach_id,$local_filepath,$guid));
+		$attach_data = wp_generate_attachment_metadata($attach_id, $local_filepath);
+		if ( ! $attach_data) {
+			$migration_stage->add_error(sprintf(__("Coudl not genereate attachment metadata for attachment post %d with filepath %s and GUID %s. Please check the file was downloaded properly.", "event_espresso"), $attach_id, $local_filepath, $guid));
 			return $attach_id;
 		}
-		$metadata_save_result = wp_update_attachment_metadata( $attach_id, $attach_data );
-		if( ! $metadata_save_result ){
-			$migration_stage->add_error(sprintf(__("Could not update attachment metadata for attachment %d with data %s", "event_espresso"),$attach_id,$this->_json_encode($attach_data)));
+		$metadata_save_result = wp_update_attachment_metadata($attach_id, $attach_data);
+		if ( ! $metadata_save_result) {
+			$migration_stage->add_error(sprintf(__("Could not update attachment metadata for attachment %d with data %s", "event_espresso"), $attach_id, $this->_json_encode($attach_data)));
 		}
 		return $attach_id;
 	}
@@ -1550,9 +1550,9 @@ 
 	 * @param string $guid
 	 * @return int
 	 */
-	private function _get_image_attachment_id_by_GUID($guid){
+	private function _get_image_attachment_id_by_GUID($guid) {
 		global $wpdb;
-		$attachment_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE guid=%s LIMIT 1",$guid));
+		$attachment_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE guid=%s LIMIT 1", $guid));
 		return $attachment_id;
 	}
 	/**
@@ -1564,20 +1564,20 @@ 
 	 * @param string $timezone
 	 * @return string
 	 */
-	public function convert_date_string_to_utc(EE_Data_Migration_Script_Stage $stage, $row_of_data, $DATETIME_string,$timezone = null){
+	public function convert_date_string_to_utc(EE_Data_Migration_Script_Stage $stage, $row_of_data, $DATETIME_string, $timezone = null) {
 		$original_tz = $timezone;
-		if( ! $timezone){
+		if ( ! $timezone) {
 			$timezone = $this->_get_wp_timezone();
 		}
-		if( ! $timezone){
-			$stage->add_error(sprintf(__("Could not find timezone given %s for %s", "event_espresso"),$original_tz,$row_of_data));
+		if ( ! $timezone) {
+			$stage->add_error(sprintf(__("Could not find timezone given %s for %s", "event_espresso"), $original_tz, $row_of_data));
 			$timezone = 'UTC';
 		}
-		try{
-			$date_obj = new DateTime( $DATETIME_string, new DateTimeZone( $timezone ) );
+		try {
+			$date_obj = new DateTime($DATETIME_string, new DateTimeZone($timezone));
 			$date_obj->setTimezone(new DateTimeZone('UTC'));
-		}catch(Exception $e){
-			$stage->add_error(sprintf(__("Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.", "event_espresso"),$DATETIME_string,$timezone));
+		} catch (Exception $e) {
+			$stage->add_error(sprintf(__("Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.", "event_espresso"), $DATETIME_string, $timezone));
 			$date_obj = new DateTime();
 		}
 
@@ -1588,14 +1588,14 @@ 
 	 * Gets the DEFAULT timezone string from wordpress (even if they set a gmt offset)
 	 * @return string
 	 */
-	private function _get_wp_timezone(){
-		$timezone = empty( $timezone ) ? get_option('timezone_string') : $timezone;
+	private function _get_wp_timezone() {
+		$timezone = empty($timezone) ? get_option('timezone_string') : $timezone;
 
 		//if timezone is STILL empty then let's get the GMT offset and then set the timezone_string using our converter
-		if ( empty( $timezone ) ) {
+		if (empty($timezone)) {
 			//let's get a the WordPress UTC offset
 			$offset = get_option('gmt_offset');
-			$timezone = $this->timezone_convert_to_string_from_offset( $offset );
+			$timezone = $this->timezone_convert_to_string_from_offset($offset);
 		}
 		return $timezone;
 	}
@@ -1604,11 +1604,11 @@ 
 	 * @param int $offset
 	 * @return boolean
 	 */
-	private function timezone_convert_to_string_from_offset($offset){
+	private function timezone_convert_to_string_from_offset($offset) {
 		//shamelessly taken from bottom comment at http://ca1.php.net/manual/en/function.timezone-name-from-abbr.php because timezone_name_from_abbr() did NOT work as expected - its not reliable
 		$offset *= 3600; // convert hour offset to seconds
         $abbrarray = timezone_abbreviations_list();
-        foreach ($abbrarray as $abbr){
+        foreach ($abbrarray as $abbr) {
                 foreach ($abbr as $city)
                 {
                         if ($city['offset'] == $offset)
@@ -1622,32 +1622,32 @@ 
         return FALSE;
 	}
 
-	public function migration_page_hooks(){
-		add_filter('FHEE__ee_migration_page__header',array($this,'_migrate_page_hook_simplify_version_strings'),10,3);
-		add_filter('FHEE__ee_migration_page__p_after_header',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_filter('FHEE__ee_migration_page__option_1_main',array($this,'_migrate_page_hook_simplify_version_strings'),10,3);
-		add_filter('FHEE__ee_migration_page__option_1_button_text',array($this,'_migrate_page_hook_simplify_version_strings'),10,3);
-		add_action('AHEE__ee_migration_page__option_1_extra_details',array($this,'_migration_page_hook_option_1_extra_details'),10,3);
-		add_filter('FHEE__ee_migration_page__option_2_main',array($this,'_migrate_page_hook_simplify_version_strings'),10,4);
-		add_filter('FHEE__ee_migration_page__option_2_button_text',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_filter('FHEE__ee_migration_page__option_2_details',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_action('AHEE__ee_migration_page__after_migration_options_table',array($this,'_migration_page_hook_after_migration_options_table'));
-		add_filter('FHEE__ee_migration_page__done_migration_header',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
-		add_filter('FHEE__ee_migration_page__p_after_done_migration_header',array($this,'_migration_page_hook_simplify_next_db_state'),10,2);
+	public function migration_page_hooks() {
+		add_filter('FHEE__ee_migration_page__header', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 3);
+		add_filter('FHEE__ee_migration_page__p_after_header', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_filter('FHEE__ee_migration_page__option_1_main', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 3);
+		add_filter('FHEE__ee_migration_page__option_1_button_text', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 3);
+		add_action('AHEE__ee_migration_page__option_1_extra_details', array($this, '_migration_page_hook_option_1_extra_details'), 10, 3);
+		add_filter('FHEE__ee_migration_page__option_2_main', array($this, '_migrate_page_hook_simplify_version_strings'), 10, 4);
+		add_filter('FHEE__ee_migration_page__option_2_button_text', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_filter('FHEE__ee_migration_page__option_2_details', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_action('AHEE__ee_migration_page__after_migration_options_table', array($this, '_migration_page_hook_after_migration_options_table'));
+		add_filter('FHEE__ee_migration_page__done_migration_header', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
+		add_filter('FHEE__ee_migration_page__p_after_done_migration_header', array($this, '_migration_page_hook_simplify_next_db_state'), 10, 2);
 	}
 
-	public function _migrate_page_hook_simplify_version_strings($old_content,$current_db_state,$next_db_state,$ultimate_db_state = NULL){
-		return str_replace(array($current_db_state,$next_db_state,$ultimate_db_state),array(__('EE3','event_espresso'),__('EE4','event_espresso'),  __("EE4", 'event_espresso')),$old_content);
+	public function _migrate_page_hook_simplify_version_strings($old_content, $current_db_state, $next_db_state, $ultimate_db_state = NULL) {
+		return str_replace(array($current_db_state, $next_db_state, $ultimate_db_state), array(__('EE3', 'event_espresso'), __('EE4', 'event_espresso'), __("EE4", 'event_espresso')), $old_content);
 	}
-	public function _migration_page_hook_simplify_next_db_state($old_content,$next_db_state){
-		return str_replace($next_db_state,  __("EE4", 'event_espresso'),$old_content);
+	public function _migration_page_hook_simplify_next_db_state($old_content, $next_db_state) {
+		return str_replace($next_db_state, __("EE4", 'event_espresso'), $old_content);
 	}
-	public function _migration_page_hook_option_1_extra_details(){
-		?><p><?php	printf(__("Note: many of your EE3 shortcodes will be changed to EE4 shortcodes during this migration (among many other things). Should you revert to EE3, then you should restore to your backup or manually change the EE4 shortcodes back to their EE3 equivalents", "event_espresso"));?></p><?php
+	public function _migration_page_hook_option_1_extra_details() {
+		?><p><?php	printf(__("Note: many of your EE3 shortcodes will be changed to EE4 shortcodes during this migration (among many other things). Should you revert to EE3, then you should restore to your backup or manually change the EE4 shortcodes back to their EE3 equivalents", "event_espresso")); ?></p><?php
 	}
-	public function _migration_page_hook_after_migration_options_table(){
+	public function _migration_page_hook_after_migration_options_table() {
 		?><p class="ee-attention">
-				<strong><span class="reminder-spn"><?php _e("Important note to those using Event Espresso 3 addons: ", "event_espresso");?></span></strong><br/><?php _e("Unless an addon's description on our website explicitly states that it is compatible with EE4, you should consider it incompatible and know that it WILL NOT WORK correctly with this new version of Event Espresso 4 (EE4). As well, any data for incompatible addons will NOT BE MIGRATED until an updated EE4 compatible version of the addon is available. If you want, or need to keep using your EE3 addons, you should simply continue using EE3 until EE4 compatible versions of your addons become available. To continue using EE3 for now, just deactivate EE4 and reactivate EE3.", "event_espresso");	?>
+				<strong><span class="reminder-spn"><?php _e("Important note to those using Event Espresso 3 addons: ", "event_espresso"); ?></span></strong><br/><?php _e("Unless an addon's description on our website explicitly states that it is compatible with EE4, you should consider it incompatible and know that it WILL NOT WORK correctly with this new version of Event Espresso 4 (EE4). As well, any data for incompatible addons will NOT BE MIGRATED until an updated EE4 compatible version of the addon is available. If you want, or need to keep using your EE3 addons, you should simply continue using EE3 until EE4 compatible versions of your addons become available. To continue using EE3 for now, just deactivate EE4 and reactivate EE3.", "event_espresso"); ?>
 			</p><?php
 	}
 }

Braces +10 added lines, -10 removed lines

@@ -72,7 +72,7 @@ 
 		$results = $wpdb->get_results("SHOW TABLES LIKE '".$wpdb->prefix."events_attendee_checkin"."'");
 		if($results){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -81,12 +81,12 @@ 
 		if($version_string < '4.0.0' && $version_string > '3.1.26' ){
 //			echo "$version_string can be migrated fro";
 			return true;
-		}elseif( ! $version_string ){
+		} elseif( ! $version_string ){
 //			echo "no version string provided: $version_string";
 			//no version string provided... this must be pre 4.1
 			//because since 4.1 we're
 			return false;//changed mind. dont want people thinking they should migrate yet because they cant
-		}else{
+		} else{
 //			echo "$version_string doesnt apply";
 			return false;
 		}
@@ -1088,7 +1088,7 @@ 
 		try{
 			$country = $this->get_or_create_country($country_name);
 			$country_iso = $country['CNT_ISO'];
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			$country_iso = $this->get_default_country_iso();
 		}
 		global $wpdb;
@@ -1132,7 +1132,7 @@ 
 		if( ! $matches || count($matches)<3){
 			$hour = '00';
 			$minutes = '00';
-		}else{
+		} else{
 			$hour = intval($matches[1]);
 			$minutes = $matches[2];
 		}
@@ -1408,7 +1408,7 @@ 
 		//EE team can read the related discussion: https://app.asana.com/0/2400967562914/9418495544455
 		if($this_thing_required_pre_approval){
 				return 'RNA';
-		}else{
+		} else{
 				$mapping = $default_reg_stati_conversions=array(
 			'Completed'=>'RAP',
 			''=>'RPP',
@@ -1453,7 +1453,7 @@ 
 			//double-check we actually have an attachment post
 			if( $attachment_post_id){
 				update_post_meta($new_cpt_id,'_thumbnail_id',$attachment_post_id);
-			}else{
+			} else{
 				$migration_stage->add_error(sprintf(__("Could not update event image %s for CPT with ID %d, but attachments post ID is %d", "event_espresso"),$guid,$new_cpt_id,$attachment_post_id));
 			}
 		}
@@ -1474,7 +1474,7 @@ 
 		$head_response = wp_remote_head($original_guid);
 		if( ! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK'){
 			return $original_guid;
-		}else{
+		} else{
 			return $guid_in_old_event;
 		}
 	}
@@ -1510,7 +1510,7 @@ 
 			fwrite($savefile, $contents);
 			fclose($savefile);
 			$guid = str_replace($wp_upload_dir['path'],$wp_upload_dir['url'],$local_filepath);
-		}else{
+		} else{
 			$local_filepath = str_replace($wp_upload_dir['url'],$wp_upload_dir['path'],$guid);
 		}
 
@@ -1576,7 +1576,7 @@ 
 		try{
 			$date_obj = new DateTime( $DATETIME_string, new DateTimeZone( $timezone ) );
 			$date_obj->setTimezone(new DateTimeZone('UTC'));
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$stage->add_error(sprintf(__("Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.", "event_espresso"),$DATETIME_string,$timezone));
 			$date_obj = new DateTime();
 		}

core/db_classes/EE_Answer.class.php

Doc Comments +4 added lines, -4 removed lines

@@ -77,7 +77,7 @@ 
 	 *    Set Answer value
 	 *
 	 * @access        public
-	 * @param mixed $ANS_value
+	 * @param string $ANS_value
 	 */
 	public function set_value( $ANS_value = '' ) {
 		$this->set( 'ANS_value', $ANS_value );
@@ -89,7 +89,7 @@ 
 	 *    get Attendee First Name
 	 *
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function registration_ID() {
 		return $this->get( 'REG_ID' );
@@ -101,7 +101,7 @@ 
 	 *    get Attendee Last Name
 	 *
 	 * @access        public
-	 * @return        int
+	 * @return        boolean
 	 */
 	public function question_ID() {
 		return $this->get( 'QST_ID' );
@@ -113,7 +113,7 @@ 
 	 *    get Attendee Address
 	 *
 	 * @access        public
-	 * @return        string
+	 * @return        boolean
 	 */
 	public function value() {
 		return $this->get( 'ANS_value' );

Spacing +22 added lines, -22 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
@@ -31,9 +31,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Answer
 	 */
-	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);
 	}
 
 
@@ -43,8 +43,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Answer
 	 */
-	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);
 	}
 
 
@@ -55,8 +55,8 @@ 
 	 * @access        public
 	 * @param int $QST_ID
 	 */
-	public function set_question( $QST_ID = 0 ) {
-		$this->set( 'QST_ID', $QST_ID );
+	public function set_question($QST_ID = 0) {
+		$this->set('QST_ID', $QST_ID);
 	}
 
 
@@ -67,8 +67,8 @@ 
 	 * @access        public
 	 * @param int $REG_ID
 	 */
-	public function set_registration( $REG_ID = 0 ) {
-		$this->set( 'REG_ID', $REG_ID );
+	public function set_registration($REG_ID = 0) {
+		$this->set('REG_ID', $REG_ID);
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 * @access        public
 	 * @param mixed $ANS_value
 	 */
-	public function set_value( $ANS_value = '' ) {
-		$this->set( 'ANS_value', $ANS_value );
+	public function set_value($ANS_value = '') {
+		$this->set('ANS_value', $ANS_value);
 	}
 
 
@@ -92,7 +92,7 @@ 
 	 * @return        int
 	 */
 	public function registration_ID() {
-		return $this->get( 'REG_ID' );
+		return $this->get('REG_ID');
 	}
 
 
@@ -104,7 +104,7 @@ 
 	 * @return        int
 	 */
 	public function question_ID() {
-		return $this->get( 'QST_ID' );
+		return $this->get('QST_ID');
 	}
 
 
@@ -116,7 +116,7 @@ 
 	 * @return        string
 	 */
 	public function value() {
-		return $this->get( 'ANS_value' );
+		return $this->get('ANS_value');
 	}
 
 
@@ -126,8 +126,8 @@ 
 	 * @param null $schema
 	 * @return string
 	 */
-	public function pretty_value( $schema = NULL ) {
-		return $this->get_pretty( 'ANS_value', $schema );
+	public function pretty_value($schema = NULL) {
+		return $this->get_pretty('ANS_value', $schema);
 	}
 
 
@@ -136,8 +136,8 @@ 
 	 * Echoes out a pretty value (even for multi-choice options)
 	 * @param string $schema
 	 */
-	public function e_value( $schema = NULL ) {
-		$this->e( 'ANS_value', $schema );
+	public function e_value($schema = NULL) {
+		$this->e('ANS_value', $schema);
 	}
 
 
@@ -147,7 +147,7 @@ 
 	 * @return EE_Question
 	 */
 	public function question() {
-		return $this->get_first_related( 'Question' );
+		return $this->get_first_related('Question');
 	}
 
 
@@ -157,7 +157,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function registration() {
-		return $this->get_first_related( 'Registration' );
+		return $this->get_first_related('Registration');
 	}
 }
 

core/db_classes/EE_Attendee.class.php

Doc Comments +13 added lines, -13 removed lines

@@ -216,7 +216,7 @@ 
 	 *
 	 * @since 4.5.0
 	 *
-	 * @return int
+	 * @return boolean
 	 */
 	public function wp_user() {
 		return $this->get( 'ATT_author' );
@@ -227,7 +227,7 @@ 
 	/**
 	 *        get Attendee First Name
 	 * @access        public
-	 * @return string
+	 * @return boolean
 	 */
 	public function fname() {
 		return $this->get( 'ATT_fname' );
@@ -260,7 +260,7 @@ 
 	/**
 	 *        get Attendee Last Name
 	 * @access        public
-	 * @return string
+	 * @return boolean
 	 */
 	public function lname() {
 		return $this->get( 'ATT_lname' );
@@ -305,7 +305,7 @@ 
 
 	/**
 	 *        get Attendee Address
-	 * @return string
+	 * @return boolean
 	 */
 	public function address() {
 		return $this->get( 'ATT_address' );
@@ -315,7 +315,7 @@ 
 
 	/**
 	 *        get Attendee Address2
-	 * @return string
+	 * @return boolean
 	 */
 	public function address2() {
 		return $this->get( 'ATT_address2' );
@@ -325,7 +325,7 @@ 
 
 	/**
 	 *        get Attendee City
-	 * @return string
+	 * @return boolean
 	 */
 	public function city() {
 		return $this->get( 'ATT_city' );
@@ -335,7 +335,7 @@ 
 
 	/**
 	 *        get Attendee State ID
-	 * @return string
+	 * @return boolean
 	 */
 	public function state_ID() {
 		return $this->get( 'STA_ID' );
@@ -392,7 +392,7 @@ 
 
 	/**
 	 *    get Attendee Country ISO Code
-	 * @return string
+	 * @return boolean
 	 */
 	public function country_ID() {
 		return $this->get( 'CNT_ISO' );
@@ -440,7 +440,7 @@ 
 
 	/**
 	 *        get Attendee Zip/Postal Code
-	 * @return string
+	 * @return boolean
 	 */
 	public function zip() {
 		return $this->get( 'ATT_zip' );
@@ -450,7 +450,7 @@ 
 
 	/**
 	 *        get Attendee Email Address
-	 * @return string
+	 * @return boolean
 	 */
 	public function email() {
 		return $this->get( 'ATT_email' );
@@ -460,7 +460,7 @@ 
 
 	/**
 	 *        get Attendee Phone #
-	 * @return string
+	 * @return boolean
 	 */
 	public function phone() {
 		return $this->get( 'ATT_phone' );
@@ -512,7 +512,7 @@ 
 
 	/**
 	 * returns any events attached to this attendee ($_Event property);
-	 * @return array
+	 * @return EE_Base_Class[]
 	 */
 	public function events() {
 		return $this->get_many_related( 'Event' );
@@ -522,7 +522,7 @@ 
 	 * Gets the billing info array where keys match espresso_reg_page_billing_inputs(),
 	 * and keys are their cleaned values. @see EE_Attendee::save_and_clean_billing_info_for_payment_method() which was used to save the billing info
 	 * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
-	 * @return EE_Form_Section_Proper
+	 * @return null|EE_Billing_Info_Form
 	 */
 	public function billing_info_for_payment_method($payment_method){
 		$pm_type = $payment_method->type_obj();

Braces +3 added lines, -3 removed lines

@@ -367,7 +367,7 @@ 
 	public function state_name(){
 		if( $this->state_obj() ){
 			return $this->state_obj()->name();
-		}else{
+		} else{
 			return __( 'Unknown', 'event_espresso' );
 		}
 	}
@@ -415,7 +415,7 @@ 
 	public function country_name(){
 		if( $this->country_obj() ){
 			return $this->country_obj()->name();
-		}else{
+		} else{
 			return __( 'Unknown', 'event_espresso' );
 		}
 	}
@@ -547,7 +547,7 @@ 
 	public function get_billing_info_postmeta_name($payment_method){
 		if( $payment_method->type_obj() instanceof EE_PMT_Base ){
 			return 'billing_info_' . $payment_method->type_obj()->system_name();
-		}else{
+		} else{
 			return NULL;
 		}
 	}

Spacing +97 added lines, -97 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
@@ -32,20 +32,20 @@ 
 	 * @param bool   $bydb
 	 * @param string $timezone
 	 */
-	protected function __construct( $fieldValues = NULL, $bydb = FALSE, $timezone = NULL ) {
-		if ( !isset( $fieldValues[ 'ATT_full_name' ] ) ) {
-			$fname = isset( $fieldValues[ 'ATT_fname' ] ) ? $fieldValues[ 'ATT_fname' ] . ' ' : '';
-			$lname = isset( $fieldValues[ 'ATT_lname' ] ) ? $fieldValues[ 'ATT_lname' ] : '';
-			$fieldValues[ 'ATT_full_name' ] = $fname . $lname;
+	protected function __construct($fieldValues = NULL, $bydb = FALSE, $timezone = NULL) {
+		if ( ! isset($fieldValues['ATT_full_name'])) {
+			$fname = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'].' ' : '';
+			$lname = isset($fieldValues['ATT_lname']) ? $fieldValues['ATT_lname'] : '';
+			$fieldValues['ATT_full_name'] = $fname.$lname;
 		}
-		if ( !isset( $fieldValues[ 'ATT_slug' ] ) ) {
+		if ( ! isset($fieldValues['ATT_slug'])) {
 			//			$fieldValues['ATT_slug'] = sanitize_key(wp_generate_password(20));
-			$fieldValues[ 'ATT_slug' ] = sanitize_title( $fieldValues[ 'ATT_full_name' ] );
+			$fieldValues['ATT_slug'] = sanitize_title($fieldValues['ATT_full_name']);
 		}
-		if ( !isset( $fieldValues[ 'ATT_short_bio' ] ) && isset( $fieldValues[ 'ATT_bio' ] ) ) {
-			$fieldValues[ 'ATT_short_bio' ] = substr( $fieldValues[ 'ATT_bio' ], 0, 50 );
+		if ( ! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
+			$fieldValues['ATT_short_bio'] = substr($fieldValues['ATT_bio'], 0, 50);
 		}
-		parent::__construct( $fieldValues, $bydb, $timezone );
+		parent::__construct($fieldValues, $bydb, $timezone);
 	}
 
 
@@ -55,10 +55,10 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Attendee
 	 */
-	public static function new_instance( $props_n_values = array() ) {
+	public static function new_instance($props_n_values = array()) {
 		$classname = __CLASS__;
-		$has_object = parent::_check_for_object( $props_n_values, $classname );
-		return $has_object ? $has_object : new self( $props_n_values );
+		$has_object = parent::_check_for_object($props_n_values, $classname);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -67,8 +67,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Attendee
 	 */
-	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);
 	}
 
 
@@ -79,8 +79,8 @@ 
 	 * @access        public
 	 * @param string $fname
 	 */
-	public function set_fname( $fname = '' ) {
-		$this->set( 'ATT_fname', $fname );
+	public function set_fname($fname = '') {
+		$this->set('ATT_fname', $fname);
 	}
 
 
@@ -91,8 +91,8 @@ 
 	 * @access        public
 	 * @param string $lname
 	 */
-	public function set_lname( $lname = '' ) {
-		$this->set( 'ATT_lname', $lname );
+	public function set_lname($lname = '') {
+		$this->set('ATT_lname', $lname);
 	}
 
 
@@ -103,8 +103,8 @@ 
 	 * @access        public
 	 * @param string $address
 	 */
-	public function set_address( $address = '' ) {
-		$this->set( 'ATT_address', $address );
+	public function set_address($address = '') {
+		$this->set('ATT_address', $address);
 	}
 
 
@@ -115,8 +115,8 @@ 
 	 * @access        public
 	 * @param        string $address2
 	 */
-	public function set_address2( $address2 = '' ) {
-		$this->set( 'ATT_address2', $address2 );
+	public function set_address2($address2 = '') {
+		$this->set('ATT_address2', $address2);
 	}
 
 
@@ -127,8 +127,8 @@ 
 	 * @access        public
 	 * @param        string $city
 	 */
-	public function set_city( $city = '' ) {
-		$this->set( 'ATT_city', $city );
+	public function set_city($city = '') {
+		$this->set('ATT_city', $city);
 	}
 
 
@@ -139,8 +139,8 @@ 
 	 * @access        public
 	 * @param        int $STA_ID
 	 */
-	public function set_state( $STA_ID = 0 ) {
-		$this->set( 'STA_ID', $STA_ID );
+	public function set_state($STA_ID = 0) {
+		$this->set('STA_ID', $STA_ID);
 	}
 
 
@@ -151,8 +151,8 @@ 
 	 * @access        public
 	 * @param        string $CNT_ISO
 	 */
-	public function set_country( $CNT_ISO = '' ) {
-		$this->set( 'CNT_ISO', $CNT_ISO );
+	public function set_country($CNT_ISO = '') {
+		$this->set('CNT_ISO', $CNT_ISO);
 	}
 
 
@@ -163,8 +163,8 @@ 
 	 * @access        public
 	 * @param        string $zip
 	 */
-	public function set_zip( $zip = '' ) {
-		$this->set( 'ATT_zip', $zip );
+	public function set_zip($zip = '') {
+		$this->set('ATT_zip', $zip);
 	}
 
 
@@ -175,8 +175,8 @@ 
 	 * @access        public
 	 * @param        string $email
 	 */
-	public function set_email( $email = '' ) {
-		$this->set( 'ATT_email', $email );
+	public function set_email($email = '') {
+		$this->set('ATT_email', $email);
 	}
 
 
@@ -187,8 +187,8 @@ 
 	 * @access        public
 	 * @param        string $phone
 	 */
-	public function set_phone( $phone = '' ) {
-		$this->set( 'ATT_phone', $phone );
+	public function set_phone($phone = '') {
+		$this->set('ATT_phone', $phone);
 	}
 
 
@@ -199,8 +199,8 @@ 
 	 * @access        public
 	 * @param        bool $ATT_deleted
 	 */
-	public function set_deleted( $ATT_deleted = FALSE ) {
-		$this->set( 'ATT_deleted', $ATT_deleted );
+	public function set_deleted($ATT_deleted = FALSE) {
+		$this->set('ATT_deleted', $ATT_deleted);
 	}
 
 
@@ -213,7 +213,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'ATT_author' );
+		return $this->get('ATT_author');
 	}
 
 
@@ -224,7 +224,7 @@ 
 	 * @return string
 	 */
 	public function fname() {
-		return $this->get( 'ATT_fname' );
+		return $this->get('ATT_fname');
 	}
 
 
@@ -244,9 +244,9 @@ 
 	 * @param bool $apply_html_entities
 	 * @return string
 	 */
-	public function full_name( $apply_html_entities = FALSE ) {
-		$full_name = $this->fname() . ' ' . $this->lname();
-		return $apply_html_entities ? htmlentities( $full_name, ENT_QUOTES, 'UTF-8' ) : $full_name;
+	public function full_name($apply_html_entities = FALSE) {
+		$full_name = $this->fname().' '.$this->lname();
+		return $apply_html_entities ? htmlentities($full_name, ENT_QUOTES, 'UTF-8') : $full_name;
 	}
 
 
@@ -257,7 +257,7 @@ 
 	 * @return string
 	 */
 	public function lname() {
-		return $this->get( 'ATT_lname' );
+		return $this->get('ATT_lname');
 	}
 
 
@@ -271,26 +271,26 @@ 
 	 */
 	public function full_address_as_array() {
 		$full_address_array = array();
-		$initial_address_fields = array( 'ATT_address', 'ATT_address2', 'ATT_city', );
-		foreach ( $initial_address_fields as $address_field_name ) {
-			$address_fields_value = $this->get( $address_field_name );
-			if ( !empty( $address_fields_value ) ) {
-				$full_address_array[ ] = $address_fields_value;
+		$initial_address_fields = array('ATT_address', 'ATT_address2', 'ATT_city',);
+		foreach ($initial_address_fields as $address_field_name) {
+			$address_fields_value = $this->get($address_field_name);
+			if ( ! empty($address_fields_value)) {
+				$full_address_array[] = $address_fields_value;
 			}
 		}
 		//now handle state and country
 		$state_obj = $this->state_obj();
-		if ( !empty( $state_obj ) ) {
-			$full_address_array[ ] = $state_obj->name();
+		if ( ! empty($state_obj)) {
+			$full_address_array[] = $state_obj->name();
 		}
 		$country_obj = $this->country_obj();
-		if ( !empty( $country_obj ) ) {
-			$full_address_array[ ] = $country_obj->name();
+		if ( ! empty($country_obj)) {
+			$full_address_array[] = $country_obj->name();
 		}
 		//lastly get the xip
 		$zip_value = $this->zip();
-		if ( !empty( $zip_value ) ) {
-			$full_address_array[ ] = $zip_value;
+		if ( ! empty($zip_value)) {
+			$full_address_array[] = $zip_value;
 		}
 		return $full_address_array;
 	}
@@ -302,7 +302,7 @@ 
 	 * @return string
 	 */
 	public function address() {
-		return $this->get( 'ATT_address' );
+		return $this->get('ATT_address');
 	}
 
 
@@ -312,7 +312,7 @@ 
 	 * @return string
 	 */
 	public function address2() {
-		return $this->get( 'ATT_address2' );
+		return $this->get('ATT_address2');
 	}
 
 
@@ -322,7 +322,7 @@ 
 	 * @return string
 	 */
 	public function city() {
-		return $this->get( 'ATT_city' );
+		return $this->get('ATT_city');
 	}
 
 
@@ -332,7 +332,7 @@ 
 	 * @return string
 	 */
 	public function state_ID() {
-		return $this->get( 'STA_ID' );
+		return $this->get('STA_ID');
 	}
 
 
@@ -341,7 +341,7 @@ 
 	 * @return string
 	 */
 	public function state_abbrev() {
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __( 'Unknown', 'event_espresso' );
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : __('Unknown', 'event_espresso');
 	}
 
 
@@ -351,18 +351,18 @@ 
 	 * @return EE_State
 	 */
 	public function state_obj() {
-		return $this->get_first_related( 'State' );
+		return $this->get_first_related('State');
 	}
 
 	/**
 	 * Returns the state's name, otherwise 'Unknown'
 	 * @return string
 	 */
-	public function state_name(){
-		if( $this->state_obj() ){
+	public function state_name() {
+		if ($this->state_obj()) {
 			return $this->state_obj()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -375,7 +375,7 @@ 
 	 * @return string
 	 */
 	public function state() {
-		if ( apply_filters( 'FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
 			return $this->state_abbrev();
 		} else {
 			return $this->state_name();
@@ -389,7 +389,7 @@ 
 	 * @return string
 	 */
 	public function country_ID() {
-		return $this->get( 'CNT_ISO' );
+		return $this->get('CNT_ISO');
 	}
 
 
@@ -399,18 +399,18 @@ 
 	 * @return EE_Country
 	 */
 	public function country_obj() {
-		return $this->get_first_related( 'Country' );
+		return $this->get_first_related('Country');
 	}
 
 	/**
 	 * Returns the country's name if known, otherwise 'Unknown'
 	 * @return string
 	 */
-	public function country_name(){
-		if( $this->country_obj() ){
+	public function country_name() {
+		if ($this->country_obj()) {
 			return $this->country_obj()->name();
-		}else{
-			return __( 'Unknown', 'event_espresso' );
+		} else {
+			return __('Unknown', 'event_espresso');
 		}
 	}
 
@@ -423,7 +423,7 @@ 
 	 * @return string
 	 */
 	public function country() {
-		if ( apply_filters( 'FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj() ) ) {
+		if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
 			return $this->country_ID();
 		} else {
 			return $this->country_name();
@@ -437,7 +437,7 @@ 
 	 * @return string
 	 */
 	public function zip() {
-		return $this->get( 'ATT_zip' );
+		return $this->get('ATT_zip');
 	}
 
 
@@ -447,7 +447,7 @@ 
 	 * @return string
 	 */
 	public function email() {
-		return $this->get( 'ATT_email' );
+		return $this->get('ATT_email');
 	}
 
 
@@ -457,7 +457,7 @@ 
 	 * @return string
 	 */
 	public function phone() {
-		return $this->get( 'ATT_phone' );
+		return $this->get('ATT_phone');
 	}
 
 
@@ -467,7 +467,7 @@ 
 	 * @return        bool
 	 */
 	public function deleted() {
-		return $this->get( 'ATT_deleted' );
+		return $this->get('ATT_deleted');
 	}
 
 
@@ -477,8 +477,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Registration[]
 	 */
-	public function get_registrations( $query_params = array() ) {
-		return $this->get_many_related( 'Registration', $query_params );
+	public function get_registrations($query_params = array()) {
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -488,7 +488,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function get_most_recent_registration() {
-		return $this->get_first_related( 'Registration', array( 'order_by' => array( 'REG_date' => 'DESC' ) ) ); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
+		return $this->get_first_related('Registration', array('order_by' => array('REG_date' => 'DESC'))); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
 	}
 
 
@@ -498,8 +498,8 @@ 
 	 * @param int $event_id
 	 * @return EE_Registration
 	 */
-	public function get_most_recent_registration_for_event( $event_id ) {
-		return $this->get_first_related( 'Registration', array(array( 'EVT_ID' => $event_id ), 'order_by' => array('REG_date' => 'DESC')));//, '=', 'OBJECT_K' );
+	public function get_most_recent_registration_for_event($event_id) {
+		return $this->get_first_related('Registration', array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC'))); //, '=', 'OBJECT_K' );
 	}
 
 
@@ -509,7 +509,7 @@ 
 	 * @return array
 	 */
 	public function events() {
-		return $this->get_many_related( 'Event' );
+		return $this->get_many_related('Event');
 	}
 
 	/**
@@ -518,17 +518,17 @@ 
 	 * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
 	 * @return EE_Form_Section_Proper
 	 */
-	public function billing_info_for_payment_method($payment_method){
+	public function billing_info_for_payment_method($payment_method) {
 		$pm_type = $payment_method->type_obj();
-		if( ! $pm_type instanceof EE_PMT_Base ){
+		if ( ! $pm_type instanceof EE_PMT_Base) {
 			return NULL;
 		}
-		$billing_info =  $this->get_post_meta( $this->get_billing_info_postmeta_name( $payment_method ), true );
-		if ( ! $billing_info){
+		$billing_info = $this->get_post_meta($this->get_billing_info_postmeta_name($payment_method), true);
+		if ( ! $billing_info) {
 			return NULL;
 		}
 		$billing_form = $pm_type->billing_form();
-		$billing_form->receive_form_submission( array( $billing_form->name() => $billing_info ), FALSE );
+		$billing_form->receive_form_submission(array($billing_form->name() => $billing_info), FALSE);
 		return $billing_form;
 	}
 
@@ -538,10 +538,10 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return string
 	 */
-	public function get_billing_info_postmeta_name($payment_method){
-		if( $payment_method->type_obj() instanceof EE_PMT_Base ){
-			return 'billing_info_' . $payment_method->type_obj()->system_name();
-		}else{
+	public function get_billing_info_postmeta_name($payment_method) {
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+			return 'billing_info_'.$payment_method->type_obj()->system_name();
+		} else {
 			return NULL;
 		}
 	}
@@ -552,13 +552,13 @@ 
 	 * @param EE_Payment_Method $payment_method
 	 * @return boolean
 	 */
-	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method){
-		if( ! $billing_form instanceof EE_Billing_Attendee_Info_Form ){
-			EE_Error::add_error( __( 'Cannot save billing info because there is none.', 'event_espresso' ) );
+	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method) {
+		if ( ! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
+			EE_Error::add_error(__('Cannot save billing info because there is none.', 'event_espresso'));
 			return false;
 		}
 		$billing_form->clean_sensitive_data();
-		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name( $payment_method ), $billing_form->input_values( true ) );
+		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name($payment_method), $billing_form->input_values(true));
 	}
 
 }

core/db_classes/EE_Country.class.php

Doc Comments +7 added lines, -7 removed lines

@@ -51,7 +51,7 @@ 
 
 	/**
 	 * Gets the country name
-	 * @return string
+	 * @return boolean
 	 */
 	public function name() {
 		return $this->get( 'CNT_name' );
@@ -61,7 +61,7 @@ 
 
 	/**
 	 * gets the country's currency code
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_code() {
 		return $this->get( 'CNT_cur_code' );
@@ -82,7 +82,7 @@ 
 
 	/**
 	 * Currency name singular
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_name_single() {
 		return $this->get( 'CNT_cur_single' );
@@ -92,7 +92,7 @@ 
 
 	/**
 	 * Currency name plural
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_name_plural() {
 		return $this->get( 'CNT_cur_plural' );
@@ -112,7 +112,7 @@ 
 
 	/**
 	 * currency_decimal_places : 2 = 0.00   3 = 0.000
-	 * @return integer
+	 * @return boolean
 	 */
 	public function currency_decimal_places() {
 		return $this->get( 'CNT_cur_dec_plc' );
@@ -122,7 +122,7 @@ 
 
 	/**
 	 * currency_decimal_mark :   (comma) ',' = 0,01   or   (decimal) '.' = 0.01
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_decimal_mark() {
 		return $this->get( 'CNT_cur_dec_mrk' );
@@ -132,7 +132,7 @@ 
 
 	/**
 	 * currency thousands separator:   (comma) ',' = 1,000   or   (decimal) '.' = 1.000
-	 * @return string
+	 * @return boolean
 	 */
 	public function currency_thousands_separator() {
 		return $this->get( 'CNT_cur_thsnds' );

Spacing +16 added lines, -16 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_Country|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_Country
 	 */
-	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);
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * @return string
 	 */
 	public function name() {
-		return $this->get( 'CNT_name' );
+		return $this->get('CNT_name');
 	}
 
 
@@ -64,7 +64,7 @@ 
 	 * @return string
 	 */
 	public function currency_code() {
-		return $this->get( 'CNT_cur_code' );
+		return $this->get('CNT_cur_code');
 	}
 
 
@@ -74,7 +74,7 @@ 
 	 * @return string
 	 */
 	public function currency_sign() {
-		$CNT_cur_sign = $this->get( 'CNT_cur_sign' );
+		$CNT_cur_sign = $this->get('CNT_cur_sign');
 		return $CNT_cur_sign ? $CNT_cur_sign : '&#164;';
 	}
 
@@ -85,7 +85,7 @@ 
 	 * @return string
 	 */
 	public function currency_name_single() {
-		return $this->get( 'CNT_cur_single' );
+		return $this->get('CNT_cur_single');
 	}
 
 
@@ -95,7 +95,7 @@ 
 	 * @return string
 	 */
 	public function currency_name_plural() {
-		return $this->get( 'CNT_cur_plural' );
+		return $this->get('CNT_cur_plural');
 	}
 
 
@@ -105,7 +105,7 @@ 
 	 * @return boolean
 	 */
 	public function currency_sign_before() {
-		return $this->get( 'CNT_cur_sign_b4' );
+		return $this->get('CNT_cur_sign_b4');
 	}
 
 
@@ -115,7 +115,7 @@ 
 	 * @return integer
 	 */
 	public function currency_decimal_places() {
-		return $this->get( 'CNT_cur_dec_plc' );
+		return $this->get('CNT_cur_dec_plc');
 	}
 
 
@@ -125,7 +125,7 @@ 
 	 * @return string
 	 */
 	public function currency_decimal_mark() {
-		return $this->get( 'CNT_cur_dec_mrk' );
+		return $this->get('CNT_cur_dec_mrk');
 	}
 
 
@@ -135,7 +135,7 @@ 
 	 * @return string
 	 */
 	public function currency_thousands_separator() {
-		return $this->get( 'CNT_cur_thsnds' );
+		return $this->get('CNT_cur_thsnds');
 	}
 }
 /* End of file EE_Country.class.php */

core/db_classes/EE_CSV.class.php

Doc Comments +6 added lines, -8 removed lines

@@ -287,7 +287,7 @@ 
 	 * Sends HTTP headers to indicate that the browser should download a file,
 	 * and starts writing the file to PHP's output. Returns the file handle so other functions can
 	 * also write to it
-	 * @param string $new_filename the name of the file that the user will download
+	 * @param string|false $filename the name of the file that the user will download
 	 * @return resource, like the results of fopen(), which can be used for fwrite, fputcsv2, etc.
 	 */
 	public function begin_sending_csv($filename){
@@ -343,9 +343,7 @@ 
 	/**
 	 * Writes $data to the csv file open in $filehandle. uses the array indices of $data for column headers
 	 * @param array $data 2D array, first numerically-indexed, and next-level-down preferably indexed by string
-	 * @param boolean $add_csv_column_names whether or not we should add the keys in the bottom-most array as a row for headers in the CSV.
-	 * Eg, if $data looked like array(0=>array('EVT_ID'=>1,'EVT_name'=>'monkey'...), 1=>array(...),...))
-	 * then the first row we'd write to the CSV would be "EVT_ID,EVT_name,..."
+	 * @param resource $filehandle
 	 * @return boolean if we successfully wrote to the CSV or not. If there's no $data, we consider that a success (because we wrote everything there was...nothing)
 	 */
 	public function write_data_array_to_csv($filehandle, $data){
@@ -427,7 +425,7 @@ 
 	 * @param array $model_data_array is assumed to be a 3d array: 1st layer has keys of model names (eg 'Event'),
 	 * next layer is numerically indexed to represent each model object (eg, each individual event), and the last layer
 	 * has all the attributes o fthat model object (eg, the event's id, name, etc)
-	 * @return boolean success
+	 * @return boolean|null success
 	 */
 	public function write_model_data_to_csv($filehandle,$model_data_array){
 		$this->write_metadata_to_csv($filehandle);
@@ -456,8 +454,8 @@ 
 	 * Writes the CSV file to the output buffer, with rows corresponding to $model_data_array,
 	 * and dies (in order to avoid other plugins from messing up the csv output)
 	 * @param string $filename the filename you want to give the file
-	 * @param array $model_data_array 3d array, as described in EE_CSV::write_model_data_to_csv()
-	 * @return bool | void writes CSV file to output and dies
+	 * @param boolean $model_data_array 3d array, as described in EE_CSV::write_model_data_to_csv()
+	 * @return boolean|null | void writes CSV file to output and dies
 	 */
 	public function export_multiple_model_data_to_csv($filename,$model_data_array){
 		$filehandle = $this->begin_sending_csv($filename);
@@ -469,7 +467,7 @@ 
 	 *		  @access public
 	 *			@param array $data - the array of data to be converted to csv and exported
 	 *			@param string $filename - name for newly created csv file
-	 *			@return TRUE on success, FALSE on fail
+	 *			@return false|null on success, FALSE on fail
 	 */
 	public function export_array_to_csv( $data = FALSE, $filename = FALSE  ) {
 

Spacing +108 added lines, -108 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');
 /**
  * CSV Import Export class
  *
@@ -41,31 +41,31 @@ 
 		global $wpdb;
 
 		$this->_primary_keys = array(
-				$wpdb->prefix . 'esp_answer' => array( 'ANS_ID' ),
-				$wpdb->prefix . 'esp_attendee' => array( 'ATT_ID' ),
-				$wpdb->prefix . 'esp_datetime'	=> array( 'DTT_ID' ),
-				$wpdb->prefix . 'esp_event_question_group'	=> array( 'EQG_ID' ),
-				$wpdb->prefix . 'esp_message_template'	=> array( 'MTP_ID' ),
-				$wpdb->prefix . 'esp_payment'	=> array( 'PAY_ID' ),
-				$wpdb->prefix . 'esp_price'	=> array( 'PRC_ID' ),
-				$wpdb->prefix . 'esp_price_type'	=> array( 'PRT_ID' ),
-				$wpdb->prefix . 'esp_question'	=> array( 'QST_ID' ),
-				$wpdb->prefix . 'esp_question_group'	=> array( 'QSG_ID' ),
-				$wpdb->prefix . 'esp_question_group_question'	=> array( 'QGQ_ID' ),
-				$wpdb->prefix . 'esp_question_option'	=> array( 'QSO_ID' ),
-				$wpdb->prefix . 'esp_registration'	=> array( 'REG_ID' ),
-				$wpdb->prefix . 'esp_status'	=> array( 'STS_ID' ),
-				$wpdb->prefix . 'esp_transaction'	=> array( 'TXN_ID' ),
-				$wpdb->prefix . 'esp_transaction'	=> array( 'TXN_ID' ),
-				$wpdb->prefix . 'events_detail'	=> array( 'id' ),
-				$wpdb->prefix . 'events_category_detail'	=> array( 'id' ),
-				$wpdb->prefix . 'events_category_rel'	=> array( 'id' ),
-				$wpdb->prefix . 'events_venue'	=> array( 'id' ),
-				$wpdb->prefix . 'events_venue_rel' =>  array( 'emeta_id' ),
-				$wpdb->prefix . 'events_locale'	=> array( 'id' ),
-				$wpdb->prefix . 'events_locale_rel'	=> array( 'id' ),
-				$wpdb->prefix . 'events_personnel' =>  array( 'id' ),
-				$wpdb->prefix . 'events_personnel_rel' =>  array( 'id' ),
+				$wpdb->prefix.'esp_answer' => array('ANS_ID'),
+				$wpdb->prefix.'esp_attendee' => array('ATT_ID'),
+				$wpdb->prefix.'esp_datetime'	=> array('DTT_ID'),
+				$wpdb->prefix.'esp_event_question_group'	=> array('EQG_ID'),
+				$wpdb->prefix.'esp_message_template'	=> array('MTP_ID'),
+				$wpdb->prefix.'esp_payment'	=> array('PAY_ID'),
+				$wpdb->prefix.'esp_price'	=> array('PRC_ID'),
+				$wpdb->prefix.'esp_price_type'	=> array('PRT_ID'),
+				$wpdb->prefix.'esp_question'	=> array('QST_ID'),
+				$wpdb->prefix.'esp_question_group'	=> array('QSG_ID'),
+				$wpdb->prefix.'esp_question_group_question'	=> array('QGQ_ID'),
+				$wpdb->prefix.'esp_question_option'	=> array('QSO_ID'),
+				$wpdb->prefix.'esp_registration'	=> array('REG_ID'),
+				$wpdb->prefix.'esp_status'	=> array('STS_ID'),
+				$wpdb->prefix.'esp_transaction'	=> array('TXN_ID'),
+				$wpdb->prefix.'esp_transaction'	=> array('TXN_ID'),
+				$wpdb->prefix.'events_detail'	=> array('id'),
+				$wpdb->prefix.'events_category_detail'	=> array('id'),
+				$wpdb->prefix.'events_category_rel'	=> array('id'),
+				$wpdb->prefix.'events_venue'	=> array('id'),
+				$wpdb->prefix.'events_venue_rel' =>  array('emeta_id'),
+				$wpdb->prefix.'events_locale'	=> array('id'),
+				$wpdb->prefix.'events_locale_rel'	=> array('id'),
+				$wpdb->prefix.'events_personnel' =>  array('id'),
+				$wpdb->prefix.'events_personnel_rel' =>  array('id'),
 			);
 
 	}
@@ -77,9 +77,9 @@ 
 	 *		@ access public
 	 *		@ return class instance
 	 */
-	public static function instance ( ) {
+	public static function instance( ) {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_CSV )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_CSV)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -91,22 +91,22 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	private function read_unicode_file($file_path){
+	private function read_unicode_file($file_path) {
 		$fc = "";
-		$fh = fopen($file_path,"rb");
-		if( ! $fh ){
-			throw new EE_Error( sprintf( __("Cannot open file for read: %s<br>\n", 'event_espresso'), $file_path ) );
+		$fh = fopen($file_path, "rb");
+		if ( ! $fh) {
+			throw new EE_Error(sprintf(__("Cannot open file for read: %s<br>\n", 'event_espresso'), $file_path));
 		}
 		$flen = filesize($file_path);
 		$bc = fread($fh, $flen);
-		for ($i=0; $i<$flen; $i++){
-			$c = substr($bc,$i,1);
-			if ((ord($c) != 0) && (ord($c) != 13)){
-			  $fc = $fc . $c;
+		for ($i = 0; $i < $flen; $i++) {
+			$c = substr($bc, $i, 1);
+			if ((ord($c) != 0) && (ord($c) != 13)) {
+			  $fc = $fc.$c;
 			}
 		}
-		if ((ord(substr($fc,0,1)) == 255) && (ord(substr($fc,1,1)) == 254))
-		$fc = substr($fc,2);
+		if ((ord(substr($fc, 0, 1)) == 255) && (ord(substr($fc, 1, 1)) == 254))
+		$fc = substr($fc, 2);
 		return ($fc);
 }
 
@@ -118,15 +118,15 @@ 
 	 * @param string $path_to_file
 	 * @return array of arrays. Top-level array has rows, second-level array has each item
 	 */
-	public function import_csv_to_multi_dimensional_array($path_to_file){
+	public function import_csv_to_multi_dimensional_array($path_to_file) {
 		// needed to deal with Mac line endings
-		ini_set('auto_detect_line_endings',TRUE);
+		ini_set('auto_detect_line_endings', TRUE);
 
 		// because fgetcsv does not correctly deal with backslashed quotes such as \"
 		// we'll read the file into a string
-		$file_contents = $this->read_unicode_file( $path_to_file );
+		$file_contents = $this->read_unicode_file($path_to_file);
 		// replace backslashed quotes with CSV enclosures
-		$file_contents = str_replace ( '\\"', '"""', $file_contents );
+		$file_contents = str_replace('\\"', '"""', $file_contents);
 		// HEY YOU! PUT THAT FILE BACK!!!
 		file_put_contents($path_to_file, $file_contents);
 
@@ -136,25 +136,25 @@ 
 			$csvarray = array();
 
 			// in PHP 5.3 fgetcsv accepts a 5th parameter, but the pre 5.3 versions of fgetcsv choke if passed more than 4 - is that crazy or what?
-			if ( version_compare( PHP_VERSION, '5.3.0' ) < 0 ) {
+			if (version_compare(PHP_VERSION, '5.3.0') < 0) {
 
 				//  PHP 5.2- version
 
 				// loop through each row of the file
-				while(($data = fgetcsv($file_handle, 0, ',', '"' )) !== FALSE){
-					$csvarray[]= $data;
+				while (($data = fgetcsv($file_handle, 0, ',', '"')) !== FALSE) {
+					$csvarray[] = $data;
 				}
-			}else{
+			} else {
 				// loop through each row of the file
-				while (( $data = fgetcsv( $file_handle, 0, ',', '"', '\\' )) !== FALSE ) {
-					$csvarray[]=$data;
+				while (($data = fgetcsv($file_handle, 0, ',', '"', '\\')) !== FALSE) {
+					$csvarray[] = $data;
 				}
 			}
 			# Close the File.
 			fclose($file_handle);
 			return $csvarray;
-		}else{
-			EE_Error::add_error( sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"),$path_to_file), __FILE__, __FUNCTION__, __LINE__ );
+		} else {
+			EE_Error::add_error(sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"), $path_to_file), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 	}
@@ -184,9 +184,9 @@ 
 	 *						...
 	 *						)
 	 */
-	public function import_csv_to_model_data_array( $path_to_file, $model_name = FALSE, $first_row_is_headers = TRUE ) {
+	public function import_csv_to_model_data_array($path_to_file, $model_name = FALSE, $first_row_is_headers = TRUE) {
 		$multi_dimensional_array = $this->import_csv_to_multi_dimensional_array($path_to_file);
-		if( ! $multi_dimensional_array ){
+		if ( ! $multi_dimensional_array) {
 			return false;
 		}
 		// gotta start somewhere
@@ -195,9 +195,9 @@ 
 		$ee_formatted_data = array();
 		// array to store headers (column names)
 		$headers = array();
-		foreach($multi_dimensional_array as $data){
+		foreach ($multi_dimensional_array as $data) {
 			// if first cell is MODEL, then second cell is the MODEL name
-			if ( $data[0]	== 'MODEL' ) {
+			if ($data[0] == 'MODEL') {
 				$model_name = $data[1];
 				//don't bother looking for model data in this row. The rest of this
 				//row should be blank
@@ -207,7 +207,7 @@ 
 				$headers = array();
 				continue;
 			}
-			if( strpos( $data[0], EE_CSV::metadata_header ) !==FALSE ){
+			if (strpos($data[0], EE_CSV::metadata_header) !== FALSE) {
 				$model_name = EE_CSV::metadata_header;
 				//store like model data, we just won't try importing it etc.
 				$row = 1;
@@ -220,31 +220,31 @@ 
 
 			$model_entry = array();
 			// loop through each column
-			for ( $i=0; $i < $columns; $i++ ) {
+			for ($i = 0; $i < $columns; $i++) {
 
 				//replace csv_enclosures with backslashed quotes
-				$data[$i] = str_replace ( '"""', '\\"', $data[$i] );
+				$data[$i] = str_replace('"""', '\\"', $data[$i]);
 				// do we need to grab the column names?
-				if ( $row === 1){
-					if( $first_row_is_headers ) {
+				if ($row === 1) {
+					if ($first_row_is_headers) {
 						// store the column names to use for keys
 						$column_name = $data[$i];
 						//check it's not blank... sometimes CSV editign programs adda bunch of empty columns onto the end...
-						if(!$column_name){continue;}
+						if ( ! $column_name) {continue; }
 						$matches = array();
-						if($model_name == EE_CSV::metadata_header){
+						if ($model_name == EE_CSV::metadata_header) {
 							$headers[$i] = $column_name;
-						}else{
+						} else {
 							//now get the db table name from it (the part between square brackets)
-							$success = preg_match('~(.*)\[(.*)\]~', $column_name,$matches);
-							if (!$success){
-								EE_Error::add_error( sprintf(__("The column titled %s is invalid for importing. It must be be in the format of 'Nice Name[model_field_name]' in row %s", "event_espresso"),$column_name,implode(",",$data)), __FILE__, __FUNCTION__, __LINE__ );
+							$success = preg_match('~(.*)\[(.*)\]~', $column_name, $matches);
+							if ( ! $success) {
+								EE_Error::add_error(sprintf(__("The column titled %s is invalid for importing. It must be be in the format of 'Nice Name[model_field_name]' in row %s", "event_espresso"), $column_name, implode(",", $data)), __FILE__, __FUNCTION__, __LINE__);
 								return false;
 							}
 							$headers[$i] = $matches[2];
 						}
 
-					}else{
+					} else {
 						// no column names means our final array will just use counters for keys
 						$model_entry[$headers[$i]] = $data[$i];
 						$headers[$i] = $i;
@@ -252,14 +252,14 @@ 
 					// and we need to store csv data
 				} else {
 					// this column isn' ta header, store it if there is a header for it
-					if(isset($headers[$i])){
+					if (isset($headers[$i])) {
 						$model_entry[$headers[$i]] = $data[$i];
 					}
 				}
 
 			}
 			//save the row's data IF it's a non-header-row
-			if( ! $first_row_is_headers || ($first_row_is_headers && $row > 1)){
+			if ( ! $first_row_is_headers || ($first_row_is_headers && $row > 1)) {
 				$ee_formatted_data[$model_name][] = $model_entry;
 			}
 			// advance to next row
@@ -278,9 +278,9 @@ 
 	}
 
 
-	public function save_csv_to_db( $csv_data_array, $model_name = FALSE ) {
-		EE_Error::doing_it_wrong('save_csv_to_db', __( 'Function moved to EE_Import and renamed to save_csv_data_array_to_db', 'event_espresso' ), '4.6.7' );
-		return EE_Import::instance()->save_csv_data_array_to_db( $csv_data_array, $model_name );
+	public function save_csv_to_db($csv_data_array, $model_name = FALSE) {
+		EE_Error::doing_it_wrong('save_csv_to_db', __('Function moved to EE_Import and renamed to save_csv_data_array_to_db', 'event_espresso'), '4.6.7');
+		return EE_Import::instance()->save_csv_data_array_to_db($csv_data_array, $model_name);
 	}
 
 	/**
@@ -290,11 +290,11 @@ 
 	 * @param string $new_filename the name of the file that the user will download
 	 * @return resource, like the results of fopen(), which can be used for fwrite, fputcsv2, etc.
 	 */
-	public function begin_sending_csv($filename){
+	public function begin_sending_csv($filename) {
 		// grab file extension
 		$ext = substr(strrchr($filename, '.'), 1);
-		if ( $ext == '.csv' or  $ext == '.xls' ) {
-			str_replace( $ext, '', $filename );
+		if ($ext == '.csv' or $ext == '.xls') {
+			str_replace($ext, '', $filename);
 		}
 		$filename .= '.csv';
 
@@ -325,12 +325,12 @@ 
 	 * mentioning the version and timezone
 	 * @param resource $filehandle
 	 */
-	public function write_metadata_to_csv($filehandle){
+	public function write_metadata_to_csv($filehandle) {
 		EE_Registry::instance()->load_helper('DTT_Helper');
-		$data_row = array(EE_CSV::metadata_header);//do NOT translate because this exact string is used when importing
+		$data_row = array(EE_CSV::metadata_header); //do NOT translate because this exact string is used when importing
 		$this->fputcsv2($filehandle, $data_row);
 		EE_Registry::instance()->load_helper('DTT_Helper');
-		$meta_data = array( 0=> array(
+		$meta_data = array(0=> array(
 			'version'=>espresso_version(),
 			'timezone'=>  EEH_DTT_Helper::get_timezone(),
 			'time_of_export'=>current_time('mysql'),
@@ -348,30 +348,30 @@ 
 	 * then the first row we'd write to the CSV would be "EVT_ID,EVT_name,..."
 	 * @return boolean if we successfully wrote to the CSV or not. If there's no $data, we consider that a success (because we wrote everything there was...nothing)
 	 */
-	public function write_data_array_to_csv($filehandle, $data){
+	public function write_data_array_to_csv($filehandle, $data) {
 		EE_Registry::instance()->load_helper('Array');
 
 
 		//determine if $data is actually a 2d array
-		if ( $data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))){
+		if ($data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))) {
 			//make sure top level is numerically indexed,
 
-			if( EEH_Array::is_associative_array($data)){
-				throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s","event_espresso"),implode(",",array_keys($data))));
+			if (EEH_Array::is_associative_array($data)) {
+				throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s", "event_espresso"), implode(",", array_keys($data))));
 			}
 			$item_in_top_level_array = EEH_Array::get_one_item_from_array($data);
 			//now, is the last item in the top-level array of $data an associative or numeric array?
-			if(EEH_Array::is_associative_array($item_in_top_level_array)){
+			if (EEH_Array::is_associative_array($item_in_top_level_array)) {
 				//its associative, so we want to output its keys as column headers
 				$keys = array_keys($item_in_top_level_array);
 				echo $this->fputcsv2($filehandle, $keys);
 			}
 			//start writing data
-			foreach($data as $data_row){
+			foreach ($data as $data_row) {
 				echo $this->fputcsv2($filehandle, $data_row);
 			}
 			return true;
-		}else{
+		} else {
 			//no data TO write... so we can assume that's a success
 			return true;
 		}
@@ -416,7 +416,7 @@ 
 	 * Calls exit to prevent polluting the CSV file with other junk
 	 * @param resource $fh filehandle where we're writing the CSV to
 	 */
-	public function end_sending_csv($fh){
+	public function end_sending_csv($fh) {
 		fclose($fh);
 		exit(0);
 	}
@@ -429,23 +429,23 @@ 
 	 * has all the attributes o fthat model object (eg, the event's id, name, etc)
 	 * @return boolean success
 	 */
-	public function write_model_data_to_csv($filehandle,$model_data_array){
+	public function write_model_data_to_csv($filehandle, $model_data_array) {
 		$this->write_metadata_to_csv($filehandle);
-		foreach($model_data_array as $model_name => $model_instance_arrays){
+		foreach ($model_data_array as $model_name => $model_instance_arrays) {
 			//first: output a special row stating the model
-			echo $this->fputcsv2($filehandle,array('MODEL',$model_name));
+			echo $this->fputcsv2($filehandle, array('MODEL', $model_name));
 			//if we have items to put in the CSV, do it normally
 
-			if( ! empty($model_instance_arrays) ){
+			if ( ! empty($model_instance_arrays)) {
 				$this->write_data_array_to_csv($filehandle, $model_instance_arrays);
-			}else{
+			} else {
 //				echo "no data to write... so just write the headers";
 				//so there's actually NO model objects for that model.
 				//probably still want to show the columns
 				$model = EE_Registry::instance()->load_model($model_name);
 				$column_names = array();
-				foreach($model->field_settings() as $field){
-					$column_names[$field->get_nicename()."[".$field->get_name()."]"] = null ;
+				foreach ($model->field_settings() as $field) {
+					$column_names[$field->get_nicename()."[".$field->get_name()."]"] = null;
 				}
 				$this->write_data_array_to_csv($filehandle, array($column_names));
 			}
@@ -459,7 +459,7 @@ 
 	 * @param array $model_data_array 3d array, as described in EE_CSV::write_model_data_to_csv()
 	 * @return bool | void writes CSV file to output and dies
 	 */
-	public function export_multiple_model_data_to_csv($filename,$model_data_array){
+	public function export_multiple_model_data_to_csv($filename, $model_data_array) {
 		$filehandle = $this->begin_sending_csv($filename);
 		$this->write_model_data_to_csv($filehandle, $model_data_array);
 		$this->end_sending_csv($filehandle);
@@ -471,15 +471,15 @@ 
 	 *			@param string $filename - name for newly created csv file
 	 *			@return TRUE on success, FALSE on fail
 	 */
-	public function export_array_to_csv( $data = FALSE, $filename = FALSE  ) {
+	public function export_array_to_csv($data = FALSE, $filename = FALSE) {
 
 		// no data file?? get outta here
-		if ( ! $data or ! is_array( $data ) or empty( $data ) ) {
+		if ( ! $data or ! is_array($data) or empty($data)) {
 			return FALSE;
 		}
 
 		// no filename?? get outta here
-		if ( ! $filename ) {
+		if ( ! $filename) {
 			return FALSE;
 		}
 
@@ -505,11 +505,11 @@ 
 	 *			@param int $percent_of_max - desired percentage of the max upload_mb
 	 *			@return int KB
 	 */
-	public function get_max_upload_size ( $percent_of_max = FALSE ) {
+	public function get_max_upload_size($percent_of_max = FALSE) {
 
-		$max_upload = (int)(ini_get('upload_max_filesize'));
-		$max_post = (int)(ini_get('post_max_size'));
-		$memory_limit = (int)(ini_get('memory_limit'));
+		$max_upload = (int) (ini_get('upload_max_filesize'));
+		$max_post = (int) (ini_get('post_max_size'));
+		$memory_limit = (int) (ini_get('memory_limit'));
 
 		// determine the smallest of the three values from above
 		$upload_mb = min($max_upload, $max_post, $memory_limit);
@@ -518,9 +518,9 @@ 
 		$upload_mb = $upload_mb * 1024;
 
 		// don't want the full monty? then reduce the max uplaod size
-		if ( $percent_of_max ) {
+		if ($percent_of_max) {
 			// is percent_of_max like this -> 50 or like this -> 0.50 ?
-			if ( $percent_of_max > 1 ) {
+			if ($percent_of_max > 1) {
 				// chnages 50 to 0.50
 				$percent_of_max = $percent_of_max / 100;
 			}
@@ -542,17 +542,17 @@ 
 	 *			@param string $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value
 	 *			@return void
 	 */
-	private function fputcsv2 ($fh, array $row, $delimiter = ',', $enclosure = '"', $mysql_null = FALSE) {
+	private function fputcsv2($fh, array $row, $delimiter = ',', $enclosure = '"', $mysql_null = FALSE) {
 		//Allow user to filter the csv delimiter and enclosure for other countries csv standards
-		$delimiter = apply_filters( 'FHEE__EE_CSV__fputcsv2__delimiter', $delimiter );
-		$enclosure = apply_filters( 'FHEE__EE_CSV__fputcsv2__enclosure', $enclosure );
+		$delimiter = apply_filters('FHEE__EE_CSV__fputcsv2__delimiter', $delimiter);
+		$enclosure = apply_filters('FHEE__EE_CSV__fputcsv2__enclosure', $enclosure);
 
 		$delimiter_esc = preg_quote($delimiter, '/');
 		$enclosure_esc = preg_quote($enclosure, '/');
 
 		$output = array();
 		foreach ($row as $field_value) {
-			if(is_object($field_value) || is_array($field_value)){
+			if (is_object($field_value) || is_array($field_value)) {
 				$field_value = serialize($field_value);
 			}
 			if ($field_value === null && $mysql_null) {
@@ -561,10 +561,10 @@ 
 			}
 
 			$output[] = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field_value) ?
-				( $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field_value) . $enclosure ) : $field_value;
+				($enclosure.str_replace($enclosure, $enclosure.$enclosure, $field_value).$enclosure) : $field_value;
 		}
 
-		fwrite($fh, join($delimiter, $output) . PHP_EOL);
+		fwrite($fh, join($delimiter, $output).PHP_EOL);
 	}
 
 

Braces +12 added lines, -9 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');
+}
 /**
  * CSV Import Export class
  *
@@ -105,8 +107,9 @@ 
 			  $fc = $fc . $c;
 			}
 		}
-		if ((ord(substr($fc,0,1)) == 255) && (ord(substr($fc,1,1)) == 254))
-		$fc = substr($fc,2);
+		if ((ord(substr($fc,0,1)) == 255) && (ord(substr($fc,1,1)) == 254)) {
+				$fc = substr($fc,2);
+		}
 		return ($fc);
 }
 
@@ -144,7 +147,7 @@ 
 				while(($data = fgetcsv($file_handle, 0, ',', '"' )) !== FALSE){
 					$csvarray[]= $data;
 				}
-			}else{
+			} else{
 				// loop through each row of the file
 				while (( $data = fgetcsv( $file_handle, 0, ',', '"', '\\' )) !== FALSE ) {
 					$csvarray[]=$data;
@@ -153,7 +156,7 @@ 
 			# Close the File.
 			fclose($file_handle);
 			return $csvarray;
-		}else{
+		} else{
 			EE_Error::add_error( sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"),$path_to_file), __FILE__, __FUNCTION__, __LINE__ );
 			return false;
 		}
@@ -234,7 +237,7 @@ 
 						$matches = array();
 						if($model_name == EE_CSV::metadata_header){
 							$headers[$i] = $column_name;
-						}else{
+						} else{
 							//now get the db table name from it (the part between square brackets)
 							$success = preg_match('~(.*)\[(.*)\]~', $column_name,$matches);
 							if (!$success){
@@ -244,7 +247,7 @@ 
 							$headers[$i] = $matches[2];
 						}
 
-					}else{
+					} else{
 						// no column names means our final array will just use counters for keys
 						$model_entry[$headers[$i]] = $data[$i];
 						$headers[$i] = $i;
@@ -371,7 +374,7 @@ 
 				echo $this->fputcsv2($filehandle, $data_row);
 			}
 			return true;
-		}else{
+		} else{
 			//no data TO write... so we can assume that's a success
 			return true;
 		}
@@ -438,7 +441,7 @@ 
 
 			if( ! empty($model_instance_arrays) ){
 				$this->write_data_array_to_csv($filehandle, $model_instance_arrays);
-			}else{
+			} else{
 //				echo "no data to write... so just write the headers";
 				//so there's actually NO model objects for that model.
 				//probably still want to show the columns

core/db_classes/EE_Export.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 	/**
 	 *			@Export Event Espresso data - routes export requests
 	 *		  @access public
-	 *			@return void | bool
+	 *			@return false|null | bool
 	 */
 	public function export() {
 
@@ -605,7 +605,7 @@ 
 	 *	@recursive function for exporting table data and merging the results with the next results
 	 *	@access private
 	 *	@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
+	 *	@return boolean on success, FALSE on fail
 	 */
 	private function _get_export_data_for_models( $models_to_export = array() ) {
 		$table_data = FALSE;

Spacing +168 added lines, -168 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
  *
@@ -41,11 +41,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();
 	}
 
 
@@ -57,10 +57,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;
 	}
@@ -74,15 +74,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':
@@ -99,7 +99,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':
@@ -111,7 +111,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;
 
@@ -139,12 +139,12 @@ 
 
 		$models_to_export = EE_Registry::instance()->non_abstract_db_models;
 
-		$table_data = $this->_get_export_data_for_models( array_keys( $models_to_export ) );
+		$table_data = $this->_get_export_data_for_models(array_keys($models_to_export));
 
-		$filename = $this->generate_filename ( 'full-db-export' );
+		$filename = $this->generate_filename('full-db-export');
 
-		if ( ! $this->EE_CSV->export_multiple_model_data_to_csv( $filename,$table_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, $table_data)) {
+			EE_Error::add_error(__("An error occurred and the Event details could not be exported from the database.", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -152,7 +152,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();
@@ -178,23 +178,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;
@@ -238,37 +238,37 @@ 
 
 			);
 
-		$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(){
-		$attendee_rows = EEM_Attendee::instance()->get_all_wpdb_results( array( 'force_join' => array( 'State', 'Country' ) ) );
+	function report_attendees() {
+		$attendee_rows = EEM_Attendee::instance()->get_all_wpdb_results(array('force_join' => array('State', 'Country')));
 		$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);
 	}
@@ -285,18 +285,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__);
 		}
 	}
 
@@ -308,15 +308,15 @@ 
 	 * @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( $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 );
+	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 ($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);
 		}
 	}
 
@@ -325,7 +325,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',
@@ -357,125 +357,125 @@ 
 				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')
 			),
 			$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[ 'Transaction.STS_ID' ] => __( 'unknown', 'event_espresso' ) ),
+				$stati = EEM_Status::instance()->localized_status(array(
+					$reg_row['Registration.STS_ID'] => __('unknown', 'event_espresso'),
+					$reg_row['Transaction.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[ 'Transaction.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[ 'Transaction.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[ 'Transaction.TXN_paid' ], 'localized_float' ) : '0.00';
+				$reg_csv_array[__("Transaction Status", 'event_espresso')] = $stati[$reg_row['Transaction.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['Transaction.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['Transaction.TXN_paid'], 'localized_float') : '0.00';
 				$payment_methods = array();
 				$gateway_txn_ids_etc = array();
 				$payment_times = array();
-				if( $is_primary_reg && $reg_row[ 'Transaction.TXN_ID' ] ){
+				if ($is_primary_reg && $reg_row['Transaction.TXN_ID']) {
 					$payments_info = EEM_Payment::instance()->get_all_wpdb_results(
 							array(
 								array(
-									'TXN_ID' => $reg_row[ 'Transaction.TXN_ID' ],
+									'TXN_ID' => $reg_row['Transaction.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( array( array( 'Ticket.TKT_ID' => $reg_row[ 'Ticket.TKT_ID' ] ), 'order_by' => array( 'DTT_EVT_start' => 'ASC' ), 'default_where_conditions' => 'none' ) ) as $datetime){
+					foreach (EEM_Datetime::instance()->get_all(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[] = $datetime->start_date_and_time();
 					}
 
 				} 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 = '';
 					}
 
@@ -483,52 +483,52 @@ 
 				}
 
 				//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']);
 					}
-					$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);
 	}
@@ -538,7 +538,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()."]";
 	}
 
@@ -551,17 +551,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 {
@@ -573,11 +573,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__);
 		}
 	}
 
@@ -588,13 +588,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;
 	}
@@ -607,12 +607,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();
 				}
@@ -620,17 +620,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
@@ -256,10 +258,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() ];
 				}
 			}
@@ -313,9 +315,9 @@ 
 		$value_on_model_obj = $field_obj->prepare_for_set_from_db( $raw_db_value );
 		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 );
 		}
 	}
@@ -370,7 +372,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 );
@@ -394,11 +396,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;
@@ -470,12 +472,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 = '';
 					}
 
@@ -493,7 +495,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' ] );
 					}
 					$reg_csv_array[ $question_label ] = $this->_prepare_value_from_db_for_display( EEM_Answer::instance(), 'ANS_value', $answer_row[ 'Answer.ANS_value' ] );
@@ -523,7 +525,7 @@ 
 			if( ! $event_slug ) {
 				$event_slug = __( 'unknown', 'event_espresso' );
 			}
-		}else{
+		} else{
 			$event_slug = __( 'all', 'event_espresso' );
 		}
 		$filename = sprintf( "registrations-for-%s", $event_slug );
@@ -593,7 +595,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;
@@ -629,8 +631,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_Extra_Meta.class.php

Doc Comments +8 added lines, -8 removed lines

@@ -49,7 +49,7 @@ 
 
 	/**
 	 * Gets FK_ID
-	 * @return int
+	 * @return boolean
 	 */
 	function FK_ID() {
 		return $this->get( 'FK_ID' );
@@ -60,7 +60,7 @@ 
 	/**
 	 * Sets FK_ID
 	 * @param int $FK_ID
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_FK_ID( $FK_ID ) {
 		$this->set( 'FK_ID', $FK_ID );
@@ -70,7 +70,7 @@ 
 
 	/**
 	 * Gets model
-	 * @return string
+	 * @return boolean
 	 */
 	function model() {
 		return $this->get( 'EXM_model' );
@@ -81,7 +81,7 @@ 
 	/**
 	 * Sets model
 	 * @param string $model
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_model( $model ) {
 		$this->set( 'EXM_model', $model );
@@ -91,7 +91,7 @@ 
 
 	/**
 	 * Gets key
-	 * @return string
+	 * @return boolean
 	 */
 	function key() {
 		return $this->get( 'EXM_key' );
@@ -102,7 +102,7 @@ 
 	/**
 	 * Sets key
 	 * @param string $key
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_key( $key ) {
 		$this->set( 'EXM_key', $key );
@@ -112,7 +112,7 @@ 
 
 	/**
 	 * Gets value
-	 * @return string
+	 * @return boolean
 	 */
 	function value() {
 		return $this->get( 'EXM_value' );
@@ -123,7 +123,7 @@ 
 	/**
 	 * Sets value
 	 * @param string $value
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_value( $value ) {
 		$this->set( 'EXM_value', $value );

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_Extra_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_Extra_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 FK_ID() {
-		return $this->get( 'FK_ID' );
+		return $this->get('FK_ID');
 	}
 
 
@@ -62,8 +62,8 @@ 
 	 * @param int $FK_ID
 	 * @return boolean
 	 */
-	function set_FK_ID( $FK_ID ) {
-		$this->set( 'FK_ID', $FK_ID );
+	function set_FK_ID($FK_ID) {
+		$this->set('FK_ID', $FK_ID);
 	}
 
 
@@ -73,7 +73,7 @@ 
 	 * @return string
 	 */
 	function model() {
-		return $this->get( 'EXM_model' );
+		return $this->get('EXM_model');
 	}
 
 
@@ -83,8 +83,8 @@ 
 	 * @param string $model
 	 * @return boolean
 	 */
-	function set_model( $model ) {
-		$this->set( 'EXM_model', $model );
+	function set_model($model) {
+		$this->set('EXM_model', $model);
 	}
 
 
@@ -94,7 +94,7 @@ 
 	 * @return string
 	 */
 	function key() {
-		return $this->get( 'EXM_key' );
+		return $this->get('EXM_key');
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * @param string $key
 	 * @return boolean
 	 */
-	function set_key( $key ) {
-		$this->set( 'EXM_key', $key );
+	function set_key($key) {
+		$this->set('EXM_key', $key);
 	}
 
 
@@ -115,7 +115,7 @@ 
 	 * @return string
 	 */
 	function value() {
-		return $this->get( 'EXM_value' );
+		return $this->get('EXM_value');
 	}
 
 
@@ -125,8 +125,8 @@ 
 	 * @param string $value
 	 * @return boolean
 	 */
-	function set_value( $value ) {
-		$this->set( 'EXM_value', $value );
+	function set_value($value) {
+		$this->set('EXM_value', $value);
 	}