eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Attendee_Shortcodes.lib.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 	/**
 	 * EE_Attendee_Shortcodes constructor.
-	*/
+	 */
 	public function __construct() {
 		parent::__construct();
 	}

Spacing +36 added lines, -36 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -49,26 +49,26 @@ 
 
 
 	protected function _init_props() {
-		$this->label = esc_html__( 'Attendee Shortcodes', 'event_espresso' );
-		$this->description = esc_html__( 'All shortcodes specific to attendee related data', 'event_espresso' );
+		$this->label = esc_html__('Attendee Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to attendee related data', 'event_espresso');
 		$this->_shortcodes = array(
-			'[FNAME]' => esc_html__( 'First Name of an attendee.', 'event_espresso' ),
-			'[LNAME]' => esc_html__( 'Last Name of an attendee.', 'event_espresso' ),
-			'[ATTENDEE_EMAIL]' => esc_html__( 'Email address for the attendee.', 'event_espresso' ),
-			'[EDIT_ATTENDEE_LINK]' => esc_html__( 'Edit Registration Link (typically you\'d only use this for messages going to event administrators)', 'event_espresso' ),
-			'[REGISTRATION_ID]' => esc_html__( 'Unique Registration ID for the registration', 'event_espresso' ),
-			'[REGISTRATION_CODE]' => esc_html__( 'Unique Registration Code for the registration', 'event_espresso' ),
-			'[REGISTRATION_STATUS_ID]' => esc_html__( 'Parses to the registration status for the attendee', 'event_espresso' ),
-			'[REGISTRATION_STATUS_LABEL]' => esc_html__( 'Parses to the status label for the registrant', 'event_espresso' ),
-			'[REGISTRATION_TOTAL_AMOUNT_PAID]' => esc_html__( 'Parses to the total amount paid for this registration.', 'event_espresso' ),
-			'[FRONTEND_EDIT_REG_LINK]' => esc_html__( 'Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso' ),
-			'[PHONE_NUMBER]' => esc_html__( 'The Phone Number for the Registration.', 'event_espresso' ),
-			'[ADDRESS]' => esc_html__( 'The Address for the Registration', 'event_espresso' ),
-			'[ADDRESS2]' => esc_html__( 'Whatever was in the address 2 field for the registration.', 'event_espresso' ),
-			'[CITY]' => esc_html__( 'The city for the registration.', 'event_espresso' ),
-			'[ZIP_PC]' => esc_html__( 'The ZIP (or Postal) Code for the Registration.', 'event_espresso' ),
-			'[ADDRESS_STATE]' => esc_html__( 'The state/province for the registration.', 'event_espresso' ),
-			'[COUNTRY]' => esc_html__( 'The country for the registration.', 'event_espresso' )
+			'[FNAME]' => esc_html__('First Name of an attendee.', 'event_espresso'),
+			'[LNAME]' => esc_html__('Last Name of an attendee.', 'event_espresso'),
+			'[ATTENDEE_EMAIL]' => esc_html__('Email address for the attendee.', 'event_espresso'),
+			'[EDIT_ATTENDEE_LINK]' => esc_html__('Edit Registration Link (typically you\'d only use this for messages going to event administrators)', 'event_espresso'),
+			'[REGISTRATION_ID]' => esc_html__('Unique Registration ID for the registration', 'event_espresso'),
+			'[REGISTRATION_CODE]' => esc_html__('Unique Registration Code for the registration', 'event_espresso'),
+			'[REGISTRATION_STATUS_ID]' => esc_html__('Parses to the registration status for the attendee', 'event_espresso'),
+			'[REGISTRATION_STATUS_LABEL]' => esc_html__('Parses to the status label for the registrant', 'event_espresso'),
+			'[REGISTRATION_TOTAL_AMOUNT_PAID]' => esc_html__('Parses to the total amount paid for this registration.', 'event_espresso'),
+			'[FRONTEND_EDIT_REG_LINK]' => esc_html__('Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso'),
+			'[PHONE_NUMBER]' => esc_html__('The Phone Number for the Registration.', 'event_espresso'),
+			'[ADDRESS]' => esc_html__('The Address for the Registration', 'event_espresso'),
+			'[ADDRESS2]' => esc_html__('Whatever was in the address 2 field for the registration.', 'event_espresso'),
+			'[CITY]' => esc_html__('The city for the registration.', 'event_espresso'),
+			'[ZIP_PC]' => esc_html__('The ZIP (or Postal) Code for the Registration.', 'event_espresso'),
+			'[ADDRESS_STATE]' => esc_html__('The state/province for the registration.', 'event_espresso'),
+			'[COUNTRY]' => esc_html__('The country for the registration.', 'event_espresso')
 			);
 	}
 
@@ -82,10 +82,10 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 
 
-		$this->_xtra = ! empty( $this->_extra_data ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
+		$this->_xtra = ! empty($this->_extra_data) && $this->_extra_data['data'] instanceof EE_Messages_Addressee
 			? $this->_extra_data['data']
 			: null;
 
@@ -94,34 +94,34 @@ 
 			? null
 			: $this->_data;
 
-		if ( ! $registration instanceof EE_Registration ) {
+		if ( ! $registration instanceof EE_Registration) {
 			//let's attempt to get the txn_id for the error message.
-			$txn_id = isset( $this->_xtra->txn ) && $this->_xtra->txn instanceof EE_Transaction
+			$txn_id = isset($this->_xtra->txn) && $this->_xtra->txn instanceof EE_Transaction
 				? $this->_xtra->txn->ID()
-				: esc_html__( 'Unknown', 'event_espresso' );
-			$msg = esc_html__( 'There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.', 'event_espresso' );
+				: esc_html__('Unknown', 'event_espresso');
+			$msg = esc_html__('There is no EE_Registration object in the data sent to the EE_Attendee Shortcode Parser for the messages system.', 'event_espresso');
 			$dev_msg = sprintf(
-				esc_html__( 'The transaction ID for this request is: %s', 'event_espresso' ),
+				esc_html__('The transaction ID for this request is: %s', 'event_espresso'),
 				$txn_id
 			);
-			throw new EE_Error( "{$msg}||{$msg} {$dev_msg}" );
+			throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
 		}
 
 		//attendee obj for this registration
-		$attendee = isset( $this->_xtra->registrations[ $registration->ID() ]['att_obj'] )
-			?  $this->_xtra->registrations[ $registration->ID() ]['att_obj']
-			: null ;
+		$attendee = isset($this->_xtra->registrations[$registration->ID()]['att_obj'])
+			? $this->_xtra->registrations[$registration->ID()]['att_obj']
+			: null;
 
-		if ( ! $attendee instanceof EE_Attendee ) {
-			$msg = esc_html__( 'There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.', 'event_espresso' );
+		if ( ! $attendee instanceof EE_Attendee) {
+			$msg = esc_html__('There is no EE_Attendee object in the data sent to the EE_Attendee_Shortcode parser for the messages system.', 'event_espresso');
 			$dev_msg = sprintf(
-				esc_html__( 'The registration ID for this request is: %s', 'event_espresso' ),
+				esc_html__('The registration ID for this request is: %s', 'event_espresso'),
 				$registration->ID()
 			);
-			throw new EE_Error( "{$msg}||{$msg} {$dev_msg}" );
+			throw new EE_Error("{$msg}||{$msg} {$dev_msg}");
 		}
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 
 			case '[FNAME]' :
 				return $attendee->fname();

Braces +2 added lines, -1 removed lines

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

core/libraries/messages/data_class/EE_Messages_Addressee.class.php

Spacing +7 added lines, -7 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');
 }
 
 
@@ -260,7 +260,7 @@ 
 	 * @param array $addressee_data We're expecting an incoming array of data that will be used to fill the properties
 	 *                              for the object.
 	 */
-	public function __construct( $addressee_data ) {
+	public function __construct($addressee_data) {
 		$this->_data = $addressee_data;
 		$this->_set_properties();
 	}
@@ -275,15 +275,15 @@ 
 	 * @return void.
 	 */
 	protected function _set_properties() {
-		foreach ( $this->_data as $prop => $value ) {
-			if ( property_exists( $this, $prop ) ) {
+		foreach ($this->_data as $prop => $value) {
+			if (property_exists($this, $prop)) {
 				$this->{$prop} = $value;
 			}
 		}
 		//if user_id present we'll use this to set the fname and lname and admin_email.
-		if ( ! empty( $this->user_id ) ) {
+		if ( ! empty($this->user_id)) {
 			$this->user_id = (int) $this->user_id;
-			$user = get_userdata( $this->user_id );
+			$user = get_userdata($this->user_id);
 			$this->fname = $user->user_firstname;
 			$this->lname = $user->user_lastname;
 			$this->admin_email = $user->user_email;

core/db_models/EEM_Checkin.model.php

Spacing +8 added lines, -8 removed lines

@@ -23,8 +23,8 @@ 
  *
  * ------------------------------------------------------------------------
  */
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
-require_once ( EE_CLASSES . 'EE_Checkin.class.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
+require_once (EE_CLASSES.'EE_Checkin.class.php');
 
 class EEM_Checkin extends EEM_Base {
 
@@ -40,12 +40,12 @@ 
 	 * 		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 * 		@return void
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Check-In','event_espresso');
-		$this->plural_item = __('Check-Ins','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Check-In', 'event_espresso');
+		$this->plural_item = __('Check-Ins', 'event_espresso');
 
 		$this->_tables = array(
-			'Checkin'=>new EE_Primary_Table('esp_checkin','CHK_ID')
+			'Checkin'=>new EE_Primary_Table('esp_checkin', 'CHK_ID')
 		);
 		$this->_fields = array(
 			'Checkin'=> array(
@@ -53,7 +53,7 @@ 
 				'REG_ID'=>new EE_Foreign_Key_Int_Field('REG_ID', 'Registration Id', false, 0, 'Registration'),
 				'DTT_ID'=>new EE_Foreign_Key_Int_Field('DTT_ID', 'Datetime Id', false, 0, 'Datetime'),
 				'CHK_in'=>new EE_Boolean_Field('CHK_in', 'Whether a person has checked in or checked out', false, true),
-				'CHK_timestamp'=>new EE_Datetime_Field('CHK_timestamp', __('When the row was modified','event_espresso'), false, EE_Datetime_Field::now, $timezone )
+				'CHK_timestamp'=>new EE_Datetime_Field('CHK_timestamp', __('When the row was modified', 'event_espresso'), false, EE_Datetime_Field::now, $timezone)
 			)
 		);
 		$this->_model_relations = array(
@@ -61,7 +61,7 @@ 
 			'Datetime'=>new EE_Belongs_To_Relation()
 		);
 		$this->_model_chain_to_wp_user = 'Registration.Event';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 

Braces +3 added lines, -1 removed lines

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

core/db_classes/EE_CPT_Base.class.php

Doc Comments +7 added lines, -7 removed lines

@@ -130,7 +130,7 @@ 
 	 *
 	 * @link   http://codex.wordpress.org/Function_Reference/get_the_post_thumbnail
 	 * @access protected
-	 * @param string|array $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
+	 * @param string $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
@@ -172,7 +172,7 @@ 
 	 * This is a method for restoring this_obj using details from the given $revision_id
 	 *
 	 * @param int $revision_id 		ID of the revision we're getting data from
-	 * @param array $related_obj_names if included this will be used to restore for related obj
+	 * @param string[] $related_obj_names if included this will be used to restore for related obj
 	 *                                 if not included then we just do restore on the meta.
 	 *                                 We will accept an array of related_obj_names for restoration here.
 	 * @param array $where_query       You can optionally include an array of key=>value pairs
@@ -226,7 +226,7 @@ 
 	 * Wrapper for get_post_meta, http://codex.wordpress.org/Function_Reference/get_post_meta
 	 * @param string  $meta_key
 	 * @param boolean $single
-	 * @return mixed <ul><li>If only $id is set it will return all meta values in an associative array.</li>
+	 * @return string|null <ul><li>If only $id is set it will return all meta values in an associative array.</li>
 	 * <li>If $single is set to false, or left blank, the function returns an array containing all values of the specified key.</li>
 	 * <li>If $single is set to true, the function returns the first value of the specified key (not in an array</li></ul>
 	 */
@@ -254,8 +254,8 @@ 
 
 	/**
 	 * Wrapper for add_post_meta, http://codex.wordpress.org/Function_Reference/add_post_meta
-	 * @param mixed $meta_key
-	 * @param mixed $meta_value
+	 * @param string $meta_key
+	 * @param string $meta_value
 	 * @param bool  $unique . If postmeta for this $meta_key already exists, whether to add an additional item or not
 	 * @return boolean Boolean true, except if the $unique argument was set to true and a custom field with the given key already exists, in which case false is returned.
 	 */
@@ -271,7 +271,7 @@ 
 	/**
 	 * Wrapper for delete_post_meta, http://codex.wordpress.org/Function_Reference/delete_post_meta
 	 *
-	 * @param mixed $meta_key
+	 * @param string $meta_key
 	 * @param mixed $meta_value
 	 * @return boolean False for failure. True for success.
 	 */
@@ -299,7 +299,7 @@ 
 	/**
 	 * Gets all the term-taxonomies for this CPT
 	 * @param array $query_params
-	 * @return EE_Term_Taxonomy
+	 * @return EE_Base_Class[]
 	 */
 	public function term_taxonomies( $query_params = array() ) {
 		return $this->get_many_related( 'Term_Taxonomy', $query_params );

Indentation +82 added lines, -82 removed lines

@@ -36,9 +36,9 @@ 
 	 */
 	protected $_feature_image = array();
 
-    /**
-     * @var WP_Post the WP_Post that corresponds with this CPT model object
-     */
+	/**
+	 * @var WP_Post the WP_Post that corresponds with this CPT model object
+	 */
 	protected $_wp_post;
 
 
@@ -46,75 +46,75 @@ 
 
 
 
-    /**
-     * Returns the WP post associated with this CPT model object. If this CPT is saved, fetches it
-     * from the DB. Otherwise, create an unsaved WP_POst object. Caches the post internally.
-     * @return WP_Post
-     */
-    public function wp_post(){
-        global $wpdb;
-        if (! $this->_wp_post instanceof WP_Post) {
-            if ($this->ID()) {
-                $this->_wp_post = get_post($this->ID());
-            } else {
-                $simulated_db_result = new stdClass();
-                foreach($this->get_model()->field_settings(true) as $field_name => $field_obj){
-                    if ($this->get_model()->get_table_obj_by_alias($field_obj->get_table_alias())->get_table_name() === $wpdb->posts){
-                        $column = $field_obj->get_table_column();
-
-                        if($field_obj instanceof EE_Datetime_Field){
-                            $value_on_model_obj = $this->get_DateTime_object($field_name);
-                        } elseif( $field_obj->is_db_only_field()){
-                            $value_on_model_obj = $field_obj->get_default_value();
-                        } else {
-                            $value_on_model_obj = $this->get_raw($field_name);
-                        }
-                        $simulated_db_result->{$column} = $field_obj->prepare_for_use_in_db($value_on_model_obj);
-                    }
-                }
-                $this->_wp_post = new WP_Post($simulated_db_result);
-            }
-            //and let's make retrieving the EE CPT object easy too
-            $classname = get_class($this);
-            if (! isset($this->_wp_post->{$classname})) {
-                $this->_wp_post->{$classname} = $this;
-            }
-        }
-        return $this->_wp_post;
-    }
-
-    /**
-     * When fetching a new value for a post field that uses the global $post for rendering,
-     * set the global $post temporarily to be this model object; and afterwards restore it
-     * @param string $fieldname
-     * @param bool $pretty
-     * @param string $extra_cache_ref
-     * @return mixed
-     */
-    protected function _get_fresh_property($fieldname, $pretty = false, $extra_cache_ref = null)
-    {
-        global $post;
-
-        if ( $pretty
-            && (
-                ! (
-                       $post instanceof WP_Post
-                       && $post->ID
-                   )
-                || (int)$post->ID !== $this->ID()
-             )
-            && $this->get_model()->field_settings_for($fieldname) instanceof EE_Post_Content_Field ) {
-            $old_post = $post;
-            $post = $this->wp_post();
-            $return_value = parent::_get_fresh_property($fieldname, $pretty, $extra_cache_ref);
-            $post = $old_post;
-        } else {
-            $return_value = parent::_get_fresh_property($fieldname, $pretty, $extra_cache_ref);
-        }
-        return $return_value;
-    }
-
-    /**
+	/**
+	 * Returns the WP post associated with this CPT model object. If this CPT is saved, fetches it
+	 * from the DB. Otherwise, create an unsaved WP_POst object. Caches the post internally.
+	 * @return WP_Post
+	 */
+	public function wp_post(){
+		global $wpdb;
+		if (! $this->_wp_post instanceof WP_Post) {
+			if ($this->ID()) {
+				$this->_wp_post = get_post($this->ID());
+			} else {
+				$simulated_db_result = new stdClass();
+				foreach($this->get_model()->field_settings(true) as $field_name => $field_obj){
+					if ($this->get_model()->get_table_obj_by_alias($field_obj->get_table_alias())->get_table_name() === $wpdb->posts){
+						$column = $field_obj->get_table_column();
+
+						if($field_obj instanceof EE_Datetime_Field){
+							$value_on_model_obj = $this->get_DateTime_object($field_name);
+						} elseif( $field_obj->is_db_only_field()){
+							$value_on_model_obj = $field_obj->get_default_value();
+						} else {
+							$value_on_model_obj = $this->get_raw($field_name);
+						}
+						$simulated_db_result->{$column} = $field_obj->prepare_for_use_in_db($value_on_model_obj);
+					}
+				}
+				$this->_wp_post = new WP_Post($simulated_db_result);
+			}
+			//and let's make retrieving the EE CPT object easy too
+			$classname = get_class($this);
+			if (! isset($this->_wp_post->{$classname})) {
+				$this->_wp_post->{$classname} = $this;
+			}
+		}
+		return $this->_wp_post;
+	}
+
+	/**
+	 * When fetching a new value for a post field that uses the global $post for rendering,
+	 * set the global $post temporarily to be this model object; and afterwards restore it
+	 * @param string $fieldname
+	 * @param bool $pretty
+	 * @param string $extra_cache_ref
+	 * @return mixed
+	 */
+	protected function _get_fresh_property($fieldname, $pretty = false, $extra_cache_ref = null)
+	{
+		global $post;
+
+		if ( $pretty
+			&& (
+				! (
+					   $post instanceof WP_Post
+					   && $post->ID
+				   )
+				|| (int)$post->ID !== $this->ID()
+			 )
+			&& $this->get_model()->field_settings_for($fieldname) instanceof EE_Post_Content_Field ) {
+			$old_post = $post;
+			$post = $this->wp_post();
+			$return_value = parent::_get_fresh_property($fieldname, $pretty, $extra_cache_ref);
+			$post = $old_post;
+		} else {
+			$return_value = parent::_get_fresh_property($fieldname, $pretty, $extra_cache_ref);
+		}
+		return $return_value;
+	}
+
+	/**
 	 * Adds to the specified event category. If it category doesn't exist, creates it.
 	 * @param string $category_name
 	 * @param string $category_description    optional
@@ -399,14 +399,14 @@ 
 
 
 
-    /**
-     * Don't serialize the WP Post. That's just duplicate data and we want to avoid recursion
-     * @return array
-     */
-    public function __sleep()
-    {
-        $properties_to_serialize = parent::__sleep();
-        $properties_to_serialize = array_diff( $properties_to_serialize, array('_wp_post'));
-        return $properties_to_serialize;
-    }
+	/**
+	 * Don't serialize the WP Post. That's just duplicate data and we want to avoid recursion
+	 * @return array
+	 */
+	public function __sleep()
+	{
+		$properties_to_serialize = parent::__sleep();
+		$properties_to_serialize = array_diff( $properties_to_serialize, array('_wp_post'));
+		return $properties_to_serialize;
+	}
 }

Spacing +67 added lines, -67 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
@@ -51,20 +51,20 @@ 
      * from the DB. Otherwise, create an unsaved WP_POst object. Caches the post internally.
      * @return WP_Post
      */
-    public function wp_post(){
+    public function wp_post() {
         global $wpdb;
-        if (! $this->_wp_post instanceof WP_Post) {
+        if ( ! $this->_wp_post instanceof WP_Post) {
             if ($this->ID()) {
                 $this->_wp_post = get_post($this->ID());
             } else {
                 $simulated_db_result = new stdClass();
-                foreach($this->get_model()->field_settings(true) as $field_name => $field_obj){
-                    if ($this->get_model()->get_table_obj_by_alias($field_obj->get_table_alias())->get_table_name() === $wpdb->posts){
+                foreach ($this->get_model()->field_settings(true) as $field_name => $field_obj) {
+                    if ($this->get_model()->get_table_obj_by_alias($field_obj->get_table_alias())->get_table_name() === $wpdb->posts) {
                         $column = $field_obj->get_table_column();
 
-                        if($field_obj instanceof EE_Datetime_Field){
+                        if ($field_obj instanceof EE_Datetime_Field) {
                             $value_on_model_obj = $this->get_DateTime_object($field_name);
-                        } elseif( $field_obj->is_db_only_field()){
+                        } elseif ($field_obj->is_db_only_field()) {
                             $value_on_model_obj = $field_obj->get_default_value();
                         } else {
                             $value_on_model_obj = $this->get_raw($field_name);
@@ -76,7 +76,7 @@ 
             }
             //and let's make retrieving the EE CPT object easy too
             $classname = get_class($this);
-            if (! isset($this->_wp_post->{$classname})) {
+            if ( ! isset($this->_wp_post->{$classname})) {
                 $this->_wp_post->{$classname} = $this;
             }
         }
@@ -95,15 +95,15 @@ 
     {
         global $post;
 
-        if ( $pretty
+        if ($pretty
             && (
                 ! (
                        $post instanceof WP_Post
                        && $post->ID
                    )
-                || (int)$post->ID !== $this->ID()
+                || (int) $post->ID !== $this->ID()
              )
-            && $this->get_model()->field_settings_for($fieldname) instanceof EE_Post_Content_Field ) {
+            && $this->get_model()->field_settings_for($fieldname) instanceof EE_Post_Content_Field) {
             $old_post = $post;
             $post = $this->wp_post();
             $return_value = parent::_get_fresh_property($fieldname, $pretty, $extra_cache_ref);
@@ -121,8 +121,8 @@ 
 	 * @param int    $parent_term_taxonomy_id optional
 	 * @return EE_Term_Taxonomy
 	 */
-	function add_event_category( $category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL ) {
-		return $this->get_model()->add_event_category( $this, $category_name, $category_description, $parent_term_taxonomy_id );
+	function add_event_category($category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL) {
+		return $this->get_model()->add_event_category($this, $category_name, $category_description, $parent_term_taxonomy_id);
 	}
 
 
@@ -132,8 +132,8 @@ 
 	 * @param string $category_name
 	 * @return bool
 	 */
-	function remove_event_category( $category_name ) {
-		return $this->get_model()->remove_event_category( $this, $category_name );
+	function remove_event_category($category_name) {
+		return $this->get_model()->remove_event_category($this, $category_name);
 	}
 
 
@@ -144,14 +144,14 @@ 
 	 * @param EE_Term_Taxonomy $term_taxonomy
 	 * @return EE_Base_Class the relation was removed from
 	 */
-	function remove_relation_to_term_taxonomy( $term_taxonomy ) {
-		if ( !$term_taxonomy ) {
-			EE_Error::add_error( sprintf( __( "No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso" ), get_class( $this ), $this->ID() ), __FILE__, __FUNCTION__, __LINE__ );
+	function remove_relation_to_term_taxonomy($term_taxonomy) {
+		if ( ! $term_taxonomy) {
+			EE_Error::add_error(sprintf(__("No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso"), get_class($this), $this->ID()), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
-		$term_taxonomy->set_count( $term_taxonomy->count() - 1 );
+		$term_taxonomy->set_count($term_taxonomy->count() - 1);
 		$term_taxonomy->save();
-		return $this->_remove_relation_to( $term_taxonomy, 'Term_Taxonomy' );
+		return $this->_remove_relation_to($term_taxonomy, 'Term_Taxonomy');
 	}
 
 
@@ -175,7 +175,7 @@ 
 	 * @return int
 	 */
 	public function parent() {
-		return $this->get( 'parent' );
+		return $this->get('parent');
 	}
 
 
@@ -185,7 +185,7 @@ 
 	 * @return string
 	 */
 	public function status() {
-		return $this->get( 'status' );
+		return $this->get('status');
 	}
 
 
@@ -193,8 +193,8 @@ 
 	/**
 	 * @param string $status
 	 */
-	public function set_status( $status ) {
-		$this->set( 'status', $status );
+	public function set_status($status) {
+		$this->set('status', $status);
 	}
 
 
@@ -208,12 +208,12 @@ 
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
-	protected function _get_feature_image( $size, $attr ) {
+	protected function _get_feature_image($size, $attr) {
 		//first let's see if we already have the _feature_image property set AND if it has a cached element on it FOR the given size
-		$attr_key = is_array( $attr ) ? implode( '_', $attr ) : $attr;
-		$cache_key = is_array( $size ) ? implode( '_', $size ) . $attr_key : $size . $attr_key;
-		$this->_feature_image[ $cache_key ] = isset( $this->_feature_image[ $cache_key ] ) ? $this->_feature_image[ $cache_key ] : $this->get_model()->get_feature_image( $this->ID(), $size, $attr );
-		return $this->_feature_image[ $cache_key ];
+		$attr_key = is_array($attr) ? implode('_', $attr) : $attr;
+		$cache_key = is_array($size) ? implode('_', $size).$attr_key : $size.$attr_key;
+		$this->_feature_image[$cache_key] = isset($this->_feature_image[$cache_key]) ? $this->_feature_image[$cache_key] : $this->get_model()->get_feature_image($this->ID(), $size, $attr);
+		return $this->_feature_image[$cache_key];
 	}
 
 
@@ -224,8 +224,8 @@ 
 	 * @param string|array $attr
 	 * @return string of html
 	 */
-	public function feature_image( $size = 'thumbnail', $attr = '' ) {
-		return $this->_get_feature_image( $size, $attr );
+	public function feature_image($size = 'thumbnail', $attr = '') {
+		return $this->_get_feature_image($size, $attr);
 	}
 
 
@@ -235,9 +235,9 @@ 
 	 * @param  string|array $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
 	 * @return string|boolean          the url of the image or false if not found
 	 */
-	public function feature_image_url( $size = 'thumbnail' ) {
-		$attachment = wp_get_attachment_image_src( get_post_thumbnail_id( $this->ID() ), $size );
-		return !empty( $attachment ) ? $attachment[ 0 ] : FALSE;
+	public function feature_image_url($size = 'thumbnail') {
+		$attachment = wp_get_attachment_image_src(get_post_thumbnail_id($this->ID()), $size);
+		return ! empty($attachment) ? $attachment[0] : FALSE;
 	}
 
 
@@ -259,36 +259,36 @@ 
 	 *                                 This array is INDEXED by RELATED OBJ NAME (so it corresponds with the obj_names sent);
 	 * @return void
 	 */
-	public function restore_revision( $revision_id, $related_obj_names = array(), $where_query = array() ) {
+	public function restore_revision($revision_id, $related_obj_names = array(), $where_query = array()) {
 		//get revision object
-		$revision_obj = $this->get_model()->get_one_by_ID( $revision_id );
-		if ( $revision_obj instanceof EE_CPT_Base ) {
+		$revision_obj = $this->get_model()->get_one_by_ID($revision_id);
+		if ($revision_obj instanceof EE_CPT_Base) {
 			//no related_obj_name so we assume we're saving a revision on this object.
-			if ( empty( $related_obj_names ) ) {
+			if (empty($related_obj_names)) {
 				$fields = $this->get_model()->get_meta_table_fields();
-				foreach ( $fields as $field ) {
-					$this->set( $field, $revision_obj->get( $field ) );
+				foreach ($fields as $field) {
+					$this->set($field, $revision_obj->get($field));
 				}
 				$this->save();
 			}
-			$related_obj_names = (array)$related_obj_names;
-			foreach ( $related_obj_names as $related_name ) {
+			$related_obj_names = (array) $related_obj_names;
+			foreach ($related_obj_names as $related_name) {
 				//related_obj_name so we're saving a revision on an object related to this object
 				//do we have $where_query params for this related object?  If we do then we include that.
-				$cols_n_values = isset( $where_query[ $related_name ] ) ? $where_query[ $related_name ] : array();
-				$where_params = !empty( $cols_n_values ) ? array( $cols_n_values ) : array();
-				$related_objs = $this->get_many_related( $related_name, $where_params );
-				$revision_related_objs = $revision_obj->get_many_related( $related_name, $where_params );
+				$cols_n_values = isset($where_query[$related_name]) ? $where_query[$related_name] : array();
+				$where_params = ! empty($cols_n_values) ? array($cols_n_values) : array();
+				$related_objs = $this->get_many_related($related_name, $where_params);
+				$revision_related_objs = $revision_obj->get_many_related($related_name, $where_params);
 				//load helper
 				//remove related objs from this object that are not in revision
 				//array_diff *should* work cause I think objects are indexed by ID?
-				$related_to_remove = EEH_Array::object_array_diff( $related_objs, $revision_related_objs );
-				foreach ( $related_to_remove as $rr ) {
-					$this->_remove_relation_to( $rr, $related_name, $cols_n_values );
+				$related_to_remove = EEH_Array::object_array_diff($related_objs, $revision_related_objs);
+				foreach ($related_to_remove as $rr) {
+					$this->_remove_relation_to($rr, $related_name, $cols_n_values);
 				}
 				//add all related objs attached to revision to this object
-				foreach ( $revision_related_objs as $r_obj ) {
-					$this->_add_relation_to( $r_obj, $related_name, $cols_n_values );
+				foreach ($revision_related_objs as $r_obj) {
+					$this->_add_relation_to($r_obj, $related_name, $cols_n_values);
 				}
 			}
 		}
@@ -304,8 +304,8 @@ 
 	 * <li>If $single is set to false, or left blank, the function returns an array containing all values of the specified key.</li>
 	 * <li>If $single is set to true, the function returns the first value of the specified key (not in an array</li></ul>
 	 */
-	public function get_post_meta( $meta_key = NULL, $single = FALSE ) {
-		return get_post_meta( $this->ID(), $meta_key, $single );
+	public function get_post_meta($meta_key = NULL, $single = FALSE) {
+		return get_post_meta($this->ID(), $meta_key, $single);
 	}
 
 
@@ -317,11 +317,11 @@ 
 	 * @param mixed  $prev_value
 	 * @return mixed Returns meta_id if the meta doesn't exist, otherwise returns true on success and false on failure. NOTE: If the meta_value passed to this function is the same as the value that is already in the database, this function returns false.
 	 */
-	public function update_post_meta( $meta_key, $meta_value, $prev_value = NULL ) {
-		if ( ! $this->ID() ) {
+	public function update_post_meta($meta_key, $meta_value, $prev_value = NULL) {
+		if ( ! $this->ID()) {
 			$this->save();
 		}
-		return update_post_meta( $this->ID(), $meta_key, $meta_value, $prev_value );
+		return update_post_meta($this->ID(), $meta_key, $meta_value, $prev_value);
 	}
 
 
@@ -333,11 +333,11 @@ 
 	 * @param bool  $unique . If postmeta for this $meta_key already exists, whether to add an additional item or not
 	 * @return boolean Boolean true, except if the $unique argument was set to true and a custom field with the given key already exists, in which case false is returned.
 	 */
-	public function add_post_meta( $meta_key, $meta_value, $unique = FALSE ) {
-		if ( $this->ID() ) {
+	public function add_post_meta($meta_key, $meta_value, $unique = FALSE) {
+		if ($this->ID()) {
 			$this->save();
 		}
-		return add_post_meta( $this->ID(), $meta_key, $meta_value, $unique );
+		return add_post_meta($this->ID(), $meta_key, $meta_value, $unique);
 	}
 
 
@@ -349,13 +349,13 @@ 
 	 * @param mixed $meta_value
 	 * @return boolean False for failure. True for success.
 	 */
-	public function delete_post_meta( $meta_key, $meta_value = '' ) {
-		if ( ! $this->ID() ) {
+	public function delete_post_meta($meta_key, $meta_value = '') {
+		if ( ! $this->ID()) {
 			//there are obviously no postmetas for this if it's not saved
 			//so let's just report this as a success
 			return true;
 		}
-		return delete_post_meta( $this->ID(), $meta_key, $meta_value );
+		return delete_post_meta($this->ID(), $meta_key, $meta_value);
 	}
 
 
@@ -365,7 +365,7 @@ 
 	 * @return string
 	 */
 	public function get_permalink() {
-		return get_permalink( $this->ID() );
+		return get_permalink($this->ID());
 	}
 
 
@@ -375,8 +375,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Term_Taxonomy
 	 */
-	public function term_taxonomies( $query_params = array() ) {
-		return $this->get_many_related( 'Term_Taxonomy', $query_params );
+	public function term_taxonomies($query_params = array()) {
+		return $this->get_many_related('Term_Taxonomy', $query_params);
 	}
 
 
@@ -406,7 +406,7 @@ 
     public function __sleep()
     {
         $properties_to_serialize = parent::__sleep();
-        $properties_to_serialize = array_diff( $properties_to_serialize, array('_wp_post'));
+        $properties_to_serialize = array_diff($properties_to_serialize, array('_wp_post'));
         return $properties_to_serialize;
     }
 }

core/services/commands/CommandHandler.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 namespace EventEspresso\core\services\commands;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 

core/db_classes/EE_Import.class.php

Braces +27 added lines, -25 removed lines

@@ -1,6 +1,8 @@ 
 <?php use EventEspresso\core\interfaces\ResettableInterface;
 
-if (!defined( 'EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if (!defined( 'EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
 /**
  * EE_Import class
@@ -297,7 +299,7 @@ 
 			if(isset($csv_metadata['site_url']) && $csv_metadata['site_url'] == site_url()){
 				EE_Error::add_attention(sprintf(__("CSV Data appears to be from the same database, so attempting to update data", "event_espresso")));
 				$export_from_site_a_to_b = false;
-			}else{
+			} else{
 				$old_site_url = isset( $csv_metadata['site_url']) ? $csv_metadata['site_url'] : $old_site_url;
 				EE_Error::add_attention(sprintf(__("CSV Data appears to be from a different database (%s instead of %s), so we assume IDs in the CSV data DO NOT correspond to IDs in this database", "event_espresso"),$old_site_url,site_url()));
 			};
@@ -378,7 +380,7 @@ 
 			//now check that assumption was correct. If
 			if ( EE_Registry::instance()->is_model_name($model_name_in_csv_data)) {
 				$model_name = $model_name_in_csv_data;
-			}else {
+			} else {
 				// no table info in the array and no table name passed to the function?? FAIL
 				EE_Error::add_error( __('No table information was specified and/or found, therefore the import could not be completed','event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
 				return FALSE;
@@ -402,7 +404,7 @@ 
 				//there is no primary key)
 				if($model->has_primary_key_field()){
 					$id_in_csv =  $model_object_data[$model->primary_key_name()];
-				}else{
+				} else{
 					$id_in_csv = $model->get_index_primary_key_string($model_object_data);
 				}
 
@@ -412,7 +414,7 @@ 
 				//or just update.
 				if($export_from_site_a_to_b){
 					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_other_db( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}else{//this is just a re-import
+				} else{//this is just a re-import
 					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_same_db( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
 				}
 				if( $what_to_do == self::do_nothing ) {
@@ -432,7 +434,7 @@ 
 						if($model->has_primary_key_field()){
 							$old_db_to_new_db_mapping[$model_name][$id_in_csv] = $conflicting->ID();
 							$model_object_data[$model->primary_key_name()] = $conflicting->ID();
-						}else{
+						} else{
 							//we want to update this conflicting item, instead of inserting a conflicting item
 							//so we need to make sure they match entirely (its possible that they only conflicted on one field, but we need them to match on other fields
 							//for the WHERE conditions in the update). At the time of this comment, there were no models like this
@@ -444,9 +446,9 @@ 
 				}
 				if( $what_to_do == self::do_insert ) {
 					$old_db_to_new_db_mapping = $this->_insert_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}elseif( $what_to_do == self::do_update ) {
+				} elseif( $what_to_do == self::do_update ) {
 					$old_db_to_new_db_mapping = $this->_update_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}else{
+				} else{
 					throw new EE_Error( sprintf( __( 'Programming error. We shoudl be inserting or updating, but instead we are being told to "%s", whifh is invalid', 'event_espresso' ), $what_to_do ) );
 				}
 			}
@@ -474,7 +476,7 @@ 
 		//in the old data that we know of
 		if( isset($old_db_to_new_db_mapping[$model_name][$id_in_csv]) ){
 			return self::do_update;
-		}else{
+		} else{
 			return self::do_insert;
 		}
 	}
@@ -493,7 +495,7 @@ 
 		//in this case, check if this thing ACTUALLY exists in the database
 		if( $model->get_one_conflicting( $model_object_data ) ){
 			return self::do_update;
-		}else{
+		} else{
 			return self::do_insert;
 		}
 	}
@@ -524,7 +526,7 @@ 
 		try{
 			$model_name_field = $model->get_field_containing_related_model_name();
 			$models_pointed_to_by_model_name_field = $model_name_field->get_model_names_pointed_to();
-		}catch( EE_Error $e ){
+		} catch( EE_Error $e ){
 			$model_name_field = NULL;
 			$models_pointed_to_by_model_name_field = array();
 		}
@@ -545,7 +547,7 @@ 
 								$found_a_mapping = true;
 								break;
 						}
-					}else{
+					} else{
 						$model_object_data[ $field_obj->get_name() ] = $this->_find_mapping_in(
 								$model_object_data[ $field_obj->get_name() ],
 								$model_pointed_to_by_fk,
@@ -560,7 +562,7 @@ 
 
 
 				}
-			}else{
+			} else{
 				//it's a string foreign key (which we leave alone, because those are things
 				//like country names, which we'd really rather not make 2 USAs etc (we'd actually
 				//prefer to just update one)
@@ -603,14 +605,14 @@ 
 		if(	isset( $old_db_to_new_db_mapping[ $model_name ][ $object_id ] ) ){
 
 				return $old_db_to_new_db_mapping[ $model_name ][ $object_id ];
-			}elseif( $object_id == '0' || $object_id == '' ) {
+			} elseif( $object_id == '0' || $object_id == '' ) {
 				//leave as-is
 				return $object_id;
-			}elseif( $export_from_site_a_to_b ){
+			} elseif( $export_from_site_a_to_b ){
 				//we couldn't find a mapping for this, and it's from a different site,
 				//so blank it out
 				return NULL;
-			}elseif( ! $export_from_site_a_to_b ) {
+			} elseif( ! $export_from_site_a_to_b ) {
 				//we coudln't find a mapping for this, but it's from thsi DB anyway
 				//so let's just leave it as-is
 				return $object_id;
@@ -631,7 +633,7 @@ 
 		if($model->has_primary_key_field() && $model->get_primary_key_field()->is_auto_increment()){
 			$effective_id = $model_object_data[$model->primary_key_name()];
 			unset($model_object_data[$model->primary_key_name()]);
-		}else{
+		} else{
 			$effective_id = $model->get_index_primary_key_string( $model_object_data );
 		}
 		//the model takes care of validating the CSV's input
@@ -641,7 +643,7 @@ 
 				$old_db_to_new_db_mapping[$model->get_this_model_name()][$id_in_csv] = $new_id;
 				$this->_total_inserts++;
 				EE_Error::add_success( sprintf(__("Successfully added new %s (with id %s) with csv data %s", "event_espresso"),$model->get_this_model_name(),$new_id, implode(",",$model_object_data)));
-			}else{
+			} else{
 				$this->_total_insert_errors++;
 				//put the ID used back in there for the error message
 				if($model->has_primary_key_field()){
@@ -649,7 +651,7 @@ 
 				}
 				EE_Error::add_error( sprintf(__("Could not insert new %s with the csv data: %s", "event_espresso"),$model->get_this_model_name(),http_build_query($model_object_data)), __FILE__, __FUNCTION__, __LINE__ );
 			}
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			$this->_total_insert_errors++;
 			if($model->has_primary_key_field()){
 				$model_object_data[$model->primary_key_name()] = $effective_id;
@@ -676,12 +678,12 @@ 
 				$conditions = array($model->primary_key_name() => $model_object_data[$model->primary_key_name()]);
 				//remove the primary key because we shouldn't use it for updating
 				unset($model_object_data_for_update[$model->primary_key_name()]);
-			}elseif($model->get_combined_primary_key_fields() > 1 ){
+			} elseif($model->get_combined_primary_key_fields() > 1 ){
 				$conditions = array();
 				foreach($model->get_combined_primary_key_fields() as $key_field){
 					$conditions[$key_field->get_name()] = $model_object_data[$key_field->get_name()];
 				}
-			}else{
+			} else{
 				$model->primary_key_name();//this shoudl just throw an exception, explaining that we dont have a primary key (or a combine dkey)
 			}
 
@@ -695,23 +697,23 @@ 
 				//and so we record what record ended up being updated using the mapping
 				if( $model->has_primary_key_field() ){
 					$new_key_for_mapping = $model_object_data[ $model->primary_key_name() ];
-				}else{
+				} else{
 					//no primary key just a combined key
 					$new_key_for_mapping = $model->get_index_primary_key_string( $model_object_data );
 				}
 				$old_db_to_new_db_mapping[ $model->get_this_model_name() ][ $id_in_csv ] = $new_key_for_mapping;
-			}else{
+			} else{
 				$matched_items = $model->get_all(array($conditions));
 				if( ! $matched_items){
 					//no items were matched (so we shouldn't have updated)... but then we should have inserted? what the heck?
 					$this->_total_update_errors++;
 					EE_Error::add_error( sprintf(__("Could not update %s with the csv data: '%s' for an unknown reason (using WHERE conditions %s)", "event_espresso"),$model->get_this_model_name(),http_build_query($model_object_data),http_build_query($conditions)), __FILE__, __FUNCTION__, __LINE__ );
-				}else{
+				} else{
 					$this->_total_updates++;
 					EE_Error::add_success( sprintf(__("%s with csv data '%s' was found in the database and didn't need updating because all the data is identical.", "event_espresso"),$model->get_this_model_name(),implode(",",$model_object_data)));
 				}
 			}
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			$this->_total_update_errors++;
 			$basic_message = sprintf(__("Could not update %s with the csv data: %s because %s", "event_espresso"),$model->get_this_model_name(),implode(",",$model_object_data),$e->getMessage());
 			$debug_message = $basic_message . ' Stack trace: ' . $e->getTraceAsString();

Doc Comments +4 added lines, -10 removed lines

@@ -79,10 +79,6 @@ 
 	 *	@ access 	public
 	 * 	@param 	string 		$title - heading for the form
 	 * 	@param 	string 		$intro - additional text explaing what to do
-	 * 	@param 	string 		$page - EE Admin page to direct form to - in the form "espresso_{pageslug}"
-	 * 	@param 	string 		$action - EE Admin page route array "action" that form will direct to
-	 * 	@param 	string 		$type - type of file to import
-	 *	@ return 	string
 	 */
 	public function upload_form ( $title, $intro, $form_url, $action, $type  ) {
 
@@ -121,7 +117,7 @@ 
 	/**
 	 *	@Import Event Espresso data - some code "borrowed" from event espresso csv_import.php
 	 *	@access public
-	 *	@return boolean success
+	 *	@return boolean|null success
 	 */
 	public function import() {
 
@@ -272,8 +268,7 @@ 
       *
       * @access public
       * @param array $csv_data_array - the array containing the csv data produced from EE_CSV::import_csv_to_model_data_array()
-      * @param array $fields_to_save - an array containing the csv column names as keys with the corresponding db table fields they will be saved to
-      * @return TRUE on success, FALSE on fail
+      * @return boolean on success, FALSE on fail
       * @throws \EE_Error
       */
 	public function save_csv_data_array_to_db( $csv_data_array, $model_name = FALSE ) {
@@ -370,7 +365,7 @@ 
 	 * we need to insert a new row for that ID, and then map from the non-existent ID
 	 * to the newly-inserted real ID.
 	 * @param type $csv_data_array
-	 * @param type $export_from_site_a_to_b
+	 * @param boolean $export_from_site_a_to_b
 	 * @param type $old_db_to_new_db_mapping
 	 * @return array updated $old_db_to_new_db_mapping
 	 */
@@ -487,7 +482,6 @@ 
 	 * @param type $id_in_csv
 	 * @param type $model_object_data
 	 * @param EEM_Base $model
-	 * @param type $old_db_to_new_db_mapping
 	 * @return
 	 */
 	protected function _decide_whether_to_insert_or_update_given_data_from_same_db( $id_in_csv, $model_object_data, $model ) {
@@ -597,7 +591,7 @@ 
 	 * @param type $object_id
 	 * @param string $model_name
 	 * @param array $old_db_to_new_db_mapping
-	 * @param type $export_from_site_a_to_b
+	 * @param boolean $export_from_site_a_to_b
 	 * @return int
 	 */
 	protected function _find_mapping_in( $object_id, $model_name, $old_db_to_new_db_mapping, $export_from_site_a_to_b) {

Indentation +71 added lines, -71 removed lines

@@ -131,43 +131,43 @@ 
 		if ( isset( $_REQUEST['import'] )) {
 			if( isset( $_POST['csv_submitted'] )) {
 
-			    switch ( $_FILES['file']['error'][0] ) {
-			        case UPLOAD_ERR_OK:
-			            $error_msg = FALSE;
-			            break;
-			        case UPLOAD_ERR_INI_SIZE:
-			            $error_msg = __("'The uploaded file exceeds the upload_max_filesize directive in php.ini.'", "event_espresso");
-			            break;
-			        case UPLOAD_ERR_FORM_SIZE:
-			            $error_msg = __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_PARTIAL:
-			            $error_msg = __('The uploaded file was only partially uploaded.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_NO_FILE:
-			            $error_msg = __('No file was uploaded.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_NO_TMP_DIR:
-			            $error_msg = __('Missing a temporary folder.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_CANT_WRITE:
-			            $error_msg = __('Failed to write file to disk.', "event_espresso");
-			            break;
-			        case UPLOAD_ERR_EXTENSION:
-			            $error_msg = __('File upload stopped by extension.', "event_espresso");
-			            break;
-			        default:
-			            $error_msg = __('An unknown error occurred and the file could not be uploaded', "event_espresso");
-			            break;
-			    }
+				switch ( $_FILES['file']['error'][0] ) {
+					case UPLOAD_ERR_OK:
+						$error_msg = FALSE;
+						break;
+					case UPLOAD_ERR_INI_SIZE:
+						$error_msg = __("'The uploaded file exceeds the upload_max_filesize directive in php.ini.'", "event_espresso");
+						break;
+					case UPLOAD_ERR_FORM_SIZE:
+						$error_msg = __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.', "event_espresso");
+						break;
+					case UPLOAD_ERR_PARTIAL:
+						$error_msg = __('The uploaded file was only partially uploaded.', "event_espresso");
+						break;
+					case UPLOAD_ERR_NO_FILE:
+						$error_msg = __('No file was uploaded.', "event_espresso");
+						break;
+					case UPLOAD_ERR_NO_TMP_DIR:
+						$error_msg = __('Missing a temporary folder.', "event_espresso");
+						break;
+					case UPLOAD_ERR_CANT_WRITE:
+						$error_msg = __('Failed to write file to disk.', "event_espresso");
+						break;
+					case UPLOAD_ERR_EXTENSION:
+						$error_msg = __('File upload stopped by extension.', "event_espresso");
+						break;
+					default:
+						$error_msg = __('An unknown error occurred and the file could not be uploaded', "event_espresso");
+						break;
+				}
 
 				if ( ! $error_msg ) {
 
-				    $filename	= $_FILES['file']['name'][0];
+					$filename	= $_FILES['file']['name'][0];
 					$file_ext 		= substr( strrchr( $filename, '.' ), 1 );
-				    $file_type 	= $_FILES['file']['type'][0];
-				    $temp_file	= $_FILES['file']['tmp_name'][0];
-				    $filesize    	= $_FILES['file']['size'][0] / 1024;//convert from bytes to KB
+					$file_type 	= $_FILES['file']['type'][0];
+					$temp_file	= $_FILES['file']['tmp_name'][0];
+					$filesize    	= $_FILES['file']['size'][0] / 1024;//convert from bytes to KB
 
 					if ( $file_ext=='csv' ) {
 
@@ -242,40 +242,40 @@ 
 
 
 
-     /**
-      *    Given an array of data (usually from a CSV import) attempts to save that data to the db.
-      *    If $model_name ISN'T provided, assumes that this is a 3d array, with toplevel keys being model names,
-      *    next level being numeric indexes adn each value representing a model object, and the last layer down
-      *    being keys of model fields and their proposed values.
-      *    If $model_name IS provided, assumes a 2d array of the bottom two layers previously mentioned.
-      *    If the CSV data says (in the metadata row) that it's from the SAME database,
-      *    we treat the IDs in the CSV as the normal IDs, and try to update those records. However, if those
-      *    IDs DON'T exist in the database, they're treated as temporary IDs,
-      *    which can used elsewhere to refer to the same object. Once an item
-      *    with a temporary ID gets inserted, we record its mapping from temporary
-      *    ID to real ID, and use the real ID in place of the temporary ID
-      *    when that temporary ID was used as a foreign key.
-      *    If the CSV data says (in the metadata again) that it's from a DIFFERENT database,
-      *    we treat all the IDs in the CSV as temporary ID- eg, if the CSV specifies an event with
-      *    ID 1, and the database already has an event with ID 1, we assume that's just a coincidence,
-      *    and insert a new event, and map it's temporary ID of 1 over to its new real ID.
-      *    An important exception are non-auto-increment primary keys. If one entry in the
-      *    CSV file has the same ID as one in the DB, we assume they are meant to be
-      *    the same item, and instead update the item in the DB with that same ID.
-      *    Also note, we remember the mappings permanently. So the 2nd, 3rd, and 10000th
-      *    time you import a CSV from a different site, we remember their mappings, and
-      * will try to update the item in the DB instead of inserting another item (eg
-      * if we previously imported an event with temporary ID 1, and then it got a
-      * real ID of 123, we remember that. So the next time we import an event with
-      * temporary ID, from the same site, we know that it's real ID is 123, and will
-      * update that event, instead of adding a new event).
-      *
-      * @access public
-      * @param array $csv_data_array - the array containing the csv data produced from EE_CSV::import_csv_to_model_data_array()
-      * @param array $fields_to_save - an array containing the csv column names as keys with the corresponding db table fields they will be saved to
-      * @return TRUE on success, FALSE on fail
-      * @throws \EE_Error
-      */
+	 /**
+	  *    Given an array of data (usually from a CSV import) attempts to save that data to the db.
+	  *    If $model_name ISN'T provided, assumes that this is a 3d array, with toplevel keys being model names,
+	  *    next level being numeric indexes adn each value representing a model object, and the last layer down
+	  *    being keys of model fields and their proposed values.
+	  *    If $model_name IS provided, assumes a 2d array of the bottom two layers previously mentioned.
+	  *    If the CSV data says (in the metadata row) that it's from the SAME database,
+	  *    we treat the IDs in the CSV as the normal IDs, and try to update those records. However, if those
+	  *    IDs DON'T exist in the database, they're treated as temporary IDs,
+	  *    which can used elsewhere to refer to the same object. Once an item
+	  *    with a temporary ID gets inserted, we record its mapping from temporary
+	  *    ID to real ID, and use the real ID in place of the temporary ID
+	  *    when that temporary ID was used as a foreign key.
+	  *    If the CSV data says (in the metadata again) that it's from a DIFFERENT database,
+	  *    we treat all the IDs in the CSV as temporary ID- eg, if the CSV specifies an event with
+	  *    ID 1, and the database already has an event with ID 1, we assume that's just a coincidence,
+	  *    and insert a new event, and map it's temporary ID of 1 over to its new real ID.
+	  *    An important exception are non-auto-increment primary keys. If one entry in the
+	  *    CSV file has the same ID as one in the DB, we assume they are meant to be
+	  *    the same item, and instead update the item in the DB with that same ID.
+	  *    Also note, we remember the mappings permanently. So the 2nd, 3rd, and 10000th
+	  *    time you import a CSV from a different site, we remember their mappings, and
+	  * will try to update the item in the DB instead of inserting another item (eg
+	  * if we previously imported an event with temporary ID 1, and then it got a
+	  * real ID of 123, we remember that. So the next time we import an event with
+	  * temporary ID, from the same site, we know that it's real ID is 123, and will
+	  * update that event, instead of adding a new event).
+	  *
+	  * @access public
+	  * @param array $csv_data_array - the array containing the csv data produced from EE_CSV::import_csv_to_model_data_array()
+	  * @param array $fields_to_save - an array containing the csv column names as keys with the corresponding db table fields they will be saved to
+	  * @return TRUE on success, FALSE on fail
+	  * @throws \EE_Error
+	  */
 	public function save_csv_data_array_to_db( $csv_data_array, $model_name = FALSE ) {
 
 
@@ -306,10 +306,10 @@ 
 			unset($csv_data_array[EE_CSV::metadata_header]);
 		}
 		/**
-		* @var $old_db_to_new_db_mapping 2d array: toplevel keys being model names, bottom-level keys being the original key, and
-		* the value will be the newly-inserted ID.
-		* If we have already imported data from the same website via CSV, it shoudl be kept in this wp option
-		*/
+		 * @var $old_db_to_new_db_mapping 2d array: toplevel keys being model names, bottom-level keys being the original key, and
+		 * the value will be the newly-inserted ID.
+		 * If we have already imported data from the same website via CSV, it shoudl be kept in this wp option
+		 */
 	   $old_db_to_new_db_mapping = get_option('ee_id_mapping_from'.sanitize_title($old_site_url),array());
 	   if( $old_db_to_new_db_mapping){
 		   EE_Error::add_attention(sprintf(__("We noticed you have imported data via CSV from %s before. Because of this, IDs in your CSV have been mapped to their new IDs in %s", "event_espresso"),$old_site_url,site_url()));

Spacing +170 added lines, -170 removed lines

@@ -1,7 +1,7 @@ 
 <?php use EventEspresso\core\interfaces\ResettableInterface;
 
-if (!defined( 'EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 /**
  * EE_Import class
  *
@@ -58,7 +58,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_Import )) {
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_Import)) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -68,7 +68,7 @@ 
 	 * Resets the importer
 	 * @return EE_Import
 	 */
-	public static function reset(){
+	public static function reset() {
 		self::$_instance = null;
 		return self::instance();
 	}
@@ -86,27 +86,27 @@ 
 	 * 	@param 	string 		$type - type of file to import
 	 *	@ return 	string
 	 */
-	public function upload_form ( $title, $intro, $form_url, $action, $type  ) {
+	public function upload_form($title, $intro, $form_url, $action, $type) {
 
-		$form_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => $action ), $form_url );
+		$form_url = EE_Admin_Page::add_query_args_and_nonce(array('action' => $action), $form_url);
 
 		ob_start();
 ?>
 	<div class="ee-upload-form-dv">
-		<h3><?php echo $title;?></h3>
-		<p><?php echo $intro;?></p>
+		<h3><?php echo $title; ?></h3>
+		<p><?php echo $intro; ?></p>
 
 		<form action="<?php echo $form_url?>" method="post" enctype="multipart/form-data">
-			<input type="hidden" name="csv_submitted" value="TRUE" id="<?php echo time();?>">
-			<input name="import" type="hidden" value="<?php echo $type;?>" />
+			<input type="hidden" name="csv_submitted" value="TRUE" id="<?php echo time(); ?>">
+			<input name="import" type="hidden" value="<?php echo $type; ?>" />
 			<input type="file" name="file[]" size="90" >
-			<input class="button-primary" type="submit" value="<?php _e( 'Upload File', 'event_espresso' );?>">
+			<input class="button-primary" type="submit" value="<?php _e('Upload File', 'event_espresso'); ?>">
 		</form>
 
 		<p class="ee-attention">
-			<b><?php _e( 'Attention', 'event_espresso' );?></b><br/>
-			<?php echo sprintf( __( 'Accepts .%s file types only.', 'event_espresso' ), $type ) ;?>
-			<?php echo __( 'Please only import CSV files exported from Event Espresso, or compatible 3rd-party software.', 'event_espresso' );?>
+			<b><?php _e('Attention', 'event_espresso'); ?></b><br/>
+			<?php echo sprintf(__('Accepts .%s file types only.', 'event_espresso'), $type); ?>
+			<?php echo __('Please only import CSV files exported from Event Espresso, or compatible 3rd-party software.', 'event_espresso'); ?>
 		</p>
 
 	</div>
@@ -127,13 +127,13 @@ 
 	 */
 	public function import() {
 
-		require_once( EE_CLASSES . 'EE_CSV.class.php' );
+		require_once(EE_CLASSES.'EE_CSV.class.php');
 		$this->EE_CSV = EE_CSV::instance();
 
-		if ( isset( $_REQUEST['import'] )) {
-			if( isset( $_POST['csv_submitted'] )) {
+		if (isset($_REQUEST['import'])) {
+			if (isset($_POST['csv_submitted'])) {
 
-			    switch ( $_FILES['file']['error'][0] ) {
+			    switch ($_FILES['file']['error'][0]) {
 			        case UPLOAD_ERR_OK:
 			            $error_msg = FALSE;
 			            break;
@@ -163,32 +163,32 @@ 
 			            break;
 			    }
 
-				if ( ! $error_msg ) {
+				if ( ! $error_msg) {
 
-				    $filename	= $_FILES['file']['name'][0];
-					$file_ext 		= substr( strrchr( $filename, '.' ), 1 );
-				    $file_type 	= $_FILES['file']['type'][0];
-				    $temp_file	= $_FILES['file']['tmp_name'][0];
-				    $filesize    	= $_FILES['file']['size'][0] / 1024;//convert from bytes to KB
+				    $filename = $_FILES['file']['name'][0];
+					$file_ext = substr(strrchr($filename, '.'), 1);
+				    $file_type = $_FILES['file']['type'][0];
+				    $temp_file = $_FILES['file']['tmp_name'][0];
+				    $filesize = $_FILES['file']['size'][0] / 1024; //convert from bytes to KB
 
-					if ( $file_ext=='csv' ) {
+					if ($file_ext == 'csv') {
 
-						$max_upload = $this->EE_CSV->get_max_upload_size();//max upload size in KB
-						if ( $filesize < $max_upload || true) {
+						$max_upload = $this->EE_CSV->get_max_upload_size(); //max upload size in KB
+						if ($filesize < $max_upload || true) {
 
-							$wp_upload_dir = str_replace( array( '\\', '/' ), DS, wp_upload_dir());
-							$path_to_file = $wp_upload_dir['basedir'] . DS . 'espresso' . DS . $filename;
+							$wp_upload_dir = str_replace(array('\\', '/'), DS, wp_upload_dir());
+							$path_to_file = $wp_upload_dir['basedir'].DS.'espresso'.DS.$filename;
 
-							if( move_uploaded_file( $temp_file, $path_to_file )) {
+							if (move_uploaded_file($temp_file, $path_to_file)) {
 
 								// convert csv to array
-								$this->csv_array = $this->EE_CSV->import_csv_to_model_data_array( $path_to_file );
+								$this->csv_array = $this->EE_CSV->import_csv_to_model_data_array($path_to_file);
 
 								// was data successfully stored in an array?
-								if ( is_array( $this->csv_array ) ) {
+								if (is_array($this->csv_array)) {
 
-									$import_what = str_replace( 'csv_import_', '', $_REQUEST['action'] );
-									$import_what = str_replace( '_', ' ', ucwords( $import_what ));
+									$import_what = str_replace('csv_import_', '', $_REQUEST['action']);
+									$import_what = str_replace('_', ' ', ucwords($import_what));
 									$processed_data = $this->csv_array;
 									$this->columns_to_save = FALSE;
 
@@ -207,33 +207,33 @@ 
 
 									}
 									// save processed codes to db
-									if ( $this->save_csv_data_array_to_db( $processed_data, $this->columns_to_save ) ) {
+									if ($this->save_csv_data_array_to_db($processed_data, $this->columns_to_save)) {
 										return TRUE;
 
 									}
 								} else {
 									// no array? must be an error
-									EE_Error::add_error(sprintf(__("No file seems to have been uploaded", "event_espresso")), __FILE__, __FUNCTION__, __LINE__ );
+									EE_Error::add_error(sprintf(__("No file seems to have been uploaded", "event_espresso")), __FILE__, __FUNCTION__, __LINE__);
 									return FALSE;
 								}
 
 							} else {
-								EE_Error::add_error(sprintf(__("%s was not successfully uploaded", "event_espresso"),$filename), __FILE__, __FUNCTION__, __LINE__ );
+								EE_Error::add_error(sprintf(__("%s was not successfully uploaded", "event_espresso"), $filename), __FILE__, __FUNCTION__, __LINE__);
 								return FALSE;
 							}
 
 						} else {
-							EE_Error::add_error( sprintf(__("%s was too large of a file and could not be uploaded. The max filesize is %s' KB.", "event_espresso"),$filename,$max_upload), __FILE__, __FUNCTION__, __LINE__ );
+							EE_Error::add_error(sprintf(__("%s was too large of a file and could not be uploaded. The max filesize is %s' KB.", "event_espresso"), $filename, $max_upload), __FILE__, __FUNCTION__, __LINE__);
 							return FALSE;
 						}
 
 					} else {
-						EE_Error::add_error( sprintf(__("%s  had an invalid file extension, not uploaded", "event_espresso"),$filename), __FILE__, __FUNCTION__, __LINE__ );
+						EE_Error::add_error(sprintf(__("%s  had an invalid file extension, not uploaded", "event_espresso"), $filename), __FILE__, __FUNCTION__, __LINE__);
 						return FALSE;
 					}
 
 				} else {
-					EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 					return FALSE;
 				}
 
@@ -278,7 +278,7 @@ 
       * @return TRUE on success, FALSE on fail
       * @throws \EE_Error
       */
-	public function save_csv_data_array_to_db( $csv_data_array, $model_name = FALSE ) {
+	public function save_csv_data_array_to_db($csv_data_array, $model_name = FALSE) {
 
 
 		$success = FALSE;
@@ -288,22 +288,22 @@ 
 		$export_from_site_a_to_b = true;
 		// first level of array is not table information but a table name was passed to the function
 		// array is only two levels deep, so let's fix that by adding a level, else the next steps will fail
-		if($model_name){
+		if ($model_name) {
 			$csv_data_array = array($csv_data_array);
 		}
 		// begin looking through the $csv_data_array, expecting the toplevel key to be the model's name...
 		$old_site_url = 'none-specified';
 
 		//hanlde metadata
-		if(isset($csv_data_array[EE_CSV::metadata_header]) ){
+		if (isset($csv_data_array[EE_CSV::metadata_header])) {
 			$csv_metadata = array_shift($csv_data_array[EE_CSV::metadata_header]);
 			//ok so its metadata, dont try to save it to ehte db obviously...
-			if(isset($csv_metadata['site_url']) && $csv_metadata['site_url'] == site_url()){
+			if (isset($csv_metadata['site_url']) && $csv_metadata['site_url'] == site_url()) {
 				EE_Error::add_attention(sprintf(__("CSV Data appears to be from the same database, so attempting to update data", "event_espresso")));
 				$export_from_site_a_to_b = false;
-			}else{
-				$old_site_url = isset( $csv_metadata['site_url']) ? $csv_metadata['site_url'] : $old_site_url;
-				EE_Error::add_attention(sprintf(__("CSV Data appears to be from a different database (%s instead of %s), so we assume IDs in the CSV data DO NOT correspond to IDs in this database", "event_espresso"),$old_site_url,site_url()));
+			} else {
+				$old_site_url = isset($csv_metadata['site_url']) ? $csv_metadata['site_url'] : $old_site_url;
+				EE_Error::add_attention(sprintf(__("CSV Data appears to be from a different database (%s instead of %s), so we assume IDs in the CSV data DO NOT correspond to IDs in this database", "event_espresso"), $old_site_url, site_url()));
 			};
 			unset($csv_data_array[EE_CSV::metadata_header]);
 		}
@@ -312,30 +312,30 @@ 
 		* the value will be the newly-inserted ID.
 		* If we have already imported data from the same website via CSV, it shoudl be kept in this wp option
 		*/
-	   $old_db_to_new_db_mapping = get_option('ee_id_mapping_from'.sanitize_title($old_site_url),array());
-	   if( $old_db_to_new_db_mapping){
-		   EE_Error::add_attention(sprintf(__("We noticed you have imported data via CSV from %s before. Because of this, IDs in your CSV have been mapped to their new IDs in %s", "event_espresso"),$old_site_url,site_url()));
+	   $old_db_to_new_db_mapping = get_option('ee_id_mapping_from'.sanitize_title($old_site_url), array());
+	   if ($old_db_to_new_db_mapping) {
+		   EE_Error::add_attention(sprintf(__("We noticed you have imported data via CSV from %s before. Because of this, IDs in your CSV have been mapped to their new IDs in %s", "event_espresso"), $old_site_url, site_url()));
 	   }
 	   $old_db_to_new_db_mapping = $this->save_data_rows_to_db($csv_data_array, $export_from_site_a_to_b, $old_db_to_new_db_mapping);
 
 		//save the mapping from old db to new db in case they try re-importing the same data from the same website again
-		update_option('ee_id_mapping_from'.sanitize_title($old_site_url),$old_db_to_new_db_mapping);
+		update_option('ee_id_mapping_from'.sanitize_title($old_site_url), $old_db_to_new_db_mapping);
 
-		if ( $this->_total_updates > 0 ) {
-			EE_Error::add_success( sprintf(__("%s existing records in the database were updated.", "event_espresso"),$this->_total_updates));
+		if ($this->_total_updates > 0) {
+			EE_Error::add_success(sprintf(__("%s existing records in the database were updated.", "event_espresso"), $this->_total_updates));
 			$success = true;
 		}
-		if ( $this->_total_inserts > 0 ) {
-			EE_Error::add_success(sprintf(__("%s new records were added to the database.", "event_espresso"),$this->_total_inserts));
+		if ($this->_total_inserts > 0) {
+			EE_Error::add_success(sprintf(__("%s new records were added to the database.", "event_espresso"), $this->_total_inserts));
 			$success = true;
 		}
 
-		if ( $this->_total_update_errors > 0 ) {
-			EE_Error::add_error(sprintf(__("'One or more errors occurred, and a total of %s existing records in the database were <strong>not</strong> updated.'", "event_espresso"),$this->_total_update_errors), __FILE__, __FUNCTION__, __LINE__ );
+		if ($this->_total_update_errors > 0) {
+			EE_Error::add_error(sprintf(__("'One or more errors occurred, and a total of %s existing records in the database were <strong>not</strong> updated.'", "event_espresso"), $this->_total_update_errors), __FILE__, __FUNCTION__, __LINE__);
 			$error = true;
 		}
-		if ( $this->_total_insert_errors > 0 ) {
-			EE_Error::add_error(sprintf(__("One or more errors occurred, and a total of %s new records were <strong>not</strong> added to the database.'", "event_espresso"),$this->_total_insert_errors), __FILE__, __FUNCTION__, __LINE__ );
+		if ($this->_total_insert_errors > 0) {
+			EE_Error::add_error(sprintf(__("One or more errors occurred, and a total of %s new records were <strong>not</strong> added to the database.'", "event_espresso"), $this->_total_insert_errors), __FILE__, __FUNCTION__, __LINE__);
 			$error = true;
 		}
 
@@ -344,7 +344,7 @@ 
 		EEM_Ticket::instance()->update_tickets_sold(EEM_Ticket::instance()->get_all());
 
 		// if there was at least one success and absolutely no errors
-		if ( $success && ! $error ) {
+		if ($success && ! $error) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -376,81 +376,81 @@ 
 	 * @param type $old_db_to_new_db_mapping
 	 * @return array updated $old_db_to_new_db_mapping
 	 */
-	public function save_data_rows_to_db( $csv_data_array, $export_from_site_a_to_b, $old_db_to_new_db_mapping ) {
-		foreach ( $csv_data_array as $model_name_in_csv_data => $model_data_from_import ) {
+	public function save_data_rows_to_db($csv_data_array, $export_from_site_a_to_b, $old_db_to_new_db_mapping) {
+		foreach ($csv_data_array as $model_name_in_csv_data => $model_data_from_import) {
 			//now check that assumption was correct. If
-			if ( EE_Registry::instance()->is_model_name($model_name_in_csv_data)) {
+			if (EE_Registry::instance()->is_model_name($model_name_in_csv_data)) {
 				$model_name = $model_name_in_csv_data;
-			}else {
+			} else {
 				// no table info in the array and no table name passed to the function?? FAIL
-				EE_Error::add_error( __('No table information was specified and/or found, therefore the import could not be completed','event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('No table information was specified and/or found, therefore the import could not be completed', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return FALSE;
 			}
 			/* @var $model EEM_Base */
 			$model = EE_Registry::instance()->load_model($model_name);
 
 			//so without further ado, scanning all the data provided for primary keys and their inital values
-			foreach ( $model_data_from_import as $model_object_data ) {
+			foreach ($model_data_from_import as $model_object_data) {
 				//before we do ANYTHING, make sure the csv row wasn't just completely blank
 				$row_is_completely_empty = true;
-				foreach($model_object_data as $field){
-					if($field){
+				foreach ($model_object_data as $field) {
+					if ($field) {
 						$row_is_completely_empty = false;
 					}
 				}
-				if($row_is_completely_empty){
+				if ($row_is_completely_empty) {
 					continue;
 				}
 				//find the PK in the row of data (or a combined key if
 				//there is no primary key)
-				if($model->has_primary_key_field()){
-					$id_in_csv =  $model_object_data[$model->primary_key_name()];
-				}else{
+				if ($model->has_primary_key_field()) {
+					$id_in_csv = $model_object_data[$model->primary_key_name()];
+				} else {
 					$id_in_csv = $model->get_index_primary_key_string($model_object_data);
 				}
 
 
-				$model_object_data = $this->_replace_temp_ids_with_mappings( $model_object_data, $model, $old_db_to_new_db_mapping, $export_from_site_a_to_b );
+				$model_object_data = $this->_replace_temp_ids_with_mappings($model_object_data, $model, $old_db_to_new_db_mapping, $export_from_site_a_to_b);
 				//now we need to decide if we're going to add a new model object given the $model_object_data,
 				//or just update.
-				if($export_from_site_a_to_b){
-					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_other_db( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}else{//this is just a re-import
-					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_same_db( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
+				if ($export_from_site_a_to_b) {
+					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_other_db($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping);
+				} else {//this is just a re-import
+					$what_to_do = $this->_decide_whether_to_insert_or_update_given_data_from_same_db($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping);
 				}
-				if( $what_to_do == self::do_nothing ) {
+				if ($what_to_do == self::do_nothing) {
 					continue;
 				}
 
 				//double-check we actually want to insert, if that's what we're planning
 				//based on whether this item would be unique in the DB or not
-				if( $what_to_do == self::do_insert ) {
+				if ($what_to_do == self::do_insert) {
 					//we're supposed to be inserting. But wait, will this thing
 					//be acceptable if inserted?
-					$conflicting = $model->get_one_conflicting( $model_object_data, false );
-					if($conflicting){
+					$conflicting = $model->get_one_conflicting($model_object_data, false);
+					if ($conflicting) {
 						//ok, this item would conflict if inserted. Just update the item that it conflicts with.
 						$what_to_do = self::do_update;
 						//and if this model has a primary key, remember its mapping
-						if($model->has_primary_key_field()){
+						if ($model->has_primary_key_field()) {
 							$old_db_to_new_db_mapping[$model_name][$id_in_csv] = $conflicting->ID();
 							$model_object_data[$model->primary_key_name()] = $conflicting->ID();
-						}else{
+						} else {
 							//we want to update this conflicting item, instead of inserting a conflicting item
 							//so we need to make sure they match entirely (its possible that they only conflicted on one field, but we need them to match on other fields
 							//for the WHERE conditions in the update). At the time of this comment, there were no models like this
-							foreach($model->get_combined_primary_key_fields() as $key_field){
+							foreach ($model->get_combined_primary_key_fields() as $key_field) {
 								$model_object_data[$key_field->get_name()] = $conflicting->get($key_field->get_name());
 							}
 						}
 					}
 				}
-				if( $what_to_do == self::do_insert ) {
-					$old_db_to_new_db_mapping = $this->_insert_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}elseif( $what_to_do == self::do_update ) {
-					$old_db_to_new_db_mapping = $this->_update_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping );
-				}else{
-					throw new EE_Error( sprintf( __( 'Programming error. We shoudl be inserting or updating, but instead we are being told to "%s", whifh is invalid', 'event_espresso' ), $what_to_do ) );
+				if ($what_to_do == self::do_insert) {
+					$old_db_to_new_db_mapping = $this->_insert_from_data_array($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping);
+				}elseif ($what_to_do == self::do_update) {
+					$old_db_to_new_db_mapping = $this->_update_from_data_array($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping);
+				} else {
+					throw new EE_Error(sprintf(__('Programming error. We shoudl be inserting or updating, but instead we are being told to "%s", whifh is invalid', 'event_espresso'), $what_to_do));
 				}
 			}
 		}
@@ -471,13 +471,13 @@ 
 	 * @param array $old_db_to_new_db_mapping by reference so it can be modified
 	 * @return string one of the consts on this class that starts with do_*
 	 */
-	protected function _decide_whether_to_insert_or_update_given_data_from_other_db( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping ) {
+	protected function _decide_whether_to_insert_or_update_given_data_from_other_db($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping) {
 		$model_name = $model->get_this_model_name();
 		//if it's a site-to-site export-and-import, see if this modelobject's id
 		//in the old data that we know of
-		if( isset($old_db_to_new_db_mapping[$model_name][$id_in_csv]) ){
+		if (isset($old_db_to_new_db_mapping[$model_name][$id_in_csv])) {
 			return self::do_update;
-		}else{
+		} else {
 			return self::do_insert;
 		}
 	}
@@ -492,11 +492,11 @@ 
 	 * @param type $old_db_to_new_db_mapping
 	 * @return
 	 */
-	protected function _decide_whether_to_insert_or_update_given_data_from_same_db( $id_in_csv, $model_object_data, $model ) {
+	protected function _decide_whether_to_insert_or_update_given_data_from_same_db($id_in_csv, $model_object_data, $model) {
 		//in this case, check if this thing ACTUALLY exists in the database
-		if( $model->get_one_conflicting( $model_object_data ) ){
+		if ($model->get_one_conflicting($model_object_data)) {
 			return self::do_update;
-		}else{
+		} else {
 			return self::do_insert;
 		}
 	}
@@ -515,55 +515,55 @@ 
 	 * @param boolean $export_from_site_a_to_b
 	 * @return array updated model object data with temp IDs removed
 	 */
-	protected function _replace_temp_ids_with_mappings( $model_object_data, $model, $old_db_to_new_db_mapping, $export_from_site_a_to_b ) {
+	protected function _replace_temp_ids_with_mappings($model_object_data, $model, $old_db_to_new_db_mapping, $export_from_site_a_to_b) {
 		//if this model object's primary key is in the mapping, replace it
-		if( $model->has_primary_key_field() &&
+		if ($model->has_primary_key_field() &&
 				$model->get_primary_key_field()->is_auto_increment() &&
-				isset( $old_db_to_new_db_mapping[ $model->get_this_model_name() ] ) &&
-				isset( $old_db_to_new_db_mapping[ $model->get_this_model_name() ][ $model_object_data[ $model->primary_key_name() ] ] ) ) {
-			$model_object_data[ $model->primary_key_name() ] = $old_db_to_new_db_mapping[ $model->get_this_model_name() ][ $model_object_data[ $model->primary_key_name() ] ];
+				isset($old_db_to_new_db_mapping[$model->get_this_model_name()]) &&
+				isset($old_db_to_new_db_mapping[$model->get_this_model_name()][$model_object_data[$model->primary_key_name()]])) {
+			$model_object_data[$model->primary_key_name()] = $old_db_to_new_db_mapping[$model->get_this_model_name()][$model_object_data[$model->primary_key_name()]];
 		}
 
-		try{
+		try {
 			$model_name_field = $model->get_field_containing_related_model_name();
 			$models_pointed_to_by_model_name_field = $model_name_field->get_model_names_pointed_to();
-		}catch( EE_Error $e ){
+		} catch (EE_Error $e) {
 			$model_name_field = NULL;
 			$models_pointed_to_by_model_name_field = array();
 		}
-		foreach( $model->field_settings( true )  as $field_obj ){
-			if( $field_obj instanceof EE_Foreign_Key_Int_Field ) {
+		foreach ($model->field_settings(true)  as $field_obj) {
+			if ($field_obj instanceof EE_Foreign_Key_Int_Field) {
 				$models_pointed_to = $field_obj->get_model_names_pointed_to();
 				$found_a_mapping = false;
-				foreach( $models_pointed_to as $model_pointed_to_by_fk ) {
+				foreach ($models_pointed_to as $model_pointed_to_by_fk) {
 
-					if( $model_name_field ){
-						$value_of_model_name_field = $model_object_data[ $model_name_field->get_name() ];
-						if( $value_of_model_name_field == $model_pointed_to_by_fk ) {
-							$model_object_data[ $field_obj->get_name() ] = $this->_find_mapping_in(
-									$model_object_data[ $field_obj->get_name() ],
+					if ($model_name_field) {
+						$value_of_model_name_field = $model_object_data[$model_name_field->get_name()];
+						if ($value_of_model_name_field == $model_pointed_to_by_fk) {
+							$model_object_data[$field_obj->get_name()] = $this->_find_mapping_in(
+									$model_object_data[$field_obj->get_name()],
 									$model_pointed_to_by_fk,
 									$old_db_to_new_db_mapping,
 									$export_from_site_a_to_b );
 								$found_a_mapping = true;
 								break;
 						}
-					}else{
-						$model_object_data[ $field_obj->get_name() ] = $this->_find_mapping_in(
-								$model_object_data[ $field_obj->get_name() ],
+					} else {
+						$model_object_data[$field_obj->get_name()] = $this->_find_mapping_in(
+								$model_object_data[$field_obj->get_name()],
 								$model_pointed_to_by_fk,
 								$old_db_to_new_db_mapping,
 								$export_from_site_a_to_b );
 						$found_a_mapping = true;
 					}
 					//once we've found a mapping for this field no need to continue
-					if( $found_a_mapping ) {
+					if ($found_a_mapping) {
 						break;
 					}
 
 
 				}
-			}else{
+			} else {
 				//it's a string foreign key (which we leave alone, because those are things
 				//like country names, which we'd really rather not make 2 USAs etc (we'd actually
 				//prefer to just update one)
@@ -571,8 +571,8 @@ 
 			}
 		}
 		//
-		if( $model instanceof EEM_Term_Taxonomy ){
-			$model_object_data = $this->_handle_split_term_ids( $model_object_data );
+		if ($model instanceof EEM_Term_Taxonomy) {
+			$model_object_data = $this->_handle_split_term_ids($model_object_data);
 		}
 		return $model_object_data;
 	}
@@ -584,11 +584,11 @@ 
 	 * @param type $model_object_data
 	 * @return array new model object data
 	 */
-	protected function _handle_split_term_ids( $model_object_data ){
-		if( isset( $model_object_data['term_id'] ) && isset( $model_object_data[ 'taxonomy' ]) && apply_filters( 'FHEE__EE_Import__handle_split_term_ids__function_exists', function_exists( 'wp_get_split_term' ), $model_object_data ) ) {
-			$new_term_id = wp_get_split_term( $model_object_data[ 'term_id' ], $model_object_data[ 'taxonomy' ] );
-			if( $new_term_id ){
-				$model_object_data[ 'term_id' ] = $new_term_id;
+	protected function _handle_split_term_ids($model_object_data) {
+		if (isset($model_object_data['term_id']) && isset($model_object_data['taxonomy']) && apply_filters('FHEE__EE_Import__handle_split_term_ids__function_exists', function_exists('wp_get_split_term'), $model_object_data)) {
+			$new_term_id = wp_get_split_term($model_object_data['term_id'], $model_object_data['taxonomy']);
+			if ($new_term_id) {
+				$model_object_data['term_id'] = $new_term_id;
 			}
 		}
 		return $model_object_data;
@@ -602,18 +602,18 @@ 
 	 * @param type $export_from_site_a_to_b
 	 * @return int
 	 */
-	protected function _find_mapping_in( $object_id, $model_name, $old_db_to_new_db_mapping, $export_from_site_a_to_b) {
-		if(	isset( $old_db_to_new_db_mapping[ $model_name ][ $object_id ] ) ){
+	protected function _find_mapping_in($object_id, $model_name, $old_db_to_new_db_mapping, $export_from_site_a_to_b) {
+		if (isset($old_db_to_new_db_mapping[$model_name][$object_id])) {
 
-				return $old_db_to_new_db_mapping[ $model_name ][ $object_id ];
-			}elseif( $object_id == '0' || $object_id == '' ) {
+				return $old_db_to_new_db_mapping[$model_name][$object_id];
+			}elseif ($object_id == '0' || $object_id == '') {
 				//leave as-is
 				return $object_id;
-			}elseif( $export_from_site_a_to_b ){
+			}elseif ($export_from_site_a_to_b) {
 				//we couldn't find a mapping for this, and it's from a different site,
 				//so blank it out
 				return NULL;
-			}elseif( ! $export_from_site_a_to_b ) {
+			}elseif ( ! $export_from_site_a_to_b) {
 				//we coudln't find a mapping for this, but it's from thsi DB anyway
 				//so let's just leave it as-is
 				return $object_id;
@@ -628,36 +628,36 @@ 
 	 * @param type $old_db_to_new_db_mapping
 	 * @return array updated $old_db_to_new_db_mapping
 	 */
-	protected function _insert_from_data_array( $id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping ) {
+	protected function _insert_from_data_array($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping) {
 		//remove the primary key, if there is one (we don't want it for inserts OR updates)
 		//we'll put it back in if we need it
-		if($model->has_primary_key_field() && $model->get_primary_key_field()->is_auto_increment()){
+		if ($model->has_primary_key_field() && $model->get_primary_key_field()->is_auto_increment()) {
 			$effective_id = $model_object_data[$model->primary_key_name()];
 			unset($model_object_data[$model->primary_key_name()]);
-		}else{
-			$effective_id = $model->get_index_primary_key_string( $model_object_data );
+		} else {
+			$effective_id = $model->get_index_primary_key_string($model_object_data);
 		}
 		//the model takes care of validating the CSV's input
-		try{
+		try {
 			$new_id = $model->insert($model_object_data);
-			if( $new_id ){
+			if ($new_id) {
 				$old_db_to_new_db_mapping[$model->get_this_model_name()][$id_in_csv] = $new_id;
 				$this->_total_inserts++;
-				EE_Error::add_success( sprintf(__("Successfully added new %s (with id %s) with csv data %s", "event_espresso"),$model->get_this_model_name(),$new_id, implode(",",$model_object_data)));
-			}else{
+				EE_Error::add_success(sprintf(__("Successfully added new %s (with id %s) with csv data %s", "event_espresso"), $model->get_this_model_name(), $new_id, implode(",", $model_object_data)));
+			} else {
 				$this->_total_insert_errors++;
 				//put the ID used back in there for the error message
-				if($model->has_primary_key_field()){
+				if ($model->has_primary_key_field()) {
 					$model_object_data[$model->primary_key_name()] = $effective_id;
 				}
-				EE_Error::add_error( sprintf(__("Could not insert new %s with the csv data: %s", "event_espresso"),$model->get_this_model_name(),http_build_query($model_object_data)), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(sprintf(__("Could not insert new %s with the csv data: %s", "event_espresso"), $model->get_this_model_name(), http_build_query($model_object_data)), __FILE__, __FUNCTION__, __LINE__);
 			}
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			$this->_total_insert_errors++;
-			if($model->has_primary_key_field()){
+			if ($model->has_primary_key_field()) {
 				$model_object_data[$model->primary_key_name()] = $effective_id;
 			}
-			EE_Error::add_error( sprintf(__("Could not insert new %s with the csv data: %s because %s", "event_espresso"),$model->get_this_model_name(),implode(",",$model_object_data),$e->getMessage()), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(sprintf(__("Could not insert new %s with the csv data: %s because %s", "event_espresso"), $model->get_this_model_name(), implode(",", $model_object_data), $e->getMessage()), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $old_db_to_new_db_mapping;
 	}
@@ -670,55 +670,55 @@ 
 	 * @param array $old_db_to_new_db_mapping
 	 * @return array updated $old_db_to_new_db_mapping
 	 */
-	protected function _update_from_data_array( $id_in_csv,  $model_object_data, $model, $old_db_to_new_db_mapping ) {
-		try{
+	protected function _update_from_data_array($id_in_csv, $model_object_data, $model, $old_db_to_new_db_mapping) {
+		try {
 			//let's keep two copies of the model object data:
 			//one for performing an update, one for everthing else
 			$model_object_data_for_update = $model_object_data;
-			if($model->has_primary_key_field()){
+			if ($model->has_primary_key_field()) {
 				$conditions = array($model->primary_key_name() => $model_object_data[$model->primary_key_name()]);
 				//remove the primary key because we shouldn't use it for updating
 				unset($model_object_data_for_update[$model->primary_key_name()]);
-			}elseif($model->get_combined_primary_key_fields() > 1 ){
+			}elseif ($model->get_combined_primary_key_fields() > 1) {
 				$conditions = array();
-				foreach($model->get_combined_primary_key_fields() as $key_field){
+				foreach ($model->get_combined_primary_key_fields() as $key_field) {
 					$conditions[$key_field->get_name()] = $model_object_data[$key_field->get_name()];
 				}
-			}else{
-				$model->primary_key_name();//this shoudl just throw an exception, explaining that we dont have a primary key (or a combine dkey)
+			} else {
+				$model->primary_key_name(); //this shoudl just throw an exception, explaining that we dont have a primary key (or a combine dkey)
 			}
 
-			$success = $model->update($model_object_data_for_update,array($conditions));
-			if($success){
+			$success = $model->update($model_object_data_for_update, array($conditions));
+			if ($success) {
 				$this->_total_updates++;
-				EE_Error::add_success( sprintf(__("Successfully updated %s with csv data %s", "event_espresso"),$model->get_this_model_name(),implode(",",$model_object_data_for_update)));
+				EE_Error::add_success(sprintf(__("Successfully updated %s with csv data %s", "event_espresso"), $model->get_this_model_name(), implode(",", $model_object_data_for_update)));
 				//we should still record the mapping even though it was an update
 				//because if we were going to insert somethign but it was going to conflict
 				//we would have last-minute decided to update. So we'd like to know what we updated
 				//and so we record what record ended up being updated using the mapping
-				if( $model->has_primary_key_field() ){
-					$new_key_for_mapping = $model_object_data[ $model->primary_key_name() ];
-				}else{
+				if ($model->has_primary_key_field()) {
+					$new_key_for_mapping = $model_object_data[$model->primary_key_name()];
+				} else {
 					//no primary key just a combined key
-					$new_key_for_mapping = $model->get_index_primary_key_string( $model_object_data );
+					$new_key_for_mapping = $model->get_index_primary_key_string($model_object_data);
 				}
-				$old_db_to_new_db_mapping[ $model->get_this_model_name() ][ $id_in_csv ] = $new_key_for_mapping;
-			}else{
+				$old_db_to_new_db_mapping[$model->get_this_model_name()][$id_in_csv] = $new_key_for_mapping;
+			} else {
 				$matched_items = $model->get_all(array($conditions));
-				if( ! $matched_items){
+				if ( ! $matched_items) {
 					//no items were matched (so we shouldn't have updated)... but then we should have inserted? what the heck?
 					$this->_total_update_errors++;
-					EE_Error::add_error( sprintf(__("Could not update %s with the csv data: '%s' for an unknown reason (using WHERE conditions %s)", "event_espresso"),$model->get_this_model_name(),http_build_query($model_object_data),http_build_query($conditions)), __FILE__, __FUNCTION__, __LINE__ );
-				}else{
+					EE_Error::add_error(sprintf(__("Could not update %s with the csv data: '%s' for an unknown reason (using WHERE conditions %s)", "event_espresso"), $model->get_this_model_name(), http_build_query($model_object_data), http_build_query($conditions)), __FILE__, __FUNCTION__, __LINE__);
+				} else {
 					$this->_total_updates++;
-					EE_Error::add_success( sprintf(__("%s with csv data '%s' was found in the database and didn't need updating because all the data is identical.", "event_espresso"),$model->get_this_model_name(),implode(",",$model_object_data)));
+					EE_Error::add_success(sprintf(__("%s with csv data '%s' was found in the database and didn't need updating because all the data is identical.", "event_espresso"), $model->get_this_model_name(), implode(",", $model_object_data)));
 				}
 			}
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			$this->_total_update_errors++;
-			$basic_message = sprintf(__("Could not update %s with the csv data: %s because %s", "event_espresso"),$model->get_this_model_name(),implode(",",$model_object_data),$e->getMessage());
-			$debug_message = $basic_message . ' Stack trace: ' . $e->getTraceAsString();
-			EE_Error::add_error( "$basic_message | $debug_message", __FILE__, __FUNCTION__, __LINE__ );
+			$basic_message = sprintf(__("Could not update %s with the csv data: %s because %s", "event_espresso"), $model->get_this_model_name(), implode(",", $model_object_data), $e->getMessage());
+			$debug_message = $basic_message.' Stack trace: '.$e->getTraceAsString();
+			EE_Error::add_error("$basic_message | $debug_message", __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $old_db_to_new_db_mapping;
 	}
@@ -727,28 +727,28 @@ 
 	 * Gets the number of inserts performed since importer was instantiated or reset
 	 * @return int
 	 */
-	public function get_total_inserts(){
+	public function get_total_inserts() {
 		return $this->_total_inserts;
 	}
 	/**
 	 *  Gets the number of insert errors since importer was instantiated or reset
 	 * @return int
 	 */
-	public function get_total_insert_errors(){
+	public function get_total_insert_errors() {
 		return $this->_total_insert_errors;
 	}
 	/**
 	 *  Gets the number of updates performed since importer was instantiated or reset
 	 * @return int
 	 */
-	public function get_total_updates(){
+	public function get_total_updates() {
 		return $this->_total_updates;
 	}
 	/**
 	 *  Gets the number of update errors since importer was instantiated or reset
 	 * @return int
 	 */
-	public function get_total_update_errors(){
+	public function get_total_update_errors() {
 		return $this->_total_update_errors;
 	}
 

core/libraries/form_sections/inputs/EE_State_Select_Input.php

Spacing +12 added lines, -12 removed lines

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

core/admin/templates/espresso_ratings_request_content.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@
 <div class="padding">
-	<p><?php _e( 'We need your help to continue maintaining and providing this plugin for free. You can help by leaving a positive review in the WordPress plugin directory. 5 star ratings bring Event Espresso Decaf to the attention of more users which increases our support and features for this version of Event Espresso.', 'event_espresso' ); ?></p>
-	<p><?php _e( 'Rate it five stars today!', 'event_espresso' ); ?></p><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span>
-	<p><a class="button button-primary" href="https://events.codebasehq.com/redirect?https://login.wordpress.org/?redirect_to=https%3A%2F%2Fwordpress.org%2Fsupport%2Fview%2Fplugin-reviews%2Fevent-espresso-decaf%3Frate%3D5%23postform"><?php _e( 'Rate It!', 'event_espresso' ); ?></a></p>
+	<p><?php _e('We need your help to continue maintaining and providing this plugin for free. You can help by leaving a positive review in the WordPress plugin directory. 5 star ratings bring Event Espresso Decaf to the attention of more users which increases our support and features for this version of Event Espresso.', 'event_espresso'); ?></p>
+	<p><?php _e('Rate it five stars today!', 'event_espresso'); ?></p><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span>
+	<p><a class="button button-primary" href="https://events.codebasehq.com/redirect?https://login.wordpress.org/?redirect_to=https%3A%2F%2Fwordpress.org%2Fsupport%2Fview%2Fplugin-reviews%2Fevent-espresso-decaf%3Frate%3D5%23postform"><?php _e('Rate It!', 'event_espresso'); ?></a></p>
 </div>
\ No newline at end of file

payment_methods/Paypal_Express/templates/paypal_express_intro.template.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<?php printf( __('PayPal Express (Express Checkout) is an off-site payment method for accepting payments via PayPal and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalexpress/" target="_blank">','</a>' ); ?> 
\ No newline at end of file
+<?php printf(__('PayPal Express (Express Checkout) is an off-site payment method for accepting payments via PayPal and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalexpress/" target="_blank">', '</a>'); ?> 
\ No newline at end of file