MinnPost / object-sync-for-salesforce

classes/class-object-sync-sf-queue.php

Spacing +27 added lines, -27 removed lines

@@ -3,7 +3,7 @@ 
  * Object Sync for Salesforce Queue
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly.
 }
 
@@ -20,7 +20,7 @@ 
 	protected $slug;
 	protected $schedulable_classes;
 
-	public function __construct( $wpdb, $version, $slug, $schedulable_classes ) {
+	public function __construct($wpdb, $version, $slug, $schedulable_classes) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
 		$this->slug                = $slug;
@@ -34,18 +34,18 @@ 
 	 * @param string  $sort Which direction to sort
 	 * @return array $this->schedulable_classes
 	 */
-	public function get_frequencies( $unit = 'seconds', $sort = 'asc' ) {
+	public function get_frequencies($unit = 'seconds', $sort = 'asc') {
 
-		foreach ( $this->schedulable_classes as $key => $schedule ) {
-			$this->schedulable_classes[ $key ]['frequency'] = $this->get_frequency( $key, 'seconds' );
+		foreach ($this->schedulable_classes as $key => $schedule) {
+			$this->schedulable_classes[$key]['frequency'] = $this->get_frequency($key, 'seconds');
 		}
 
-		if ( 'asc' === $sort ) {
-			uasort( $this->schedulable_classes, function( $a, $b ) {
+		if ('asc' === $sort) {
+			uasort($this->schedulable_classes, function($a, $b) {
 				return $a['frequency'] - $b['frequency'];
 			});
 		} else {
-			uasort( $this->schedulable_classes, function( $a, $b ) {
+			uasort($this->schedulable_classes, function($a, $b) {
 				return $b['frequency'] - $a['frequency'];
 			});
 		}
@@ -61,11 +61,11 @@ 
 	 * @param string  $unit The unit of time
 	 * @return int How often it runs in that unit of time
 	 */
-	public function get_frequency( $name, $unit ) {
-		$schedule_number = get_option( 'object_sync_for_salesforce_' . $name . '_schedule_number', '' );
-		$schedule_unit   = get_option( 'object_sync_for_salesforce_' . $name . '_schedule_unit', '' );
+	public function get_frequency($name, $unit) {
+		$schedule_number = get_option('object_sync_for_salesforce_' . $name . '_schedule_number', '');
+		$schedule_unit   = get_option('object_sync_for_salesforce_' . $name . '_schedule_unit', '');
 
-		switch ( $schedule_unit ) {
+		switch ($schedule_unit) {
 			case 'minutes':
 				$seconds = 60;
 				$minutes = 1;
@@ -96,8 +96,8 @@ 
 	 * @param string $group The group to assign this job to.
 	 * @return string The action ID.
 	 */
-	public function add( $hook, $args = array(), $group = '' ) {
-		return $this->schedule_single( time(), $hook, $args, $group );
+	public function add($hook, $args = array(), $group = '') {
+		return $this->schedule_single(time(), $hook, $args, $group);
 	}
 
 	/**
@@ -109,8 +109,8 @@ 
 	 * @param string $group The group to assign this job to.
 	 * @return string The action ID.
 	 */
-	public function schedule_single( $timestamp, $hook, $args = array(), $group = '' ) {
-		return as_schedule_single_action( $timestamp, $hook, $args, $group );
+	public function schedule_single($timestamp, $hook, $args = array(), $group = '') {
+		return as_schedule_single_action($timestamp, $hook, $args, $group);
 	}
 
 	/**
@@ -123,8 +123,8 @@ 
 	 * @param string $group The group to assign this job to.
 	 * @return string The action ID.
 	 */
-	public function schedule_recurring( $timestamp, $interval_in_seconds, $hook, $args = array(), $group = '' ) {
-		return as_schedule_recurring_action( $timestamp, $interval_in_seconds, $hook, $args, $group );
+	public function schedule_recurring($timestamp, $interval_in_seconds, $hook, $args = array(), $group = '') {
+		return as_schedule_recurring_action($timestamp, $interval_in_seconds, $hook, $args, $group);
 	}
 
 	/**
@@ -147,8 +147,8 @@ 
 	 * @param string $group The group to assign this job to.
 	 * @return string The action ID
 	 */
-	public function schedule_cron( $timestamp, $cron_schedule, $hook, $args = array(), $group = '' ) {
-		return as_schedule_cron_action( $timestamp, $cron_schedule, $hook, $args, $group );
+	public function schedule_cron($timestamp, $cron_schedule, $hook, $args = array(), $group = '') {
+		return as_schedule_cron_action($timestamp, $cron_schedule, $hook, $args, $group);
 	}
 
 	/**
@@ -164,8 +164,8 @@ 
 	 * @param array  $args Args that would have been passed to the job.
 	 * @param string $group Group name.
 	 */
-	public function cancel( $hook, $args = array(), $group = '' ) {
-		as_unschedule_action( $hook, $args, $group );
+	public function cancel($hook, $args = array(), $group = '') {
+		as_unschedule_action($hook, $args, $group);
 	}
 
 	/**
@@ -177,11 +177,11 @@ 
 	 * @param string $group Group name.
 	 * @return time|null The date and time for the next occurrence, or null if there is no pending, scheduled action for the given hook.
 	 */
-	public function get_next( $hook, $args = null, $group = '' ) {
+	public function get_next($hook, $args = null, $group = '') {
 
-		$next_timestamp = as_next_scheduled_action( $hook, $args, $group );
+		$next_timestamp = as_next_scheduled_action($hook, $args, $group);
 
-		if ( $next_timestamp ) {
+		if ($next_timestamp) {
 			return $next_timestamp;
 		}
 
@@ -209,7 +209,7 @@ 
 	 * @param string $return_format OBJECT, ARRAY_A, or ids.
 	 * @return array
 	 */
-	public function search( $args = array(), $return_format = OBJECT ) {
-		return as_get_scheduled_actions( $args, $return_format );
+	public function search($args = array(), $return_format = OBJECT) {
+		return as_get_scheduled_actions($args, $return_format);
 	}
 }

classes/salesforce_pull.php

Spacing +319 added lines, -319 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -44,7 +44,7 @@ 
 	* @param object $queue
 	* @throws \Exception
 	*/
-	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue ) {
+	public function __construct($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
 		$this->login_credentials   = $login_credentials;
@@ -59,9 +59,9 @@ 
 		$this->schedule_name = 'salesforce_pull';
 
 		// Create action hooks for WordPress objects. We run this after plugins are loaded in case something depends on another plugin.
-		add_action( 'plugins_loaded', array( $this, 'add_actions' ) );
+		add_action('plugins_loaded', array($this, 'add_actions'));
 
-		$this->debug = get_option( 'object_sync_for_salesforce_debug_mode', false );
+		$this->debug = get_option('object_sync_for_salesforce_debug_mode', false);
 
 	}
 
@@ -72,11 +72,11 @@ 
 	public function add_actions() {
 
 		// ajax hook
-		add_action( 'wp_ajax_salesforce_pull_webhook', array( $this, 'salesforce_pull_webhook' ) );
+		add_action('wp_ajax_salesforce_pull_webhook', array($this, 'salesforce_pull_webhook'));
 
 		// action-scheduler needs two hooks: one to check for records, and one to process them
-		add_action( 'object_sync_for_salesforce_pull_check_records', array( $this, 'salesforce_pull' ), 10 );
-		add_action( 'object_sync_for_salesforce_pull_process_records', array( $this, 'salesforce_pull_process_records' ), 10, 4 );
+		add_action('object_sync_for_salesforce_pull_check_records', array($this, 'salesforce_pull'), 10);
+		add_action('object_sync_for_salesforce_pull_process_records', array($this, 'salesforce_pull_process_records'), 10, 4);
 	}
 
 	/**
@@ -87,12 +87,12 @@ 
 	*/
 	public function salesforce_pull_webhook() {
 
-		if ( true === $this->salesforce_pull() ) {
+		if (true === $this->salesforce_pull()) {
 			$code = '200';
 
 			// single task for action-scheduler to check for data
 			$this->queue->add(
-				$this->schedulable_classes[ $this->schedule_name ]['initializer'],
+				$this->schedulable_classes[$this->schedule_name]['initializer'],
 				array(),
 				$this->schedule_name
 			);
@@ -101,8 +101,8 @@ 
 			$code = '403';
 		}
 
-		if ( ! empty( $_POST ) ) { // linter flags this, but we're not doing anything with the array just checking to see if it is empty
-			wp_send_json_success( $code );
+		if ( ! empty($_POST)) { // linter flags this, but we're not doing anything with the array just checking to see if it is empty
+			wp_send_json_success($code);
 		} else {
 			return $code;
 		}
@@ -115,13 +115,13 @@ 
 	public function salesforce_pull() {
 		$sfapi = $this->salesforce['sfapi'];
 
-		if ( true === $this->salesforce['is_authorized'] && true === $this->check_throttle() ) {
+		if (true === $this->salesforce['is_authorized'] && true === $this->check_throttle()) {
 
 			$this->get_updated_records();
 			$this->get_deleted_records();
 
 			// Store this request time for the throttle check.
-			update_option( 'object_sync_for_salesforce_pull_last_sync', current_time( 'timestamp', true ) );
+			update_option('object_sync_for_salesforce_pull_last_sync', current_time('timestamp', true));
 			return true;
 
 		} else {
@@ -139,10 +139,10 @@ 
 	*    Returns false if the time elapsed between recent pulls is too short.
 	*/
 	private function check_throttle() {
-		$pull_throttle = get_option( 'object_sync_for_salesforce_pull_throttle', 5 );
-		$last_sync     = get_option( 'object_sync_for_salesforce_pull_last_sync', 0 );
+		$pull_throttle = get_option('object_sync_for_salesforce_pull_throttle', 5);
+		$last_sync     = get_option('object_sync_for_salesforce_pull_last_sync', 0);
 
-		if ( current_time( 'timestamp', true ) > ( $last_sync + $pull_throttle ) ) {
+		if (current_time('timestamp', true) > ($last_sync + $pull_throttle)) {
 			return true;
 		} else {
 			return false;
@@ -160,14 +160,14 @@ 
 	*/
 	private function get_updated_records() {
 		$sfapi = $this->salesforce['sfapi'];
-		foreach ( $this->mappings->get_fieldmaps() as $salesforce_mapping ) {
+		foreach ($this->mappings->get_fieldmaps() as $salesforce_mapping) {
 			$map_sync_triggers = $salesforce_mapping['sync_triggers']; // this sets which Salesforce triggers are allowed for the mapping
 			$type              = $salesforce_mapping['salesforce_object']; // this sets the salesfore object type for the SOQL query
 
-			$soql = $this->get_pull_query( $type, $salesforce_mapping );
+			$soql = $this->get_pull_query($type, $salesforce_mapping);
 
 			// get_pull_query returns null if it has no matching fields
-			if ( null === $soql ) {
+			if (null === $soql) {
 				continue;
 			}
 
@@ -182,17 +182,17 @@ 
 			);
 
 			$response     = $results['data'];
-			$version_path = wp_parse_url( $sfapi->get_api_endpoint(), PHP_URL_PATH );
+			$version_path = wp_parse_url($sfapi->get_api_endpoint(), PHP_URL_PATH);
 
-			$sf_last_sync = get_option( 'object_sync_for_salesforce_pull_last_sync_' . $type, null );
-			$last_sync    = gmdate( 'Y-m-d\TH:i:s\Z', $sf_last_sync );
+			$sf_last_sync = get_option('object_sync_for_salesforce_pull_last_sync_' . $type, null);
+			$last_sync    = gmdate('Y-m-d\TH:i:s\Z', $sf_last_sync);
 
-			if ( ! isset( $response['errorCode'] ) ) {
+			if ( ! isset($response['errorCode'])) {
 				// Write items to the queue.
-				foreach ( $response['records'] as $result ) {
+				foreach ($response['records'] as $result) {
 
 					// if this record is new as of the last sync, use the create trigger
-					if ( isset( $result['CreatedDate'] ) && $result['CreatedDate'] > $last_sync ) {
+					if (isset($result['CreatedDate']) && $result['CreatedDate'] > $last_sync) {
 						$sf_sync_trigger = $this->mappings->sync_sf_create;
 					} else {
 						$sf_sync_trigger = $this->mappings->sync_sf_update;
@@ -200,7 +200,7 @@ 
 
 					// Only queue when the record's trigger is configured for the mapping
 					// these are bit operators, so we leave out the strict
-					if ( isset( $map_sync_triggers ) && isset( $sf_sync_trigger ) && in_array( $sf_sync_trigger, $map_sync_triggers ) ) { // wp or sf crud event
+					if (isset($map_sync_triggers) && isset($sf_sync_trigger) && in_array($sf_sync_trigger, $map_sync_triggers)) { // wp or sf crud event
 						$data = array(
 							'object_type'     => $type,
 							'object'          => $result,
@@ -212,16 +212,16 @@ 
 						$pull_allowed = true;
 
 						// if the current fieldmap does not allow create, we need to check if there is a fieldmap for the Salesforce object Id. if not, set pull_allowed to false.
-						if ( isset( $map_sync_triggers ) && ! in_array( $this->mappings->sync_sf_create, $map_sync_triggers ) ) {
-							$object_map = $this->mappings->load_by_salesforce( $result['Id'] );
-							if ( empty( $object_map ) ) {
+						if (isset($map_sync_triggers) && ! in_array($this->mappings->sync_sf_create, $map_sync_triggers)) {
+							$object_map = $this->mappings->load_by_salesforce($result['Id']);
+							if (empty($object_map)) {
 								$pull_allowed = false;
 							}
 						}
 
 						// Hook to allow other plugins to prevent a pull per-mapping.
 						// Putting the pull_allowed hook here will keep the queue from storing data when it is not supposed to store it
-						$pull_allowed = apply_filters( 'object_sync_for_salesforce_pull_object_allowed', $pull_allowed, $type, $result, $sf_sync_trigger, $salesforce_mapping );
+						$pull_allowed = apply_filters('object_sync_for_salesforce_pull_object_allowed', $pull_allowed, $type, $result, $sf_sync_trigger, $salesforce_mapping);
 
 						// example to keep from pulling the Contact with id of abcdef
 						/*
@@ -234,35 +234,35 @@ 
 						}
 						*/
 
-						if ( false === $pull_allowed ) {
-							update_option( 'object_sync_for_salesforce_pull_last_sync_' . $type, current_time( 'timestamp', true ) );
+						if (false === $pull_allowed) {
+							update_option('object_sync_for_salesforce_pull_last_sync_' . $type, current_time('timestamp', true));
 							continue;
 						}
 
 						// add a queue action to save data from salesforce
 						$this->queue->add(
-							$this->schedulable_classes[ $this->schedule_name ]['callback'],
+							$this->schedulable_classes[$this->schedule_name]['callback'],
 							array(
 								'object_type'     => $type,
 								'object'          => $result['Id'],
-								'mapping'         => filter_var( $salesforce_mapping['id'], FILTER_VALIDATE_INT ),
+								'mapping'         => filter_var($salesforce_mapping['id'], FILTER_VALIDATE_INT),
 								'sf_sync_trigger' => $sf_sync_trigger,
 							),
 							$this->schedule_name
 						);
 
 						// Update the last pull sync timestamp for this record type to avoid re-processing in case of error
-						$last_sync_pull_trigger = DateTime::createFromFormat( 'Y-m-d\TH:i:s+', $result[ $salesforce_mapping['pull_trigger_field'] ], new DateTimeZone( 'UTC' ) );
-						update_option( 'object_sync_for_salesforce_pull_last_sync_' . $type, $last_sync_pull_trigger->format( 'U' ) );
+						$last_sync_pull_trigger = DateTime::createFromFormat('Y-m-d\TH:i:s+', $result[$salesforce_mapping['pull_trigger_field']], new DateTimeZone('UTC'));
+						update_option('object_sync_for_salesforce_pull_last_sync_' . $type, $last_sync_pull_trigger->format('U'));
 					}
 				}
 
 				// Handle requests larger than the batch limit (usually 2000).
-				$next_records_url = isset( $response['nextRecordsUrl'] ) ? str_replace( $version_path, '', $response['nextRecordsUrl'] ) : false;
+				$next_records_url = isset($response['nextRecordsUrl']) ? str_replace($version_path, '', $response['nextRecordsUrl']) : false;
 
-				while ( $next_records_url ) {
+				while ($next_records_url) {
 					// shouldn't cache this either. it's going into the queue if it exists anyway.
-					$new_results  = $sfapi->api_call(
+					$new_results = $sfapi->api_call(
 						$next_records_url,
 						array(),
 						'GET',
@@ -271,11 +271,11 @@ 
 						)
 					);
 					$new_response = $new_results['data'];
-					if ( ! isset( $new_response['errorCode'] ) ) {
+					if ( ! isset($new_response['errorCode'])) {
 						// Write items to the queue.
-						foreach ( $new_response['records'] as $result ) {
+						foreach ($new_response['records'] as $result) {
 							// if this record is new as of the last sync, use the create trigger
-							if ( isset( $result['CreatedDate'] ) && $result['CreatedDate'] > $last_sync ) {
+							if (isset($result['CreatedDate']) && $result['CreatedDate'] > $last_sync) {
 								$sf_sync_trigger = $this->mappings->sync_sf_create;
 							} else {
 								$sf_sync_trigger = $this->mappings->sync_sf_update;
@@ -283,7 +283,7 @@ 
 
 							// Only queue when the record's trigger is configured for the mapping
 							// these are bit operators, so we leave out the strict
-							if ( isset( $map_sync_triggers ) && isset( $sf_sync_trigger ) && in_array( $sf_sync_trigger, $map_sync_triggers ) ) { // wp or sf crud event
+							if (isset($map_sync_triggers) && isset($sf_sync_trigger) && in_array($sf_sync_trigger, $map_sync_triggers)) { // wp or sf crud event
 								$data = array(
 									'object_type'     => $type,
 									'object'          => $result,
@@ -293,39 +293,39 @@ 
 
 								// add a queue action to save data from salesforce
 								$this->queue->add(
-									$this->schedulable_classes[ $this->schedule_name ]['callback'],
+									$this->schedulable_classes[$this->schedule_name]['callback'],
 									array(
 										'object_type'     => $type,
 										'object'          => $result['Id'],
-										'mapping'         => filter_var( $salesforce_mapping['id'], FILTER_VALIDATE_INT ),
+										'mapping'         => filter_var($salesforce_mapping['id'], FILTER_VALIDATE_INT),
 										'sf_sync_trigger' => $sf_sync_trigger,
 									),
 									$this->schedule_name
 								);
 
 								// Update the last pull sync timestamp for this record type to avoid re-processing in case of error
-								$last_sync_pull_trigger = DateTime::createFromFormat( 'Y-m-d\TH:i:s+', $result[ $salesforce_mapping['pull_trigger_field'] ], new DateTimeZone( 'UTC' ) );
-								update_option( 'object_sync_for_salesforce_pull_last_sync_' . $type, $last_sync_pull_trigger->format( 'U' ) );
+								$last_sync_pull_trigger = DateTime::createFromFormat('Y-m-d\TH:i:s+', $result[$salesforce_mapping['pull_trigger_field']], new DateTimeZone('UTC'));
+								update_option('object_sync_for_salesforce_pull_last_sync_' . $type, $last_sync_pull_trigger->format('U'));
 							}
 						}
 					}
 
-					$next_records_url = isset( $new_response['nextRecordsUrl'] ) ? str_replace( $version_path, '', $new_response['nextRecordsUrl'] ) : false;
+					$next_records_url = isset($new_response['nextRecordsUrl']) ? str_replace($version_path, '', $new_response['nextRecordsUrl']) : false;
 				}
 			} else {
 
 				// create log entry for failed pull
 				$status = 'error';
 				// translators: placeholders are: 1) the server error code, and 2) the name of the Salesforce object
-				$title = sprintf( esc_html__( 'Error: %1$s %2$s', 'object-sync-for-salesforce' ),
-					absint( $response['errorCode'] ),
-					esc_attr( $salesforce_mapping['salesforce_object'] )
+				$title = sprintf(esc_html__('Error: %1$s %2$s', 'object-sync-for-salesforce'),
+					absint($response['errorCode']),
+					esc_attr($salesforce_mapping['salesforce_object'])
 				);
 
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				$logging->setup(
@@ -353,7 +353,7 @@ 
 	* @see Object_Sync_Sf_Mapping::get_mapped_fields
 	* @see Object_Sync_Sf_Mapping::get_mapped_record_types
 	*/
-	private function get_pull_query( $type, $salesforce_mapping = array() ) {
+	private function get_pull_query($type, $salesforce_mapping = array()) {
 		$mapped_fields       = array();
 		$mapped_record_types = array();
 
@@ -365,35 +365,35 @@ 
 		);
 
 		// Iterate over each field mapping to determine our query parameters.
-		foreach ( $mappings as $mapping ) {
+		foreach ($mappings as $mapping) {
 
 			// only use fields that come from Salesforce to WordPress, or that sync
 			$mapped_fields = array_merge(
 				$mapped_fields,
 				$this->mappings->get_mapped_fields(
 					$mapping,
-					array( $this->mappings->direction_sync, $this->mappings->direction_sf_wordpress )
+					array($this->mappings->direction_sync, $this->mappings->direction_sf_wordpress)
 				)
 			);
 
 			// If Record Type is specified, restrict query.
-			$mapping_record_types = $this->mappings->get_mapped_record_types( $mapping );
+			$mapping_record_types = $this->mappings->get_mapped_record_types($mapping);
 
 			// If Record Type is not specified for a given mapping, ensure query is unrestricted.
-			if ( empty( $mapping_record_types ) ) {
+			if (empty($mapping_record_types)) {
 				$mapped_record_types = false;
-			} elseif ( is_array( $mapped_record_types ) ) {
-				$mapped_record_types = array_merge( $mapped_record_types, $mapping_record_types );
+			} elseif (is_array($mapped_record_types)) {
+				$mapped_record_types = array_merge($mapped_record_types, $mapping_record_types);
 			}
 		} // End foreach().
 
 		// There are no field mappings configured to pull data from Salesforce so
 		// move on to the next mapped object. Prevents querying unmapped data.
-		if ( empty( $mapped_fields ) ) {
+		if (empty($mapped_fields)) {
 			return null;
 		}
 
-		$soql = new Object_Sync_Sf_Salesforce_Select_Query( $type );
+		$soql = new Object_Sync_Sf_Salesforce_Select_Query($type);
 
 		// Convert field mappings to SOQL.
 		$soql->fields = array_merge(
@@ -405,7 +405,7 @@ 
 		);
 
 		// these are bit operators, so we leave out the strict
-		if ( in_array( $this->mappings->sync_sf_create, $salesforce_mapping['sync_triggers'] ) ) {
+		if (in_array($this->mappings->sync_sf_create, $salesforce_mapping['sync_triggers'])) {
 			$soql->fields['CreatedDate'] = 'CreatedDate';
 		}
 
@@ -413,14 +413,14 @@ 
 		// this should be what keeps it from getting all the records, whether or not they've ever been updated
 		// we also use the option for when the plugin was installed, and don't go back further than that by default
 
-		$sf_activate_time = get_option( 'object_sync_for_salesforce_activate_time', '' );
-		$sf_last_sync     = get_option( 'object_sync_for_salesforce_pull_last_sync_' . $type, null );
-		if ( $sf_last_sync ) {
-			$last_sync = gmdate( 'Y-m-d\TH:i:s\Z', $sf_last_sync );
-			$soql->add_condition( $salesforce_mapping['pull_trigger_field'], $last_sync, '>' );
+		$sf_activate_time = get_option('object_sync_for_salesforce_activate_time', '');
+		$sf_last_sync     = get_option('object_sync_for_salesforce_pull_last_sync_' . $type, null);
+		if ($sf_last_sync) {
+			$last_sync = gmdate('Y-m-d\TH:i:s\Z', $sf_last_sync);
+			$soql->add_condition($salesforce_mapping['pull_trigger_field'], $last_sync, '>');
 		} else {
-			$activated = gmdate( 'Y-m-d\TH:i:s\Z', $sf_activate_time );
-			$soql->add_condition( $salesforce_mapping['pull_trigger_field'], $activated, '>' );
+			$activated = gmdate('Y-m-d\TH:i:s\Z', $sf_activate_time);
+			$soql->add_condition($salesforce_mapping['pull_trigger_field'], $activated, '>');
 			// put a hook in here to let devs go retroactive if they want, and sync data from before plugin was activated
 		}
 
@@ -446,7 +446,7 @@ 
 		// we are not incorporating that part of this branch at this time
 
 		// Load all unique SF record types that we have mappings for.
-		foreach ( $this->mappings->get_fieldmaps() as $salesforce_mapping ) {
+		foreach ($this->mappings->get_fieldmaps() as $salesforce_mapping) {
 
 			$type = $salesforce_mapping['salesforce_object'];
 
@@ -458,37 +458,37 @@ 
 			);
 
 			// Iterate over each field mapping to determine our query parameters.
-			foreach ( $mappings as $mapping ) {
+			foreach ($mappings as $mapping) {
 
-				$last_delete_sync = get_option( 'object_sync_for_salesforce_pull_delete_last_' . $type, current_time( 'timestamp', true ) );
-				$now              = current_time( 'timestamp', true );
-				update_option( 'object_sync_for_salesforce_pull_delete_last_' . $type, $now );
+				$last_delete_sync = get_option('object_sync_for_salesforce_pull_delete_last_' . $type, current_time('timestamp', true));
+				$now              = current_time('timestamp', true);
+				update_option('object_sync_for_salesforce_pull_delete_last_' . $type, $now);
 
 				// get_deleted() constraint: startDate cannot be more than 30 days ago
 				// (using an incompatible date may lead to exceptions).
-				$last_delete_sync = $last_delete_sync > ( current_time( 'timestamp', true ) - 2505600 ) ? $last_delete_sync : ( current_time( 'timestamp', true ) - 2505600 );
+				$last_delete_sync = $last_delete_sync > (current_time('timestamp', true) - 2505600) ? $last_delete_sync : (current_time('timestamp', true) - 2505600);
 
 				// get_deleted() constraint: startDate must be at least one minute greater
 				// than endDate.
-				$now = $now > ( $last_delete_sync + 60 ) ? $now : $now + 60;
+				$now = $now > ($last_delete_sync + 60) ? $now : $now + 60;
 
 				// need to be using gmdate for salesforce call
-				$last_delete_sync_sf = gmdate( 'Y-m-d\TH:i:s\Z', $last_delete_sync );
-				$now_sf              = gmdate( 'Y-m-d\TH:i:s\Z', $now );
+				$last_delete_sync_sf = gmdate('Y-m-d\TH:i:s\Z', $last_delete_sync);
+				$now_sf              = gmdate('Y-m-d\TH:i:s\Z', $now);
 
 				// salesforce call
-				$deleted = $sfapi->get_deleted( $type, $last_delete_sync_sf, $now_sf );
+				$deleted = $sfapi->get_deleted($type, $last_delete_sync_sf, $now_sf);
 
-				if ( empty( $deleted['data']['deletedRecords'] ) ) {
+				if (empty($deleted['data']['deletedRecords'])) {
 					continue;
 				}
 
-				foreach ( $deleted['data']['deletedRecords'] as $result ) {
+				foreach ($deleted['data']['deletedRecords'] as $result) {
 
 					$sf_sync_trigger = $this->mappings->sync_sf_delete;
 
 					// salesforce seriously returns Id for update requests and id for delete requests and this makes no sense but maybe one day they might change it somehow?
-					if ( ! isset( $result['Id'] ) && isset( $result['id'] ) ) {
+					if ( ! isset($result['Id']) && isset($result['id'])) {
 						$result['Id'] = $result['id'];
 					}
 					$data = array(
@@ -500,7 +500,7 @@ 
 
 					// Hook to allow other plugins to prevent a pull per-mapping.
 					// Putting the pull_allowed hook here will keep the queue from storing data when it is not supposed to store it
-					$pull_allowed = apply_filters( 'object_sync_for_salesforce_pull_object_allowed', true, $type, $result, $sf_sync_trigger, $salesforce_mapping );
+					$pull_allowed = apply_filters('object_sync_for_salesforce_pull_object_allowed', true, $type, $result, $sf_sync_trigger, $salesforce_mapping);
 
 					// example to keep from pulling the Contact with id of abcdef
 					/*
@@ -513,17 +513,17 @@ 
 					}
 					*/
 
-					if ( false === $pull_allowed ) {
+					if (false === $pull_allowed) {
 						continue;
 					}
 
 					// add a queue action to save data from salesforce
 					$this->queue->add(
-						$this->schedulable_classes[ $this->schedule_name ]['callback'],
+						$this->schedulable_classes[$this->schedule_name]['callback'],
 						array(
 							'object_type'     => $type,
 							'object'          => $result['Id'],
-							'mapping'         => filter_var( $salesforce_mapping['id'], FILTER_VALIDATE_INT ),
+							'mapping'         => filter_var($salesforce_mapping['id'], FILTER_VALIDATE_INT),
 							'sf_sync_trigger' => $sf_sync_trigger,
 						),
 						$this->schedule_name
@@ -531,7 +531,7 @@ 
 
 				}
 
-				update_option( 'object_sync_for_salesforce_pull_delete_last_' . $type, current_time( 'timestamp', true ) );
+				update_option('object_sync_for_salesforce_pull_delete_last_' . $type, current_time('timestamp', true));
 
 			} // End foreach().
 		} // End foreach().
@@ -545,9 +545,9 @@ 
 	* @param string $wordpress_object
 	*
 	*/
-	public function manual_pull( $object_type, $salesforce_id, $wordpress_object ) {
+	public function manual_pull($object_type, $salesforce_id, $wordpress_object) {
 		$sfapi   = $this->salesforce['sfapi'];
-		$object  = $sfapi->api_call( 'sobjects/' . $object_type . '/' . $salesforce_id );
+		$object  = $sfapi->api_call('sobjects/' . $object_type . '/' . $salesforce_id);
 		$mapping = $this->mappings->get_fieldmaps(
 			null,
 			array(
@@ -555,7 +555,7 @@ 
 				'wordpress_object'  => $wordpress_object,
 			)
 		);
-		$this->salesforce_pull_process_records( $object_type, $object['data'], $mapping[0], $this->mappings->sync_sf_update );
+		$this->salesforce_pull_process_records($object_type, $object['data'], $mapping[0], $this->mappings->sync_sf_update);
 	}
 
 	/**
@@ -573,59 +573,59 @@ 
 	* @return true or exit the method
 	*
 	*/
-	public function salesforce_pull_process_records( $object_type, $object, $mapping, $sf_sync_trigger ) {
+	public function salesforce_pull_process_records($object_type, $object, $mapping, $sf_sync_trigger) {
 
 		$sfapi = $this->salesforce['sfapi'];
 
-		if ( is_string( $object ) ) {
+		if (is_string($object)) {
 			$object_id = $object;
-			$object    = $sfapi->object_read( $object_type, $object_id )['data'];
+			$object    = $sfapi->object_read($object_type, $object_id)['data'];
 		}
 
-		if ( is_int( $mapping ) ) {
+		if (is_int($mapping)) {
 			$mapping_id = $mapping;
-			$mapping    = $this->mappings->get_fieldmaps( $mapping_id );
+			$mapping    = $this->mappings->get_fieldmaps($mapping_id);
 		}
 
 		$mapping_conditions = array(
 			'salesforce_object' => $object_type,
 		);
 
-		if ( isset( $object['RecordTypeId'] ) && $object['RecordTypeId'] !== $this->mappings->salesforce_default_record_type ) {
+		if (isset($object['RecordTypeId']) && $object['RecordTypeId'] !== $this->mappings->salesforce_default_record_type) {
 			// use this condition to filter the mappings, at that time
 			$mapping_conditions['salesforce_record_type'] = $object['RecordTypeId'];
 		}
 
-		$salesforce_mappings = $this->mappings->get_fieldmaps( null, $mapping_conditions );
+		$salesforce_mappings = $this->mappings->get_fieldmaps(null, $mapping_conditions);
 
 		// from drupal: if there is more than one mapping, don't throw exceptions
-		$hold_exceptions = count( $salesforce_mappings ) > 1;
+		$hold_exceptions = count($salesforce_mappings) > 1;
 		$exception       = false;
 
 		$frequencies = $this->queue->get_frequencies();
-		$seconds     = reset( $frequencies )['frequency'] + 60;
+		$seconds     = reset($frequencies)['frequency'] + 60;
 
 		$transients_to_delete = array();
 
-		foreach ( $salesforce_mappings as $salesforce_mapping ) {
+		foreach ($salesforce_mappings as $salesforce_mapping) {
 
 			// this returns the row that maps the individual Salesforce row to the individual WordPress row
-			if ( isset( $object['Id'] ) ) {
-				$mapping_object = $this->mappings->load_by_salesforce( $object['Id'] );
+			if (isset($object['Id'])) {
+				$mapping_object = $this->mappings->load_by_salesforce($object['Id']);
 			} else {
 				// if we don't have a Salesforce object id, we've got no business doing stuff in WordPress
 				$status = 'error';
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
-				$title = sprintf( esc_html__( 'Error: Salesforce Pull: unable to process queue item because it has no Salesforce Id.', 'object-sync-for-salesforce' ) );
+				$title = sprintf(esc_html__('Error: Salesforce Pull: unable to process queue item because it has no Salesforce Id.', 'object-sync-for-salesforce'));
 
 				$logging->setup(
 					$title,
-					print_r( $object, true ), // log whatever we have in the event of this error, so print the array
+					print_r($object, true), // log whatever we have in the event of this error, so print the array
 					$sf_sync_trigger,
 					0, // parent id goes here but we don't have one, so make it 0
 					$status
@@ -637,7 +637,7 @@ 
 			// if it's not already connected (ie on create), the array will be empty
 
 			// hook to allow other plugins to define or alter the mapping object
-			$mapping_object = apply_filters( 'object_sync_for_salesforce_pull_mapping_object', $mapping_object, $object, $mapping );
+			$mapping_object = apply_filters('object_sync_for_salesforce_pull_mapping_object', $mapping_object, $object, $mapping);
 
 			// we already have the data from Salesforce at this point; we just need to work with it in WordPress
 			$synced_object = array(
@@ -646,58 +646,58 @@ 
 				'mapping'           => $mapping,
 			);
 
-			$structure = $this->wordpress->get_wordpress_table_structure( $salesforce_mapping['wordpress_object'] );
+			$structure = $this->wordpress->get_wordpress_table_structure($salesforce_mapping['wordpress_object']);
 			$object_id = $structure['id_field'];
 
 			$op = '';
 
 			// are these objects already connected in WordPress?
-			if ( isset( $mapping_object['id'] ) ) {
+			if (isset($mapping_object['id'])) {
 				$is_new                      = false;
 				$mapping_object_id_transient = $mapping_object['id'];
 			} else {
 				// there is not a mapping object for this WordPress object id yet
 				// check for that transient with the currently pushing id
 				$is_new                      = true;
-				$mapping_object_id_transient = get_transient( 'salesforce_pushing_object_id' );
+				$mapping_object_id_transient = get_transient('salesforce_pushing_object_id');
 			}
 
 			// Drupal only does a salesforce_pull flag, but we might as well do push and pull because WordPress
-			$salesforce_pushing = (int) get_transient( 'salesforce_pushing_' . $mapping_object_id_transient );
-			if ( 1 === $salesforce_pushing ) {
+			$salesforce_pushing = (int) get_transient('salesforce_pushing_' . $mapping_object_id_transient);
+			if (1 === $salesforce_pushing) {
 				$transients_to_delete[] = $mapping_object_id_transient;
 				continue;
 			}
 
 			// deleting mapped objects
-			if ( $sf_sync_trigger == $this->mappings->sync_sf_delete ) { // trigger is a bit operator
-				if ( isset( $mapping_object['id'] ) ) {
+			if ($sf_sync_trigger == $this->mappings->sync_sf_delete) { // trigger is a bit operator
+				if (isset($mapping_object['id'])) {
 
-					set_transient( 'salesforce_pulling_' . $mapping_object['id'], 1, $seconds );
-					set_transient( 'salesforce_pulling_object_id', $mapping_object['id'] );
+					set_transient('salesforce_pulling_' . $mapping_object['id'], 1, $seconds);
+					set_transient('salesforce_pulling_object_id', $mapping_object['id']);
 
 					$op              = 'Delete';
-					$wordpress_check = $this->mappings->load_by_wordpress( $mapping_object['wordpress_object'], $mapping_object['wordpress_id'] );
-					if ( count( $wordpress_check ) === count( $wordpress_check, COUNT_RECURSIVE ) ) {
+					$wordpress_check = $this->mappings->load_by_wordpress($mapping_object['wordpress_object'], $mapping_object['wordpress_id']);
+					if (count($wordpress_check) === count($wordpress_check, COUNT_RECURSIVE)) {
 						try {
-							$result = $this->wordpress->object_delete( $salesforce_mapping['wordpress_object'], $mapping_object['wordpress_id'] );
-						} catch ( WordpressException $e ) {
+							$result = $this->wordpress->object_delete($salesforce_mapping['wordpress_object'], $mapping_object['wordpress_id']);
+						} catch (WordpressException $e) {
 							$status = 'error';
 							// create log entry for failed delete
-							if ( isset( $this->logging ) ) {
+							if (isset($this->logging)) {
 								$logging = $this->logging;
-							} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-								$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+							} elseif (class_exists('Object_Sync_Sf_Logging')) {
+								$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 							}
 
 							// translators: placeholders are: 1) what operation is happening, 2) the name of the WordPress object type, 3) the WordPress id field name, 4) the WordPress object id value, 5) the name of the Salesforce object, 6) the Salesforce Id value
-							$title = sprintf( esc_html__( 'Error: %1$s WordPress %2$s with %3$s of %4$s (%5$s %6$s)', 'object-sync-for-salesforce' ),
-								esc_attr( $op ),
-								esc_attr( $salesforce_mapping['wordpress_object'] ),
-								esc_attr( $object_id ),
-								esc_attr( $mapping_object['wordpress_id'] ),
-								esc_attr( $salesforce_mapping['salesforce_object'] ),
-								esc_attr( $mapping_object['salesforce_id'] )
+							$title = sprintf(esc_html__('Error: %1$s WordPress %2$s with %3$s of %4$s (%5$s %6$s)', 'object-sync-for-salesforce'),
+								esc_attr($op),
+								esc_attr($salesforce_mapping['wordpress_object']),
+								esc_attr($object_id),
+								esc_attr($mapping_object['wordpress_id']),
+								esc_attr($salesforce_mapping['salesforce_object']),
+								esc_attr($mapping_object['salesforce_id'])
 							);
 
 							$logging->setup(
@@ -708,38 +708,38 @@ 
 								$status
 							);
 
-							if ( false === $hold_exceptions ) {
+							if (false === $hold_exceptions) {
 								throw $e;
 							}
-							if ( empty( $exception ) ) {
+							if (empty($exception)) {
 								$exception = $e;
 							} else {
-								$my_class  = get_class( $e );
-								$exception = new $my_class( $e->getMessage(), $e->getCode(), $exception );
+								$my_class  = get_class($e);
+								$exception = new $my_class($e->getMessage(), $e->getCode(), $exception);
 							}
 
 							// hook for pull fail
-							do_action( 'object_sync_for_salesforce_pull_fail', $op, $result, $synced_object );
+							do_action('object_sync_for_salesforce_pull_fail', $op, $result, $synced_object);
 
 						} // End try().
 
-						if ( ! isset( $e ) ) {
+						if ( ! isset($e)) {
 							// create log entry for successful delete if the result had no errors
 							$status = 'success';
-							if ( isset( $this->logging ) ) {
+							if (isset($this->logging)) {
 								$logging = $this->logging;
-							} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-								$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+							} elseif (class_exists('Object_Sync_Sf_Logging')) {
+								$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 							}
 
 							// translators: placeholders are: 1) what operation is happening, 2) the name of the WordPress object type, 3) the WordPress id field name, 4) the WordPress object id value, 5) the name of the Salesforce object, 6) the Salesforce Id value
-							$title = sprintf( esc_html__( 'Success: %1$s WordPress %2$s with %3$s of %4$s (%5$s %6$s)', 'object-sync-for-salesforce' ),
-								esc_attr( $op ),
-								esc_attr( $salesforce_mapping['wordpress_object'] ),
-								esc_attr( $object_id ),
-								esc_attr( $mapping_object['wordpress_id'] ),
-								esc_attr( $salesforce_mapping['salesforce_object'] ),
-								esc_attr( $mapping_object['salesforce_id'] )
+							$title = sprintf(esc_html__('Success: %1$s WordPress %2$s with %3$s of %4$s (%5$s %6$s)', 'object-sync-for-salesforce'),
+								esc_attr($op),
+								esc_attr($salesforce_mapping['wordpress_object']),
+								esc_attr($object_id),
+								esc_attr($mapping_object['wordpress_id']),
+								esc_attr($salesforce_mapping['salesforce_object']),
+								esc_attr($mapping_object['salesforce_id'])
 							);
 
 							$logging->setup(
@@ -751,38 +751,38 @@ 
 							);
 
 							// hook for pull success
-							do_action( 'object_sync_for_salesforce_pull_success', $op, $result, $synced_object );
+							do_action('object_sync_for_salesforce_pull_success', $op, $result, $synced_object);
 						}
 					} else {
-						$more_ids = sprintf( '<p>' . esc_html__( 'The WordPress record was not deleted because there are multiple Salesforce IDs that match this WordPress ID. They are:', 'object-sync-for-salesforce' ) );
+						$more_ids = sprintf('<p>' . esc_html__('The WordPress record was not deleted because there are multiple Salesforce IDs that match this WordPress ID. They are:', 'object-sync-for-salesforce'));
 						$i        = 0;
-						foreach ( $wordpress_check as $match ) {
+						foreach ($wordpress_check as $match) {
 							$i++;
-							$more_ids .= sprintf( $match['salesforce_id'] );
-							if ( count( $wordpress_check ) !== $i ) {
-								$more_ids .= sprintf( ', ' );
+							$more_ids .= sprintf($match['salesforce_id']);
+							if (count($wordpress_check) !== $i) {
+								$more_ids .= sprintf(', ');
 							} else {
-								$more_ids .= sprintf( '.</p>' );
+								$more_ids .= sprintf('.</p>');
 							}
 						}
 
-						$more_ids .= sprintf( '<p>' . esc_html__( 'The map row between this Salesforce object and the WordPress object, as stored in the WordPress database, will be deleted, and this Salesforce object has been deleted, but the WordPress object row will remain untouched.', 'object-sync-for-salesforce' ) . '</p>' );
+						$more_ids .= sprintf('<p>' . esc_html__('The map row between this Salesforce object and the WordPress object, as stored in the WordPress database, will be deleted, and this Salesforce object has been deleted, but the WordPress object row will remain untouched.', 'object-sync-for-salesforce') . '</p>');
 
 						$status = 'notice';
-						if ( isset( $this->logging ) ) {
+						if (isset($this->logging)) {
 							$logging = $this->logging;
-						} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-							$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+						} elseif (class_exists('Object_Sync_Sf_Logging')) {
+							$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 						}
 
 						// translators: placeholders are: 1) what operation is happening, 2) the name of the WordPress object type, 3) the WordPress id field name, 4) the WordPress object id value, 5) the name of the Salesforce object, 6) the Salesforce Id value
-						$title = sprintf( esc_html__( 'Notice: %1$s %2$s with %3$s of %4$s (%5$s %6$s) did not delete the WordPress item.', 'object-sync-for-salesforce' ),
-							esc_attr( $op ),
-							esc_attr( $salesforce_mapping['wordpress_object'] ),
-							esc_attr( $object_id ),
-							esc_attr( $mapping_object['wordpress_id'] ),
-							esc_attr( $salesforce_mapping['salesforce_object'] ),
-							esc_attr( $mapping_object['salesforce_id'] )
+						$title = sprintf(esc_html__('Notice: %1$s %2$s with %3$s of %4$s (%5$s %6$s) did not delete the WordPress item.', 'object-sync-for-salesforce'),
+							esc_attr($op),
+							esc_attr($salesforce_mapping['wordpress_object']),
+							esc_attr($object_id),
+							esc_attr($mapping_object['wordpress_id']),
+							esc_attr($salesforce_mapping['salesforce_object']),
+							esc_attr($mapping_object['salesforce_id'])
 						);
 
 						$logging->setup(
@@ -796,27 +796,27 @@ 
 
 					// delete the map row from WordPress after the WordPress row has been deleted
 					// we delete the map row even if the WordPress delete failed, because the Salesforce object is gone
-					$this->mappings->delete_object_map( $mapping_object['id'] );
+					$this->mappings->delete_object_map($mapping_object['id']);
 					// there is no map row if we end this if statement
 				} // End if().
 				return;
 			} // End if().
 
 			// map the Salesforce values to WordPress fields
-			$params = $this->mappings->map_params( $mapping, $object, $sf_sync_trigger, false, $is_new );
+			$params = $this->mappings->map_params($mapping, $object, $sf_sync_trigger, false, $is_new);
 
 			// hook to allow other plugins to modify the $params array
 			// use hook to map fields between the WordPress and Salesforce objects
 			// returns $params.
-			$params = apply_filters( 'object_sync_for_salesforce_pull_params_modify', $params, $mapping, $object, $sf_sync_trigger, false, $is_new );
+			$params = apply_filters('object_sync_for_salesforce_pull_params_modify', $params, $mapping, $object, $sf_sync_trigger, false, $is_new);
 
 			// if we don't get any params, there are no fields that should be sent to WordPress
-			if ( empty( $params ) ) {
+			if (empty($params)) {
 				return;
 			}
 
 			// if there is a prematch WordPress field - ie email - on the fieldmap object
-			if ( isset( $params['prematch'] ) && is_array( $params['prematch'] ) ) {
+			if (isset($params['prematch']) && is_array($params['prematch'])) {
 				$prematch_field_wordpress  = $params['prematch']['wordpress_field'];
 				$prematch_field_salesforce = $params['prematch']['salesforce_field'];
 				$prematch_value            = $params['prematch']['value'];
@@ -826,22 +826,22 @@ 
 					'method_update' => $params['prematch']['method_update'],
 					'method_read'   => $params['prematch']['method_read'],
 				);
-				unset( $params['prematch'] );
+				unset($params['prematch']);
 			}
 
 			// if there is an external key field in Salesforce - ie a Mailchimp user id - on the fieldmap object, this should not affect how WordPress handles it so we have removed it from the pull parameters.
 
 			// methods to run the wp create or update operations
 
-			if ( true === $is_new ) {
+			if (true === $is_new) {
 
 				// setup SF record type. CampaignMember objects get their Campaign's type
 				// i am still a bit confused about this
 				// we should store this as a meta field on each object, if it meets these criteria
 				// we need to store the read/modify attributes because the field doesn't exist in the mapping
-				if ( $salesforce_mapping['salesforce_record_type_default'] !== $this->mappings->salesforce_default_record_type && empty( $params['RecordTypeId'] ) && ( 'CampaignMember' !== $salesforce_mapping['salesforce_object'] ) ) {
+				if ($salesforce_mapping['salesforce_record_type_default'] !== $this->mappings->salesforce_default_record_type && empty($params['RecordTypeId']) && ('CampaignMember' !== $salesforce_mapping['salesforce_object'])) {
 					$type = $salesforce_mapping['wordpress_object'];
-					if ( 'category' === $salesforce_mapping['wordpress_object'] || 'tag' === $salesforce_mapping['wordpress_object'] || 'post_tag' === $salesforce_mapping['wordpress_object'] ) {
+					if ('category' === $salesforce_mapping['wordpress_object'] || 'tag' === $salesforce_mapping['wordpress_object'] || 'post_tag' === $salesforce_mapping['wordpress_object']) {
 						$type = 'term';
 					}
 					$params['RecordTypeId'] = array(
@@ -859,24 +859,24 @@ 
 					// returns a $salesforce_id.
 					// it should keep NULL if there is no match
 					// the function that calls this hook needs to check the mapping to make sure the WordPress object is the right type
-					$wordpress_id = apply_filters( 'object_sync_for_salesforce_find_wp_object_match', null, $object, $mapping, 'pull' );
+					$wordpress_id = apply_filters('object_sync_for_salesforce_find_wp_object_match', null, $object, $mapping, 'pull');
 
 					// hook to allow other plugins to do something right before WordPress data is saved
 					// ex: run outside methods on an object if it exists, or do something in preparation for it if it doesn't
-					do_action( 'object_sync_for_salesforce_pre_pull', $wordpress_id, $mapping, $object, $object_id, $params );
+					do_action('object_sync_for_salesforce_pre_pull', $wordpress_id, $mapping, $object, $object_id, $params);
 
-					if ( isset( $prematch_field_salesforce ) || null !== $wordpress_id ) {
+					if (isset($prematch_field_salesforce) || null !== $wordpress_id) {
 
 						$op = 'Upsert';
 
 						// if either prematch criteria exists, make the values queryable
-						if ( isset( $prematch_field_salesforce ) ) {
+						if (isset($prematch_field_salesforce)) {
 							$upsert_key     = $prematch_field_wordpress;
 							$upsert_value   = $prematch_value;
 							$upsert_methods = $prematch_methods;
 						}
 
-						if ( null !== $wordpress_id ) {
+						if (null !== $wordpress_id) {
 							$upsert_key     = $object_id;
 							$upsert_value   = $wordpress_id;
 							$upsert_methods = array();
@@ -885,13 +885,13 @@ 
 						// with the flag at the end, upsert returns a $wordpress_id only
 						// we can then check to see if it has a mapping object
 						// we should only do this if the above hook didn't already set the $wordpress_id
-						if ( null === $wordpress_id ) {
-							$wordpress_id = $this->wordpress->object_upsert( $salesforce_mapping['wordpress_object'], $upsert_key, $upsert_value, $upsert_methods, $params, $salesforce_mapping['push_drafts'], true );
+						if (null === $wordpress_id) {
+							$wordpress_id = $this->wordpress->object_upsert($salesforce_mapping['wordpress_object'], $upsert_key, $upsert_value, $upsert_methods, $params, $salesforce_mapping['push_drafts'], true);
 						}
 
 						// find out if there is a mapping object for this WordPress object already
 						// don't do it if the WordPress id is 0.
-						if ( 0 !== $wordpress_id ) {
+						if (0 !== $wordpress_id) {
 							$mapping_object = $this->mappings->get_object_maps(
 								array(
 									'wordpress_id'     => $wordpress_id,
@@ -906,35 +906,35 @@ 
 								)
 							);
 
-							if ( array() !== $mapping_object_debug ) {
+							if (array() !== $mapping_object_debug) {
 								// create log entry to warn about at least one id of 0
 								$status = 'error';
-								$title  = sprintf( esc_html__( 'Error: There is at least one object map with a WordPress ID of 0.', 'object-sync-for-salesforce' ) );
+								$title  = sprintf(esc_html__('Error: There is at least one object map with a WordPress ID of 0.', 'object-sync-for-salesforce'));
 
-								if ( 1 === count( $mapping_object_debug ) ) {
+								if (1 === count($mapping_object_debug)) {
 									// translators: placeholders are: 1) the mapping object row ID, 2) the name of the WordPress object, 3) the ID of the Salesforce object it was trying to map
-									$body = sprintf( esc_html__( 'There is an object map with ID of %1$s and it is mapped to the WordPress %2$s with ID of 0 and the Salesforce object with ID of %3$s', 'object-sync-for-salesforce' ),
-										absint( $mapping_object_debug['id'] ),
-										esc_attr( $salesforce_mapping['wordpress_object'] ),
-										esc_attr( $mapping_object_debug['salesforce_id'] )
+									$body = sprintf(esc_html__('There is an object map with ID of %1$s and it is mapped to the WordPress %2$s with ID of 0 and the Salesforce object with ID of %3$s', 'object-sync-for-salesforce'),
+										absint($mapping_object_debug['id']),
+										esc_attr($salesforce_mapping['wordpress_object']),
+										esc_attr($mapping_object_debug['salesforce_id'])
 									);
 								} else {
-									$body = sprintf( esc_html__( 'There are multiple object maps with WordPress ID of 0. Their IDs are: ', 'object-sync-for-salesforce' ) . '<ul>' );
-									foreach ( $mapping_object_debug as $mapping_object ) {
+									$body = sprintf(esc_html__('There are multiple object maps with WordPress ID of 0. Their IDs are: ', 'object-sync-for-salesforce') . '<ul>');
+									foreach ($mapping_object_debug as $mapping_object) {
 										// translators: placeholders are: 1) the mapping object row ID, 2) the ID of the Salesforce object, 3) the WordPress object type
-										$body .= sprintf( '<li>' . esc_html__( 'Mapping object id: %1$s. Salesforce Id: %2$s. WordPress object type: %3$s', 'object-sync-for-salesforce' ) . '</li>',
-											absint( $mapping_object['id'] ),
-											esc_attr( $mapping_object['salesforce_id'] ),
-											esc_attr( $salesforce_mapping['wordpress_object'] )
+										$body .= sprintf('<li>' . esc_html__('Mapping object id: %1$s. Salesforce Id: %2$s. WordPress object type: %3$s', 'object-sync-for-salesforce') . '</li>',
+											absint($mapping_object['id']),
+											esc_attr($mapping_object['salesforce_id']),
+											esc_attr($salesforce_mapping['wordpress_object'])
 										);
 									}
-									$body .= sprintf( '</ul>' );
+									$body .= sprintf('</ul>');
 								}
 
-								if ( isset( $this->logging ) ) {
+								if (isset($this->logging)) {
 									$logging = $this->logging;
-								} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-									$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+								} elseif (class_exists('Object_Sync_Sf_Logging')) {
+									$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 								}
 								$parent = 0;
 								$logging->setup(
@@ -948,37 +948,37 @@ 
 						} // End if().
 
 						// there is already a mapping object. don't change the WordPress data to match this new Salesforce record, but log it
-						if ( isset( $mapping_object['id'] ) ) {
+						if (isset($mapping_object['id'])) {
 							// set the transient so that salesforce_push doesn't start doing stuff, then return out of here
-							set_transient( 'salesforce_pulling_' . $mapping_object['id'], 1, $seconds );
-							set_transient( 'salesforce_pulling_object_id', $mapping_object['id'] );
+							set_transient('salesforce_pulling_' . $mapping_object['id'], 1, $seconds);
+							set_transient('salesforce_pulling_object_id', $mapping_object['id']);
 							// create log entry to indicate that nothing happened
 							$status = 'notice';
 							// translators: placeholders are: 1) mapping object row id, 2) WordPress object tyoe, 3) individual WordPress item ID, 4) individual Salesforce item ID
-							$title = sprintf( esc_html__( 'Notice: Because object map %1$s already exists, WordPress %2$s %3$s was not mapped to Salesforce Id %4$s', 'object-sync-for-salesforce' ),
-								absint( $mapping_object['id'] ),
-								esc_attr( $salesforce_mapping['wordpress_object'] ),
-								absint( $wordpress_id ),
-								esc_attr( $object['Id'] )
+							$title = sprintf(esc_html__('Notice: Because object map %1$s already exists, WordPress %2$s %3$s was not mapped to Salesforce Id %4$s', 'object-sync-for-salesforce'),
+								absint($mapping_object['id']),
+								esc_attr($salesforce_mapping['wordpress_object']),
+								absint($wordpress_id),
+								esc_attr($object['Id'])
 							);
 
 							// translators: placeholders are 1) WordPress object type, 2) field name for the WordPress id, 3) the WordPress id value, 4) the Salesforce object type, 5) the Salesforce object Id that was modified, 6) the mapping object row id
-							$body = sprintf( esc_html__( 'The WordPress %1$s with %2$s of %3$s is already mapped to the Salesforce %4$s with Id of %5$s in the mapping object with id of %6$s. The Salesforce %4$s with Id of %5$s was created or modified in Salesforce, and would otherwise have been mapped to this WordPress record. No WordPress data has been changed to prevent changing data unintentionally.', 'object-sync-for-salesforce' ),
-								esc_attr( $salesforce_mapping['wordpress_object'] ),
-								esc_attr( $structure['id_field'] ),
-								absint( $wordpress_id ),
-								esc_attr( $mapping_object['salesforce_object'] ),
-								esc_attr( $object['Id'] ),
-								absint( $mapping_object['id'] )
+							$body = sprintf(esc_html__('The WordPress %1$s with %2$s of %3$s is already mapped to the Salesforce %4$s with Id of %5$s in the mapping object with id of %6$s. The Salesforce %4$s with Id of %5$s was created or modified in Salesforce, and would otherwise have been mapped to this WordPress record. No WordPress data has been changed to prevent changing data unintentionally.', 'object-sync-for-salesforce'),
+								esc_attr($salesforce_mapping['wordpress_object']),
+								esc_attr($structure['id_field']),
+								absint($wordpress_id),
+								esc_attr($mapping_object['salesforce_object']),
+								esc_attr($object['Id']),
+								absint($mapping_object['id'])
 							);
 
-							if ( isset( $this->logging ) ) {
+							if (isset($this->logging)) {
 								$logging = $this->logging;
-							} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-								$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+							} elseif (class_exists('Object_Sync_Sf_Logging')) {
+								$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 							}
 							// if we know the WordPress object id we can put it in there
-							if ( null !== $wordpress_id ) {
+							if (null !== $wordpress_id) {
 								$parent = $wordpress_id;
 							} else {
 								$parent = 0;
@@ -997,9 +997,9 @@ 
 						// right here we should set the pulling transient
 						// this means we have to create the mapping object here as well, and update it with the correct IDs after successful response
 						// create the mapping object between the rows
-						$mapping_object_id = $this->create_object_map( $object, $this->mappings->generate_temporary_id( 'pull' ), $mapping );
-						set_transient( 'salesforce_pulling_' . $mapping_object_id, 1, $seconds );
-						set_transient( 'salesforce_pulling_object_id', $mapping_object_id );
+						$mapping_object_id = $this->create_object_map($object, $this->mappings->generate_temporary_id('pull'), $mapping);
+						set_transient('salesforce_pulling_' . $mapping_object_id, 1, $seconds);
+						set_transient('salesforce_pulling_object_id', $mapping_object_id);
 						$mapping_object = $this->mappings->get_object_maps(
 							array(
 								'id' => $mapping_object_id,
@@ -1008,50 +1008,50 @@ 
 
 						// now we can upsert the object in wp if we've gotten to this point
 						// this command will either create or update the object
-						$result = $this->wordpress->object_upsert( $salesforce_mapping['wordpress_object'], $upsert_key, $upsert_value, $upsert_methods, $params, $salesforce_mapping['push_drafts'] );
+						$result = $this->wordpress->object_upsert($salesforce_mapping['wordpress_object'], $upsert_key, $upsert_value, $upsert_methods, $params, $salesforce_mapping['push_drafts']);
 
 					} else {
 						// No key or prematch field exists on this field map object, create a new object in WordPress.
 						$op                = 'Create';
-						$mapping_object_id = $this->create_object_map( $object, $this->mappings->generate_temporary_id( 'pull' ), $mapping );
-						set_transient( 'salesforce_pulling_' . $mapping_object_id, 1, $seconds );
-						set_transient( 'salesforce_pulling_object_id', $mapping_object_id );
+						$mapping_object_id = $this->create_object_map($object, $this->mappings->generate_temporary_id('pull'), $mapping);
+						set_transient('salesforce_pulling_' . $mapping_object_id, 1, $seconds);
+						set_transient('salesforce_pulling_object_id', $mapping_object_id);
 						$mapping_object = $this->mappings->get_object_maps(
 							array(
 								'id' => $mapping_object_id,
 							)
 						);
 
-						$result = $this->wordpress->object_create( $salesforce_mapping['wordpress_object'], $params );
+						$result = $this->wordpress->object_create($salesforce_mapping['wordpress_object'], $params);
 					} // End if().
-				} catch ( WordpressException $e ) {
+				} catch (WordpressException $e) {
 					// create log entry for failed create or upsert
 					$status = 'error';
 
 					// translators: placeholders are: 1) what operation is happening, and 2) the name of the WordPress object
-					$title = sprintf( esc_html__( 'Error: %1$s %2$s', 'object-sync-for-salesforce' ),
-						esc_attr( $op ),
-						esc_attr( $salesforce_mapping['wordpress_object'] )
+					$title = sprintf(esc_html__('Error: %1$s %2$s', 'object-sync-for-salesforce'),
+						esc_attr($op),
+						esc_attr($salesforce_mapping['wordpress_object'])
 					);
 
-					if ( null !== $salesforce_id ) {
+					if (null !== $salesforce_id) {
 						$title .= ' ' . $salesforce_id;
 					}
 
 					// translators: placeholders are: 1) the name of the Salesforce object, and 2) Id of the Salesforce object
-					$title .= sprintf( esc_html__( ' (Salesforce %1$s with Id of %2$s)', 'object-sync-for-salesforce' ),
+					$title .= sprintf(esc_html__(' (Salesforce %1$s with Id of %2$s)', 'object-sync-for-salesforce'),
 						$salesforce_mapping['salesforce_object'],
 						$object['Id']
 					);
 
-					if ( isset( $this->logging ) ) {
+					if (isset($this->logging)) {
 						$logging = $this->logging;
-					} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-						$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+					} elseif (class_exists('Object_Sync_Sf_Logging')) {
+						$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 					}
 
 					// if we know the WordPress object id we can put it in there
-					if ( null !== $wordpress_id ) {
+					if (null !== $wordpress_id) {
 						$parent = $wordpress_id;
 					} else {
 						$parent = 0;
@@ -1065,26 +1065,26 @@ 
 						$status
 					);
 
-					if ( false === $hold_exceptions ) {
+					if (false === $hold_exceptions) {
 						throw $e;
 					}
-					if ( empty( $exception ) ) {
+					if (empty($exception)) {
 						$exception = $e;
 					} else {
-						$my_class  = get_class( $e );
-						$exception = new $my_class( $e->getMessage(), $e->getCode(), $exception );
+						$my_class  = get_class($e);
+						$exception = new $my_class($e->getMessage(), $e->getCode(), $exception);
 					}
 
 					// hook for pull fail
-					do_action( 'object_sync_for_salesforce_pull_fail', $op, $result, $synced_object );
+					do_action('object_sync_for_salesforce_pull_fail', $op, $result, $synced_object);
 
 					return;
 				} // End try().
 
 				// set $wordpress_data to the query result
 				$wordpress_data = $result['data'];
-				if ( isset( $wordpress_data[ "$object_id" ] ) ) {
-					$wordpress_id = $wordpress_data[ "$object_id" ];
+				if (isset($wordpress_data["$object_id"])) {
+					$wordpress_id = $wordpress_data["$object_id"];
 				} else {
 					$wordpress_id = 0;
 				}
@@ -1093,23 +1093,23 @@ 
 				// this means the object has already been created/updated in WordPress
 				// this is not redundant because this is where it creates the object mapping rows in WordPress if the object does not already have one (we are still inside $is_new === TRUE here)
 
-				if ( empty( $result['errors'] ) ) {
+				if (empty($result['errors'])) {
 					$status = 'success';
 
-					if ( isset( $this->logging ) ) {
+					if (isset($this->logging)) {
 						$logging = $this->logging;
-					} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-						$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+					} elseif (class_exists('Object_Sync_Sf_Logging')) {
+						$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 					}
 
 					// translators: placeholders are: 1) what operation is happening, 2) the name of the WordPress object type, 3) the WordPress id field name, 4) the WordPress object id value, 5) the name of the Salesforce object, 6) the Salesforce Id value
-					$title = sprintf( esc_html__( 'Success: %1$s %2$s with %3$s of %4$s (Salesforce %5$s Id of %6$s)', 'object-sync-for-salesforce' ),
-						esc_attr( $op ),
-						esc_attr( $salesforce_mapping['wordpress_object'] ),
-						esc_attr( $object_id ),
-						esc_attr( $wordpress_id ),
-						esc_attr( $salesforce_mapping['salesforce_object'] ),
-						esc_attr( $object['Id'] )
+					$title = sprintf(esc_html__('Success: %1$s %2$s with %3$s of %4$s (Salesforce %5$s Id of %6$s)', 'object-sync-for-salesforce'),
+						esc_attr($op),
+						esc_attr($salesforce_mapping['wordpress_object']),
+						esc_attr($object_id),
+						esc_attr($wordpress_id),
+						esc_attr($salesforce_mapping['salesforce_object']),
+						esc_attr($object['Id'])
 					);
 
 					$logging->setup(
@@ -1122,40 +1122,40 @@ 
 
 					// update that mapping object
 					$mapping_object['wordpress_id'] = $wordpress_id;
-					$mapping_object                 = $this->mappings->update_object_map( $mapping_object, $mapping_object['id'] );
+					$mapping_object                 = $this->mappings->update_object_map($mapping_object, $mapping_object['id']);
 
 					// hook for pull success
-					do_action( 'object_sync_for_salesforce_pull_success', $op, $result, $synced_object );
+					do_action('object_sync_for_salesforce_pull_success', $op, $result, $synced_object);
 				} else {
 
 					// create log entry for failed create or upsert
 					// this is part of the drupal module but i am failing to understand when it would ever fire, since the catch should catch the errors
 					// if we see this in the log entries, we can understand what it does, but probably not until then
 					$status = 'error';
-					if ( isset( $this->logging ) ) {
+					if (isset($this->logging)) {
 						$logging = $this->logging;
-					} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-						$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+					} elseif (class_exists('Object_Sync_Sf_Logging')) {
+						$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 					}
 
-					if ( is_object( $wordpress_id ) ) {
+					if (is_object($wordpress_id)) {
 						// print this array because if this happens, something weird has happened and we want to log whatever we have
-						$wordpress_id = print_r( $wordpress_id, true );
+						$wordpress_id = print_r($wordpress_id, true);
 					}
 
 					// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object type, 3) the Salesforce object Id value
-					$title = sprintf( esc_html__( 'Error syncing: %1$s to WordPress (Salesforce %2$s Id %3$s)', 'object-sync-for-salesforce' ),
-						esc_attr( $op ),
-						esc_attr( $salesforce_mapping['salesforce_object'] ),
-						esc_attr( $object['Id'] )
+					$title = sprintf(esc_html__('Error syncing: %1$s to WordPress (Salesforce %2$s Id %3$s)', 'object-sync-for-salesforce'),
+						esc_attr($op),
+						esc_attr($salesforce_mapping['salesforce_object']),
+						esc_attr($object['Id'])
 					);
 
 					// translators: placeholders are: 1) the name of the WordPress object type, 2) the WordPress id field name, 3) the WordPress id field value, 4) the array of errors
-					$body = sprintf( '<p>' . esc_html__( 'Object: %1$s with %2$s of %3$s', 'object-sync-for-salesforce' ) . '</p><p>' . esc_html__( 'Message: ', 'object-sync-for-salesforce' ) . '%4$s',
-						esc_attr( $salesforce_mapping['wordpress_object'] ),
-						esc_attr( $object_id ),
-						esc_attr( $wordpress_id ),
-						print_r( $result['errors'], true ) // if we get this error, we need to know whatever we have
+					$body = sprintf('<p>' . esc_html__('Object: %1$s with %2$s of %3$s', 'object-sync-for-salesforce') . '</p><p>' . esc_html__('Message: ', 'object-sync-for-salesforce') . '%4$s',
+						esc_attr($salesforce_mapping['wordpress_object']),
+						esc_attr($object_id),
+						esc_attr($wordpress_id),
+						print_r($result['errors'], true) // if we get this error, we need to know whatever we have
 					);
 
 					$logging->setup(
@@ -1167,52 +1167,52 @@ 
 					);
 
 					// hook for pull fail
-					do_action( 'object_sync_for_salesforce_pull_fail', $op, $result, $synced_object );
+					do_action('object_sync_for_salesforce_pull_fail', $op, $result, $synced_object);
 
 					return;
 				} // End if().
-			} elseif ( false === $is_new ) {
+			} elseif (false === $is_new) {
 
 				// right here we should set the pulling transient
-				set_transient( 'salesforce_pulling_' . $mapping_object['id'], 1, $seconds );
-				set_transient( 'salesforce_pulling_object_id', $mapping_object['id'] );
+				set_transient('salesforce_pulling_' . $mapping_object['id'], 1, $seconds);
+				set_transient('salesforce_pulling_object_id', $mapping_object['id']);
 
 				// there is an existing object link
 				// if the last sync is greater than the last time this object was updated by Salesforce, skip it
 				// this keeps us from doing redundant syncs
 				// because SF stores all DateTimes in UTC.
-				$mapping_object['object_updated'] = current_time( 'mysql' );
+				$mapping_object['object_updated'] = current_time('mysql');
 
 				$pull_trigger_field = $salesforce_mapping['pull_trigger_field'];
-				$pull_trigger_value = $object[ $pull_trigger_field ];
+				$pull_trigger_value = $object[$pull_trigger_field];
 
 				try {
 
 					// hook to allow other plugins to do something right before WordPress data is saved
 					// ex: run outside methods on an object if it exists, or do something in preparation for it if it doesn't
-					do_action( 'object_sync_for_salesforce_pre_pull', $mapping_object['wordpress_id'], $mapping, $object, $object_id, $params );
+					do_action('object_sync_for_salesforce_pre_pull', $mapping_object['wordpress_id'], $mapping, $object, $object_id, $params);
 
 					$op     = 'Update';
-					$result = $this->wordpress->object_update( $salesforce_mapping['wordpress_object'], $mapping_object['wordpress_id'], $params );
+					$result = $this->wordpress->object_update($salesforce_mapping['wordpress_object'], $mapping_object['wordpress_id'], $params);
 
 					$mapping_object['last_sync_status']  = $this->mappings->status_success;
-					$mapping_object['last_sync_message'] = esc_html__( 'Mapping object updated via function: ', 'object-sync-for-salesforce' ) . __FUNCTION__;
+					$mapping_object['last_sync_message'] = esc_html__('Mapping object updated via function: ', 'object-sync-for-salesforce') . __FUNCTION__;
 
 					$status = 'success';
-					if ( isset( $this->logging ) ) {
+					if (isset($this->logging)) {
 						$logging = $this->logging;
-					} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-						$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+					} elseif (class_exists('Object_Sync_Sf_Logging')) {
+						$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 					}
 
 					// translators: placeholders are: 1) what operation is happening, 2) the name of the WordPress object type, 3) the WordPress id field name, 4) the WordPress object id value, 5) the name of the Salesforce object, 6) the Salesforce Id value
-					$title = sprintf( esc_html__( 'Success: %1$s %2$s with %3$s of %4$s (Salesforce %5$s Id of %6$s)', 'object-sync-for-salesforce' ),
-						esc_attr( $op ),
-						esc_attr( $salesforce_mapping['wordpress_object'] ),
-						esc_attr( $object_id ),
-						esc_attr( $mapping_object['wordpress_id'] ),
-						esc_attr( $salesforce_mapping['salesforce_object'] ),
-						esc_attr( $object['Id'] )
+					$title = sprintf(esc_html__('Success: %1$s %2$s with %3$s of %4$s (Salesforce %5$s Id of %6$s)', 'object-sync-for-salesforce'),
+						esc_attr($op),
+						esc_attr($salesforce_mapping['wordpress_object']),
+						esc_attr($object_id),
+						esc_attr($mapping_object['wordpress_id']),
+						esc_attr($salesforce_mapping['salesforce_object']),
+						esc_attr($object['Id'])
 					);
 
 					$logging->setup(
@@ -1224,25 +1224,25 @@ 
 					);
 
 					// hook for pull success
-					do_action( 'object_sync_for_salesforce_pull_success', $op, $result, $synced_object );
+					do_action('object_sync_for_salesforce_pull_success', $op, $result, $synced_object);
 
-				} catch ( WordpressException $e ) {
+				} catch (WordpressException $e) {
 					// create log entry for failed update
 					$status = 'error';
-					if ( isset( $this->logging ) ) {
+					if (isset($this->logging)) {
 						$logging = $this->logging;
-					} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-						$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+					} elseif (class_exists('Object_Sync_Sf_Logging')) {
+						$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 					}
 
 					// translators: placeholders are: 1) what operation is happening, 2) the name of the WordPress object, 3) the WordPress id field name, 4) the WordPress object id value, 5) the name of the Salesforce object, 6) the Salesforce Id value
-					$title .= sprintf( esc_html__( 'Error: %1$s %2$s with %3$s of %4$s (Salesforce %5$s with Id of %6$s)', 'object-sync-for-salesforce' ),
-						esc_attr( $op ),
-						esc_attr( $salesforce_mapping['wordpress_object'] ),
-						esc_attr( $object_id ),
-						esc_attr( $mapping_object['wordpress_id'] ),
-						esc_attr( $salesforce_mapping['salesforce_object'] ),
-						esc_attr( $object['Id'] )
+					$title .= sprintf(esc_html__('Error: %1$s %2$s with %3$s of %4$s (Salesforce %5$s with Id of %6$s)', 'object-sync-for-salesforce'),
+						esc_attr($op),
+						esc_attr($salesforce_mapping['wordpress_object']),
+						esc_attr($object_id),
+						esc_attr($mapping_object['wordpress_id']),
+						esc_attr($salesforce_mapping['salesforce_object']),
+						esc_attr($object['Id'])
 					);
 
 					$logging->setup(
@@ -1256,18 +1256,18 @@ 
 					$mapping_object['last_sync_status']  = $this->mappings->status_error;
 					$mapping_object['last_sync_message'] = $e->getMessage();
 
-					if ( false === $hold_exceptions ) {
+					if (false === $hold_exceptions) {
 						throw $e;
 					}
-					if ( empty( $exception ) ) {
+					if (empty($exception)) {
 						$exception = $e;
 					} else {
-						$my_class  = get_class( $e );
-						$exception = new $my_class( $e->getMessage(), $e->getCode(), $exception );
+						$my_class  = get_class($e);
+						$exception = new $my_class($e->getMessage(), $e->getCode(), $exception);
 					}
 
 					// hook for pull fail
-					do_action( 'object_sync_for_salesforce_pull_fail', $op, $result, $synced_object );
+					do_action('object_sync_for_salesforce_pull_fail', $op, $result, $synced_object);
 
 				} // End try().
 
@@ -1276,26 +1276,26 @@ 
 				// maybe can check to see if we actually updated anything in WordPress
 				// tell the mapping object - whether it is new or already existed - how we just used it
 				$mapping_object['last_sync_action'] = 'pull';
-				$mapping_object['last_sync']        = current_time( 'mysql' );
+				$mapping_object['last_sync']        = current_time('mysql');
 
 				// update that mapping object. the Salesforce data version will be set here as well because we set it earlier
-				$result = $this->mappings->update_object_map( $mapping_object, $mapping_object['id'] );
+				$result = $this->mappings->update_object_map($mapping_object, $mapping_object['id']);
 				// end of the if statement for is_new & update or create trigger
 				// this keeps stuff from running too many times, and also keeps it from using the wrong methods. we don't need a generic } else { here at this time.
 			} // End if().
 		} // End foreach().
 
 		// delete transients that we've already processed
-		foreach ( $transients_to_delete as $mapping_object_id_transient ) {
-			delete_transient( 'salesforce_pushing_' . $mapping_object_id_transient );
+		foreach ($transients_to_delete as $mapping_object_id_transient) {
+			delete_transient('salesforce_pushing_' . $mapping_object_id_transient);
 		}
 
-		$pushing_id = get_transient( 'salesforce_pushing_object_id' );
-		if ( in_array( $pushing_id, $transients_to_delete, true ) ) {
-			delete_transient( 'salesforce_pushing_object_id' );
+		$pushing_id = get_transient('salesforce_pushing_object_id');
+		if (in_array($pushing_id, $transients_to_delete, true)) {
+			delete_transient('salesforce_pushing_object_id');
 		}
 
-		if ( ! empty( $exception ) ) {
+		if ( ! empty($exception)) {
 			throw $exception;
 		}
 
@@ -1315,17 +1315,17 @@ 
 	*   This is the database row for the map object
 	*
 	*/
-	private function create_object_map( $salesforce_object, $wordpress_id, $field_mapping ) {
+	private function create_object_map($salesforce_object, $wordpress_id, $field_mapping) {
 		// Create object map and save it
 		$mapping_object = $this->mappings->create_object_map(
 			array(
 				'wordpress_id'      => $wordpress_id, // wordpress unique id
 				'salesforce_id'     => $salesforce_object['Id'], // salesforce unique id. we don't care what kind of object it is at this point
 				'wordpress_object'  => $field_mapping['wordpress_object'], // keep track of what kind of wp object this is
-				'last_sync'         => current_time( 'mysql' ),
+				'last_sync'         => current_time('mysql'),
 				'last_sync_action'  => 'pull',
 				'last_sync_status'  => $this->mappings->status_success,
-				'last_sync_message' => esc_html__( 'Mapping object created via function: ', 'object-sync-for-salesforce' ) . __FUNCTION__,
+				'last_sync_message' => esc_html__('Mapping object created via function: ', 'object-sync-for-salesforce') . __FUNCTION__,
 				'action'            => 'created',
 			)
 		);

classes/salesforce_push.php

Spacing +299 added lines, -299 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -44,7 +44,7 @@ 
 	* @param object $queue
 	* @throws \Object_Sync_Sf_Exception
 	*/
-	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue ) {
+	public function __construct($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
 		$this->login_credentials   = $login_credentials;
@@ -59,9 +59,9 @@ 
 		$this->schedule_name = 'salesforce_push';
 
 		// Create action hooks for WordPress objects. We run this after plugins are loaded in case something depends on another plugin.
-		add_action( 'plugins_loaded', array( $this, 'add_actions' ) );
+		add_action('plugins_loaded', array($this, 'add_actions'));
 
-		$this->debug = get_option( 'object_sync_for_salesforce_debug_mode', false );
+		$this->debug = get_option('object_sync_for_salesforce_debug_mode', false);
 
 	}
 
@@ -71,41 +71,41 @@ 
 	*
 	*/
 	public function add_actions() {
-		$db_version = get_option( 'object_sync_for_salesforce_db_version', false );
-		if ( $db_version === $this->version ) {
-			foreach ( $this->mappings->get_fieldmaps() as $mapping ) {
+		$db_version = get_option('object_sync_for_salesforce_db_version', false);
+		if ($db_version === $this->version) {
+			foreach ($this->mappings->get_fieldmaps() as $mapping) {
 				$object_type = $mapping['wordpress_object'];
-				if ( 'user' === $object_type ) {
-					if ( defined( 'ultimatemember_plugin_name' ) ) {
-						add_action( 'um_user_register', array( $this, 'um_add_user' ), 11, 2 );
+				if ('user' === $object_type) {
+					if (defined('ultimatemember_plugin_name')) {
+						add_action('um_user_register', array($this, 'um_add_user'), 11, 2);
 					} else {
-						add_action( 'user_register', array( $this, 'add_user' ), 11, 1 );
+						add_action('user_register', array($this, 'add_user'), 11, 1);
 					}
-					add_action( 'profile_update', array( $this, 'edit_user' ), 11, 2 );
-					add_action( 'delete_user', array( $this, 'delete_user' ) );
-				} elseif ( 'post' === $object_type ) {
-					add_action( 'save_post', array( $this, 'post_actions' ), 11, 2 );
-				} elseif ( 'attachment' === $object_type ) {
-					add_action( 'add_attachment', array( $this, 'add_attachment' ) );
-					add_action( 'edit_attachment', array( $this, 'edit_attachment' ) );
-					add_action( 'delete_attachment', array( $this, 'delete_attachment' ) );
-				} elseif ( 'category' === $object_type || 'tag' === $object_type || 'post_tag' === $object_type ) {
-					add_action( 'create_term', array( $this, 'add_term' ), 11, 3 );
-					add_action( 'edit_terms', array( $this, 'edit_term' ), 11, 2 );
-					add_action( 'delete_term', array( $this, 'delete_term' ), 10, 4 );
-				} elseif ( 'comment' === $object_type ) {
-					add_action( 'comment_post', array( $this, 'add_comment' ), 11, 3 );
-					add_action( 'edit_comment', array( $this, 'edit_comment' ) );
-					add_action( 'delete_comment', array( $this, 'delete_comment' ) ); // to be clear: this only runs when the comment gets deleted from the trash, either manually or automatically
+					add_action('profile_update', array($this, 'edit_user'), 11, 2);
+					add_action('delete_user', array($this, 'delete_user'));
+				} elseif ('post' === $object_type) {
+					add_action('save_post', array($this, 'post_actions'), 11, 2);
+				} elseif ('attachment' === $object_type) {
+					add_action('add_attachment', array($this, 'add_attachment'));
+					add_action('edit_attachment', array($this, 'edit_attachment'));
+					add_action('delete_attachment', array($this, 'delete_attachment'));
+				} elseif ('category' === $object_type || 'tag' === $object_type || 'post_tag' === $object_type) {
+					add_action('create_term', array($this, 'add_term'), 11, 3);
+					add_action('edit_terms', array($this, 'edit_term'), 11, 2);
+					add_action('delete_term', array($this, 'delete_term'), 10, 4);
+				} elseif ('comment' === $object_type) {
+					add_action('comment_post', array($this, 'add_comment'), 11, 3);
+					add_action('edit_comment', array($this, 'edit_comment'));
+					add_action('delete_comment', array($this, 'delete_comment')); // to be clear: this only runs when the comment gets deleted from the trash, either manually or automatically
 				} else { // this is for custom post types
 					// we still have to use save_post because save_post_type fails to pull in the metadata
-					add_action( 'save_post', array( $this, 'post_actions' ), 11, 2 );
+					add_action('save_post', array($this, 'post_actions'), 11, 2);
 				}
 			}
 		}
 
 		// hook that action-scheduler can call
-		add_action( 'object_sync_for_salesforce_push_record', array( $this, 'salesforce_push_sync_rest' ), 10, 4 );
+		add_action('object_sync_for_salesforce_push_record', array($this, 'salesforce_push_sync_rest'), 10, 4);
 
 	}
 
@@ -116,8 +116,8 @@ 
 	* @param string $type
 	*
 	*/
-	public function manual_object_update( $object, $type ) {
-		$this->salesforce_push_object_crud( $type, $object, $this->mappings->sync_wordpress_update, true );
+	public function manual_object_update($object, $type) {
+		$this->salesforce_push_object_crud($type, $object, $this->mappings->sync_wordpress_update, true);
 	}
 
 	/**
@@ -125,9 +125,9 @@ 
 	*
 	* @param string $user_id
 	*/
-	public function add_user( $user_id ) {
-		$user = $this->wordpress->get_wordpress_object_data( 'user', $user_id );
-		$this->object_insert( $user, 'user' );
+	public function add_user($user_id) {
+		$user = $this->wordpress->get_wordpress_object_data('user', $user_id);
+		$this->object_insert($user, 'user');
 	}
 
 	/**
@@ -135,8 +135,8 @@ 
 	*
 	* @param string $user_id
 	*/
-	public function um_add_user( $user_id, $form_data = array() ) {
-		$this->object_insert( $form_data, 'user' );
+	public function um_add_user($user_id, $form_data = array()) {
+		$this->object_insert($form_data, 'user');
 	}
 
 	/**
@@ -145,9 +145,9 @@ 
 	* @param string $user_id
 	* @param object $old_user_data
 	*/
-	public function edit_user( $user_id, $old_user_data ) {
-		$user = $this->wordpress->get_wordpress_object_data( 'user', $user_id );
-		$this->object_update( $user, 'user' );
+	public function edit_user($user_id, $old_user_data) {
+		$user = $this->wordpress->get_wordpress_object_data('user', $user_id);
+		$this->object_update($user, 'user');
 	}
 
 	/**
@@ -155,9 +155,9 @@ 
 	*
 	* @param string $user_id
 	*/
-	public function delete_user( $user_id ) {
-		$user = $this->wordpress->get_wordpress_object_data( 'user', $user_id );
-		$this->object_delete( $user, 'user' );
+	public function delete_user($user_id) {
+		$user = $this->wordpress->get_wordpress_object_data('user', $user_id);
+		$this->object_delete($user, 'user');
 	}
 
 	/**
@@ -167,48 +167,48 @@ 
 	* @param string $post_id
 	* @param object $post
 	*/
-	public function post_actions( $post_id, $post ) {
+	public function post_actions($post_id, $post) {
 
 		$post_type = $post->post_type;
 
-		if ( isset( $post->post_status ) && 'auto-draft' === $post->post_status ) {
+		if (isset($post->post_status) && 'auto-draft' === $post->post_status) {
 			return;
 		}
 		// this plugin does not sync log or revision posts with salesforce
-		if ( isset( $post->post_type ) && in_array( $post->post_type, array( 'wp_log', 'revision' ), true ) ) {
+		if (isset($post->post_type) && in_array($post->post_type, array('wp_log', 'revision'), true)) {
 			return;
 		}
-		if ( $post->post_modified_gmt === $post->post_date_gmt && 'trash' !== $post->post_status ) {
+		if ($post->post_modified_gmt === $post->post_date_gmt && 'trash' !== $post->post_status) {
 			$update = 0;
 			$delete = 0;
-		} elseif ( 'trash' !== $post->post_status ) {
+		} elseif ('trash' !== $post->post_status) {
 			$update = 1;
 			$delete = 0;
-		} elseif ( 'trash' === $post->post_status ) {
+		} elseif ('trash' === $post->post_status) {
 			$update = 0;
 			$delete = 1;
 		}
 
 		// add support for woocommerce if it is installed
-		if ( defined( 'WC_VERSION' ) ) {
+		if (defined('WC_VERSION')) {
 			// statuses to ignore
-			if ( isset( $post->post_status ) && in_array( $post->post_status, array( 'wc-pending' ), true ) ) {
+			if (isset($post->post_status) && in_array($post->post_status, array('wc-pending'), true)) {
 				return;
 			}
 			// statuses to count as new. note that the api will also check to see if it already has been mapped before saving.
-			if ( isset( $post->post_status ) && in_array( $post->post_status, array( 'wc-on-hold', 'wc-processing' ), true ) ) {
+			if (isset($post->post_status) && in_array($post->post_status, array('wc-on-hold', 'wc-processing'), true)) {
 				$update = 0;
 				$delete = 0;
 			}
 		}
 
-		$post = $this->wordpress->get_wordpress_object_data( $post->post_type, $post_id );
-		if ( 1 === $update ) {
-			$this->object_update( $post, $post_type );
-		} elseif ( 1 === $delete ) {
-			$this->object_delete( $post, $post_type );
+		$post = $this->wordpress->get_wordpress_object_data($post->post_type, $post_id);
+		if (1 === $update) {
+			$this->object_update($post, $post_type);
+		} elseif (1 === $delete) {
+			$this->object_delete($post, $post_type);
 		} else {
-			$this->object_insert( $post, $post_type );
+			$this->object_insert($post, $post_type);
 		}
 	}
 
@@ -217,9 +217,9 @@ 
 	*
 	* @param string $post_id
 	*/
-	public function add_attachment( $post_id ) {
-		$attachment = $this->wordpress->get_wordpress_object_data( 'attachment', $post_id );
-		$this->object_insert( $attachment, 'attachment' );
+	public function add_attachment($post_id) {
+		$attachment = $this->wordpress->get_wordpress_object_data('attachment', $post_id);
+		$this->object_insert($attachment, 'attachment');
 	}
 
 	/**
@@ -227,9 +227,9 @@ 
 	*
 	* @param string $post_id
 	*/
-	public function edit_attachment( $post_id ) {
-		$attachment = $this->wordpress->get_wordpress_object_data( 'attachment', $post_id );
-		$this->object_update( $attachment, 'attachment' );
+	public function edit_attachment($post_id) {
+		$attachment = $this->wordpress->get_wordpress_object_data('attachment', $post_id);
+		$this->object_update($attachment, 'attachment');
 	}
 
 	/**
@@ -237,9 +237,9 @@ 
 	*
 	* @param string $post_id
 	*/
-	public function delete_attachment( $post_id ) {
-		$attachment = $this->wordpress->get_wordpress_object_data( 'attachment', $post_id );
-		$this->object_delete( $attachment, 'attachment' );
+	public function delete_attachment($post_id) {
+		$attachment = $this->wordpress->get_wordpress_object_data('attachment', $post_id);
+		$this->object_delete($attachment, 'attachment');
 	}
 
 	/**
@@ -249,9 +249,9 @@ 
 	* @param string $tt_id
 	* @param string $taxonomy
 	*/
-	public function add_term( $term_id, $tt_id, $taxonomy ) {
-		$term = $this->wordpress->get_wordpress_object_data( $taxonomy, $term_id );
-		$this->object_insert( $term, $taxonomy );
+	public function add_term($term_id, $tt_id, $taxonomy) {
+		$term = $this->wordpress->get_wordpress_object_data($taxonomy, $term_id);
+		$this->object_insert($term, $taxonomy);
 	}
 
 	/**
@@ -260,9 +260,9 @@ 
 	* @param string $term_id
 	* @param string $taxonomy
 	*/
-	public function edit_term( $term_id, $taxonomy ) {
-		$term = $this->wordpress->get_wordpress_object_data( $taxonomy, $term_id );
-		$this->object_update( $term, $taxonomy );
+	public function edit_term($term_id, $taxonomy) {
+		$term = $this->wordpress->get_wordpress_object_data($taxonomy, $term_id);
+		$this->object_update($term, $taxonomy);
 	}
 
 	/**
@@ -273,10 +273,10 @@ 
 	* @param string $taxonomy (slug)
 	* @param object $deleted_term
 	*/
-	public function delete_term( $term, $tt_id, $taxonomy, $deleted_term ) {
+	public function delete_term($term, $tt_id, $taxonomy, $deleted_term) {
 		$deleted_term = (array) $deleted_term;
 		$type         = $deleted_term['taxonomy'];
-		$this->object_delete( $deleted_term, $type );
+		$this->object_delete($deleted_term, $type);
 	}
 
 	/**
@@ -286,9 +286,9 @@ 
 	* @param int|string comment_approved
 	* @param array $commentdata
 	*/
-	public function add_comment( $comment_id, $comment_approved, $commentdata = array() ) {
-		$comment = $this->wordpress->get_wordpress_object_data( 'comment', $comment_id );
-		$this->object_insert( $comment, 'comment' );
+	public function add_comment($comment_id, $comment_approved, $commentdata = array()) {
+		$comment = $this->wordpress->get_wordpress_object_data('comment', $comment_id);
+		$this->object_insert($comment, 'comment');
 	}
 
 	/**
@@ -296,9 +296,9 @@ 
 	*
 	* @param string $comment_id
 	*/
-	public function edit_comment( $comment_id ) {
-		$comment = $this->wordpress->get_wordpress_object_data( 'comment', $comment_id );
-		$this->object_update( $comment, 'comment' );
+	public function edit_comment($comment_id) {
+		$comment = $this->wordpress->get_wordpress_object_data('comment', $comment_id);
+		$this->object_update($comment, 'comment');
 	}
 
 	/**
@@ -306,33 +306,33 @@ 
 	*
 	* @param string $comment_id
 	*/
-	public function delete_comment( $comment_id ) {
-		$comment = $this->wordpress->get_wordpress_object_data( 'comment', $comment_id );
-		$this->object_delete( $comment, 'comment' );
+	public function delete_comment($comment_id) {
+		$comment = $this->wordpress->get_wordpress_object_data('comment', $comment_id);
+		$this->object_delete($comment, 'comment');
 	}
 
 	/**
 	* Insert a new object
 	* This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
 	*/
-	private function object_insert( $object, $type ) {
-		$this->salesforce_push_object_crud( $type, $object, $this->mappings->sync_wordpress_create );
+	private function object_insert($object, $type) {
+		$this->salesforce_push_object_crud($type, $object, $this->mappings->sync_wordpress_create);
 	}
 
 	/**
 	* Update an existing object
 	* This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
 	*/
-	private function object_update( $object, $type ) {
-		$this->salesforce_push_object_crud( $type, $object, $this->mappings->sync_wordpress_update );
+	private function object_update($object, $type) {
+		$this->salesforce_push_object_crud($type, $object, $this->mappings->sync_wordpress_update);
 	}
 
 	/**
 	* Delete an existing object
 	* This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
 	*/
-	private function object_delete( $object, $type ) {
-		$this->salesforce_push_object_crud( $type, $object, $this->mappings->sync_wordpress_delete );
+	private function object_delete($object, $type) {
+		$this->salesforce_push_object_crud($type, $object, $this->mappings->sync_wordpress_delete);
 	}
 
 	/**
@@ -349,50 +349,50 @@ 
 	*   Are we calling this manually?
 	*
 	*/
-	private function salesforce_push_object_crud( $object_type, $object, $sf_sync_trigger, $manual = false ) {
+	private function salesforce_push_object_crud($object_type, $object, $sf_sync_trigger, $manual = false) {
 
-		$structure       = $this->wordpress->get_wordpress_table_structure( $object_type );
+		$structure       = $this->wordpress->get_wordpress_table_structure($object_type);
 		$object_id_field = $structure['id_field'];
 
 		// there is a WordPress object to push
-		if ( isset( $object[ $object_id_field ] ) ) {
-			$mapping_object = $this->mappings->load_by_wordpress( $object_type, $object[ $object_id_field ] );
+		if (isset($object[$object_id_field])) {
+			$mapping_object = $this->mappings->load_by_wordpress($object_type, $object[$object_id_field]);
 
 			// there is already a mapping object for this WordPress object
-			if ( isset( $mapping_object['id'] ) ) {
+			if (isset($mapping_object['id'])) {
 				$mapping_object_id_transient = $mapping_object['id'];
 			} else {
 				// there is not a mapping object for this WordPress object id yet
 				// check for that transient with the currently pulling id
-				$mapping_object_id_transient = (int) get_transient( 'salesforce_pulling_object_id' );
+				$mapping_object_id_transient = (int) get_transient('salesforce_pulling_object_id');
 			}
 
-			$salesforce_pulling = (int) get_transient( 'salesforce_pulling_' . $mapping_object_id_transient );
-			if ( 1 === $salesforce_pulling ) {
-				delete_transient( 'salesforce_pulling_' . $mapping_object_id_transient );
-				$pulling_id = get_transient( 'salesforce_pulling_object_id' );
-				if ( $pulling_id === $mapping_object_id_transient ) {
-					delete_transient( 'salesforce_pulling_object_id' );
+			$salesforce_pulling = (int) get_transient('salesforce_pulling_' . $mapping_object_id_transient);
+			if (1 === $salesforce_pulling) {
+				delete_transient('salesforce_pulling_' . $mapping_object_id_transient);
+				$pulling_id = get_transient('salesforce_pulling_object_id');
+				if ($pulling_id === $mapping_object_id_transient) {
+					delete_transient('salesforce_pulling_object_id');
 				}
 				return false;
 			}
 		} else {
 			// if we don't have a WordPress object id, we've got no business doing stuff in Salesforce
 			$status = 'error';
-			if ( isset( $this->logging ) ) {
+			if (isset($this->logging)) {
 				$logging = $this->logging;
-			} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-				$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+			} elseif (class_exists('Object_Sync_Sf_Logging')) {
+				$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 			}
 
 			// translators: placeholder is the name of the WordPress id field
-			$title = sprintf( esc_html__( 'Error: Salesforce Push: unable to process queue item because it has no WordPress %1$s.', 'object-sync-for-salesforce' ),
-				esc_attr( $object_id_field )
+			$title = sprintf(esc_html__('Error: Salesforce Push: unable to process queue item because it has no WordPress %1$s.', 'object-sync-for-salesforce'),
+				esc_attr($object_id_field)
 			);
 
 			$logging->setup(
 				$title,
-				print_r( $object, true ), // print this array because if this happens, something weird has happened and we want to log whatever we have
+				print_r($object, true), // print this array because if this happens, something weird has happened and we want to log whatever we have
 				$sf_sync_trigger,
 				0, // parent id goes here but we don't have one, so make it 0
 				$status
@@ -409,14 +409,14 @@ 
 			)
 		);
 
-		foreach ( $sf_mappings as $mapping ) { // for each mapping of this object
+		foreach ($sf_mappings as $mapping) { // for each mapping of this object
 			$map_sync_triggers = $mapping['sync_triggers'];
 
 			// these are bit operators, so we leave out the strict
-			if ( isset( $map_sync_triggers ) && isset( $sf_sync_trigger ) && in_array( $sf_sync_trigger, $map_sync_triggers ) ) { // wp or sf crud event
+			if (isset($map_sync_triggers) && isset($sf_sync_trigger) && in_array($sf_sync_trigger, $map_sync_triggers)) { // wp or sf crud event
 
 				// hook to allow other plugins to prevent a push per-mapping.
-				$push_allowed = apply_filters( 'object_sync_for_salesforce_push_object_allowed', true, $object_type, $object, $sf_sync_trigger, $mapping );
+				$push_allowed = apply_filters('object_sync_for_salesforce_push_object_allowed', true, $object_type, $object, $sf_sync_trigger, $mapping);
 
 				// example to keep from pushing the user with id of 1
 				/*
@@ -429,18 +429,18 @@ 
 				}
 				*/
 
-				if ( false === $push_allowed ) {
+				if (false === $push_allowed) {
 					continue;
 				}
 
 				// push drafts if the setting says so
 				// post status is draft, or post status is inherit and post type is not attachment
-				if ( ( ! isset( $mapping['push_drafts'] ) || '1' !== $mapping['push_drafts'] ) && isset( $object['post_status'] ) && ( 'draft' === $object['post_status'] || ( 'inherit' === $object['post_status'] && 'attachment' !== $object['post_type'] ) ) ) {
+				if (( ! isset($mapping['push_drafts']) || '1' !== $mapping['push_drafts']) && isset($object['post_status']) && ('draft' === $object['post_status'] || ('inherit' === $object['post_status'] && 'attachment' !== $object['post_type']))) {
 					// skip this object if it is a draft and the fieldmap settings told us to ignore it
 					continue;
 				}
 
-				if ( isset( $mapping['push_async'] ) && ( '1' === $mapping['push_async'] ) && false === $manual ) {
+				if (isset($mapping['push_async']) && ('1' === $mapping['push_async']) && false === $manual) {
 					// this item is async and we want to save it to the queue
 
 					// if we determine that the above does not perform well, worst case scenario is we could save $data to a custom table, and pass the id to the callback method.
@@ -454,18 +454,18 @@ 
 					// add a queue action to push data to salesforce
 					// this means we don't need the frequency for this method anymore, i think
 					$this->queue->add(
-						$this->schedulable_classes[ $this->schedule_name ]['callback'],
+						$this->schedulable_classes[$this->schedule_name]['callback'],
 						array(
 							'object_type'     => $object_type,
-							'object'          => filter_var( $object[ $object_id_field ], FILTER_VALIDATE_INT ),
-							'mapping'         => filter_var( $mapping['id'], FILTER_VALIDATE_INT ),
+							'object'          => filter_var($object[$object_id_field], FILTER_VALIDATE_INT),
+							'mapping'         => filter_var($mapping['id'], FILTER_VALIDATE_INT),
 							'sf_sync_trigger' => $sf_sync_trigger,
 						),
 						$this->schedule_name
 					);
 				} else {
 					// this one is not async. do it immediately.
-					$push = $this->salesforce_push_sync_rest( $object_type, $object, $mapping, $sf_sync_trigger );
+					$push = $this->salesforce_push_sync_rest($object_type, $object, $mapping, $sf_sync_trigger);
 				} // End if().
 			} // End if(). if the trigger does not match our requirements, skip it
 		} // End foreach().
@@ -486,35 +486,35 @@ 
 	* @return true or exit the method
 	*
 	*/
-	public function salesforce_push_sync_rest( $object_type, $object, $mapping, $sf_sync_trigger ) {
+	public function salesforce_push_sync_rest($object_type, $object, $mapping, $sf_sync_trigger) {
 
-		if ( is_int( $object ) ) {
+		if (is_int($object)) {
 			$object_id = $object;
-			$object    = $this->wordpress->get_wordpress_object_data( $object_type, $object_id );
+			$object    = $this->wordpress->get_wordpress_object_data($object_type, $object_id);
 		}
 
-		if ( is_int( $mapping ) ) {
+		if (is_int($mapping)) {
 			$mapping_id = $mapping;
-			$mapping    = $this->mappings->get_fieldmaps( $mapping_id );
+			$mapping    = $this->mappings->get_fieldmaps($mapping_id);
 		}
 
 		// If Salesforce is not authorized, don't do anything.
 		// it's unclear to me if we need to do something else here or if this is sufficient. This is all Drupal does.
-		if ( true !== $this->salesforce['is_authorized'] ) {
+		if (true !== $this->salesforce['is_authorized']) {
 			return;
 		}
 
 		$sfapi = $this->salesforce['sfapi'];
 
 		// we need to get the WordPress id here so we can check to see if the object already has a map
-		$structure = $this->wordpress->get_wordpress_table_structure( $object_type );
+		$structure = $this->wordpress->get_wordpress_table_structure($object_type);
 		$object_id = $structure['id_field'];
 
 		// this returns the row that maps the individual WordPress row to the individual Salesfoce row
-		$mapping_object = $this->mappings->load_by_wordpress( $object_type, $object[ "$object_id" ] );
+		$mapping_object = $this->mappings->load_by_wordpress($object_type, $object["$object_id"]);
 
 		// hook to allow other plugins to define or alter the mapping object
-		$mapping_object = apply_filters( 'object_sync_for_salesforce_push_mapping_object', $mapping_object, $object, $mapping );
+		$mapping_object = apply_filters('object_sync_for_salesforce_push_mapping_object', $mapping_object, $object, $mapping);
 
 		// we already have the data from WordPress at this point; we just need to work with it in Salesforce
 		$synced_object = array(
@@ -528,84 +528,84 @@ 
 
 		// deleting mapped objects
 		// these are bit operators, so we leave out the strict
-		if ( $sf_sync_trigger == $this->mappings->sync_wordpress_delete ) {
-			if ( isset( $mapping_object['id'] ) ) {
+		if ($sf_sync_trigger == $this->mappings->sync_wordpress_delete) {
+			if (isset($mapping_object['id'])) {
 				$op = 'Delete';
 
-				$salesforce_check = $this->mappings->load_by_salesforce( $mapping_object['salesforce_id'] );
+				$salesforce_check = $this->mappings->load_by_salesforce($mapping_object['salesforce_id']);
 
-				if ( count( $salesforce_check ) === count( $salesforce_check, COUNT_RECURSIVE ) ) {
+				if (count($salesforce_check) === count($salesforce_check, COUNT_RECURSIVE)) {
 					try {
-						$result = $sfapi->object_delete( $mapping['salesforce_object'], $mapping_object['salesforce_id'] );
-					} catch ( Object_Sync_Sf_Exception $e ) {
+						$result = $sfapi->object_delete($mapping['salesforce_object'], $mapping_object['salesforce_id']);
+					} catch (Object_Sync_Sf_Exception $e) {
 						$status = 'error';
 						// create log entry for failed delete
-						if ( isset( $this->logging ) ) {
+						if (isset($this->logging)) {
 							$logging = $this->logging;
-						} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-							$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+						} elseif (class_exists('Object_Sync_Sf_Logging')) {
+							$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 						}
 
 						// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-						$title = sprintf( esc_html__( 'Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-							esc_attr( $op ),
-							esc_attr( $mapping['salesforce_object'] ),
-							esc_attr( $mapping_object['salesforce_id'] ),
-							esc_attr( $mapping['wordpress_object'] ),
-							esc_attr( $object_id ),
-							esc_attr( $object[ "$object_id" ] )
+						$title = sprintf(esc_html__('Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+							esc_attr($op),
+							esc_attr($mapping['salesforce_object']),
+							esc_attr($mapping_object['salesforce_id']),
+							esc_attr($mapping['wordpress_object']),
+							esc_attr($object_id),
+							esc_attr($object["$object_id"])
 						);
 
 						$logging->setup(
 							$title,
 							$e->getMessage(),
 							$sf_sync_trigger,
-							$object[ "$object_id" ],
+							$object["$object_id"],
 							$status
 						);
 
 						// hook for push fail
-						do_action( 'object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object, $object_id );
+						do_action('object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object, $object_id);
 
 					}
 
-					if ( ! isset( $e ) ) {
+					if ( ! isset($e)) {
 						// create log entry for successful delete if the result had no errors
 						$status = 'success';
-						if ( isset( $this->logging ) ) {
+						if (isset($this->logging)) {
 							$logging = $this->logging;
-						} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-							$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+						} elseif (class_exists('Object_Sync_Sf_Logging')) {
+							$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 						}
 
 						// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-						$title = sprintf( esc_html__( 'Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-							esc_attr( $op ),
-							esc_attr( $mapping['salesforce_object'] ),
-							esc_attr( $mapping_object['salesforce_id'] ),
-							esc_attr( $mapping['wordpress_object'] ),
-							esc_attr( $object_id ),
-							esc_attr( $object[ "$object_id" ] )
+						$title = sprintf(esc_html__('Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+							esc_attr($op),
+							esc_attr($mapping['salesforce_object']),
+							esc_attr($mapping_object['salesforce_id']),
+							esc_attr($mapping['wordpress_object']),
+							esc_attr($object_id),
+							esc_attr($object["$object_id"])
 						);
 
 						$logging->setup(
 							$title,
 							'',
 							$sf_sync_trigger,
-							$object[ "$object_id" ],
+							$object["$object_id"],
 							$status
 						);
 
 						// hook for push success
-						do_action( 'object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id );
+						do_action('object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id);
 					}
 				} else {
 					$more_ids = '<p>The Salesforce record was not deleted because there are multiple WordPress IDs that match this Salesforce ID. They are: ';
 					$i        = 0;
-					foreach ( $salesforce_check as $match ) {
+					foreach ($salesforce_check as $match) {
 						$i++;
 						$more_ids .= $match['wordpress_id'];
-						if ( count( $salesforce_check ) !== $i ) {
+						if (count($salesforce_check) !== $i) {
 							$more_ids .= ', ';
 						} else {
 							$more_ids .= '.</p>';
@@ -615,34 +615,34 @@ 
 					$more_ids .= '<p>The map row between this WordPress object and the Salesforce object, as stored in the WordPress database, will be deleted, and this WordPress object has been deleted, but Salesforce will remain untouched.</p>';
 
 					$status = 'notice';
-					if ( isset( $this->logging ) ) {
+					if (isset($this->logging)) {
 						$logging = $this->logging;
-					} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-						$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+					} elseif (class_exists('Object_Sync_Sf_Logging')) {
+						$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 					}
 
 					// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-					$title = sprintf( esc_html__( 'Notice: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s did not delete the Salesforce item.)', 'object-sync-for-salesforce' ),
-						esc_attr( $op ),
-						esc_attr( $mapping['salesforce_object'] ),
-						esc_attr( $mapping_object['salesforce_id'] ),
-						esc_attr( $mapping['wordpress_object'] ),
-						esc_attr( $object_id ),
-						esc_attr( $object[ "$object_id" ] )
+					$title = sprintf(esc_html__('Notice: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s did not delete the Salesforce item.)', 'object-sync-for-salesforce'),
+						esc_attr($op),
+						esc_attr($mapping['salesforce_object']),
+						esc_attr($mapping_object['salesforce_id']),
+						esc_attr($mapping['wordpress_object']),
+						esc_attr($object_id),
+						esc_attr($object["$object_id"])
 					);
 
 					$logging->setup(
 						$title,
 						$more_ids,
 						$sf_sync_trigger,
-						$object[ "$object_id" ],
+						$object["$object_id"],
 						$status
 					);
 				} // End if().
 
 				// delete the map row from WordPress after the Salesforce row has been deleted
 				// we delete the map row even if the Salesforce delete failed, because the WordPress object is gone
-				$this->mappings->delete_object_map( $mapping_object['id'] );
+				$this->mappings->delete_object_map($mapping_object['id']);
 
 			} // End if(). there is no map row
 
@@ -650,52 +650,52 @@ 
 		} // End if().
 
 		// are these objects already connected in WordPress?
-		if ( isset( $mapping_object['id'] ) ) {
+		if (isset($mapping_object['id'])) {
 			$is_new = false;
 		} else {
 			$is_new = true;
 		}
 
 		// map the WordPress values to salesforce fields
-		$params = $this->mappings->map_params( $mapping, $object, $sf_sync_trigger, false, $is_new );
+		$params = $this->mappings->map_params($mapping, $object, $sf_sync_trigger, false, $is_new);
 
 		// hook to allow other plugins to modify the $params array
 		// use hook to map fields between the WordPress and Salesforce objects
 		// returns $params.
-		$params = apply_filters( 'object_sync_for_salesforce_push_params_modify', $params, $mapping, $object, $sf_sync_trigger, false, $is_new );
+		$params = apply_filters('object_sync_for_salesforce_push_params_modify', $params, $mapping, $object, $sf_sync_trigger, false, $is_new);
 
 		// if we don't get any params, there are no fields that should be sent to Salesforce
-		if ( empty( $params ) ) {
+		if (empty($params)) {
 			return;
 		}
 
 		// if there is a prematch WordPress field - ie email - on the fieldmap object
-		if ( isset( $params['prematch'] ) && is_array( $params['prematch'] ) ) {
+		if (isset($params['prematch']) && is_array($params['prematch'])) {
 			$prematch_field_wordpress  = $params['prematch']['wordpress_field'];
 			$prematch_field_salesforce = $params['prematch']['salesforce_field'];
 			$prematch_value            = $params['prematch']['value'];
-			unset( $params['prematch'] );
+			unset($params['prematch']);
 		}
 
 		// if there is an external key field in Salesforce - ie mailchimp user id - on the fieldmap object
-		if ( isset( $params['key'] ) && is_array( $params['key'] ) ) {
+		if (isset($params['key']) && is_array($params['key'])) {
 			$key_field_wordpress  = $params['key']['wordpress_field'];
 			$key_field_salesforce = $params['key']['salesforce_field'];
 			$key_value            = $params['key']['value'];
-			unset( $params['key'] );
+			unset($params['key']);
 		}
 
 		$frequencies = $this->queue->get_frequencies();
-		$seconds     = reset( $frequencies )['frequency'] + 60;
+		$seconds     = reset($frequencies)['frequency'] + 60;
 
-		if ( true === $is_new ) {
+		if (true === $is_new) {
 
 			// right here we should set the pushing transient
 			// this means we have to create the mapping object here as well, and update it with the correct IDs after successful response
 			// create the mapping object between the rows
-			$mapping_object_id = $this->create_object_map( $object, $object_id, $this->mappings->generate_temporary_id( 'push' ), $mapping, true );
-			set_transient( 'salesforce_pushing_' . $mapping_object_id, 1, $seconds );
-			set_transient( 'salesforce_pushing_object_id', $mapping_object_id );
+			$mapping_object_id = $this->create_object_map($object, $object_id, $this->mappings->generate_temporary_id('push'), $mapping, true);
+			set_transient('salesforce_pushing_' . $mapping_object_id, 1, $seconds);
+			set_transient('salesforce_pushing_object_id', $mapping_object_id);
 			$mapping_object = $this->mappings->get_object_maps(
 				array(
 					'id' => $mapping_object_id,
@@ -704,7 +704,7 @@ 
 
 			// setup SF record type. CampaignMember objects get their Campaign's type
 			// i am still a bit confused about this
-			if ( $mapping['salesforce_record_type_default'] !== $this->mappings->salesforce_default_record_type && empty( $params['RecordTypeId'] ) && ( 'CampaignMember' !== $mapping['salesforce_object'] ) ) {
+			if ($mapping['salesforce_record_type_default'] !== $this->mappings->salesforce_default_record_type && empty($params['RecordTypeId']) && ('CampaignMember' !== $mapping['salesforce_object'])) {
 				$params['RecordTypeId'] = $mapping['salesforce_record_type_default'];
 			}
 
@@ -716,61 +716,61 @@ 
 				// returns a $salesforce_id.
 				// it should keep NULL if there is no match
 				// the function that calls this hook needs to check the mapping to make sure the WordPress object is the right type
-				$salesforce_id = apply_filters( 'object_sync_for_salesforce_find_sf_object_match', null, $object, $mapping, 'push' );
+				$salesforce_id = apply_filters('object_sync_for_salesforce_find_sf_object_match', null, $object, $mapping, 'push');
 
 				// hook to allow other plugins to do something right before Salesforce data is saved
 				// ex: run WordPress methods on an object if it exists, or do something in preparation for it if it doesn't
-				do_action( 'object_sync_for_salesforce_pre_push', $salesforce_id, $mapping, $object, $object_id, $params );
+				do_action('object_sync_for_salesforce_pre_push', $salesforce_id, $mapping, $object, $object_id, $params);
 
 				// hook to allow other plugins to change params on update actions only
 				// use hook to map fields between the WordPress and Salesforce objects
 				// returns $params.
-				$params = apply_filters( 'object_sync_for_salesforce_push_update_params_modify', $params, $salesforce_id, $mapping, $object );
+				$params = apply_filters('object_sync_for_salesforce_push_update_params_modify', $params, $salesforce_id, $mapping, $object);
 
-				if ( isset( $prematch_field_wordpress ) || isset( $key_field_wordpress ) || null !== $salesforce_id ) {
+				if (isset($prematch_field_wordpress) || isset($key_field_wordpress) || null !== $salesforce_id) {
 
 					// if either prematch criteria exists, make the values queryable
 
-					if ( isset( $prematch_field_wordpress ) ) {
+					if (isset($prematch_field_wordpress)) {
 						// a prematch has been specified, attempt an upsert().
 						// prematch values with punctuation need to be escaped
-						$encoded_prematch_value = rawurlencode( $prematch_value );
+						$encoded_prematch_value = rawurlencode($prematch_value);
 						// for at least 'email' fields, periods also need to be escaped:
 						// https://developer.salesforce.com/forums?id=906F000000099xPIAQ
-						$encoded_prematch_value = str_replace( '.', '%2E', $encoded_prematch_value );
+						$encoded_prematch_value = str_replace('.', '%2E', $encoded_prematch_value);
 					}
 
-					if ( isset( $key_field_wordpress ) ) {
+					if (isset($key_field_wordpress)) {
 						// an external key has been specified, attempt an upsert().
 						// external key values with punctuation need to be escaped
-						$encoded_key_value = rawurlencode( $key_value );
+						$encoded_key_value = rawurlencode($key_value);
 						// for at least 'email' fields, periods also need to be escaped:
 						// https://developer.salesforce.com/forums?id=906F000000099xPIAQ
-						$encoded_key_value = str_replace( '.', '%2E', $encoded_key_value );
+						$encoded_key_value = str_replace('.', '%2E', $encoded_key_value);
 					}
 
-					if ( isset( $prematch_field_wordpress ) ) {
+					if (isset($prematch_field_wordpress)) {
 						$upsert_key   = $prematch_field_salesforce;
 						$upsert_value = $encoded_prematch_value;
-					} elseif ( isset( $key_field_wordpress ) ) {
+					} elseif (isset($key_field_wordpress)) {
 						$upsert_key   = $key_field_salesforce;
 						$upsert_value = $encoded_key_value;
 					}
 
-					if ( null !== $salesforce_id ) {
+					if (null !== $salesforce_id) {
 						$upsert_key   = 'Id';
 						$upsert_value = $salesforce_id;
 					}
 
 					$op = 'Upsert';
 
-					$result = $sfapi->object_upsert( $mapping['salesforce_object'], $upsert_key, $upsert_value, $params );
+					$result = $sfapi->object_upsert($mapping['salesforce_object'], $upsert_key, $upsert_value, $params);
 
 					// Handle upsert responses.
-					switch ( $sfapi->response['code'] ) {
+					switch ($sfapi->response['code']) {
 						// On Upsert:update retrieved object.
 						case '204':
-							$sf_object             = $sfapi->object_readby_external_id( $mapping['salesforce_object'], $upsert_key, $upsert_value );
+							$sf_object             = $sfapi->object_readby_external_id($mapping['salesforce_object'], $upsert_key, $upsert_value);
 							$salesforce_data['id'] = $sf_object['data']['Id'];
 							break;
 						// Handle duplicate records.
@@ -781,43 +781,43 @@ 
 				} else {
 					// No key or prematch field exists on this field map object, create a new object in Salesforce.
 					$op     = 'Create';
-					$result = $sfapi->object_create( $mapping['salesforce_object'], $params );
+					$result = $sfapi->object_create($mapping['salesforce_object'], $params);
 				} // End if().
-			} catch ( Object_Sync_Sf_Exception $e ) {
+			} catch (Object_Sync_Sf_Exception $e) {
 				// create log entry for failed create or upsert
 				$status = 'error';
 
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value if there is one, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-				$title = sprintf( esc_html__( 'Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['salesforce_object'] ),
-					isset( $salesforce_id ) ? ' ' . esc_attr( $salesforce_id ) : '',
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['salesforce_object']),
+					isset($salesforce_id) ? ' ' . esc_attr($salesforce_id) : '',
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				$logging->setup(
 					$title,
 					$e->getMessage(),
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
 				// hook for push fail
-				do_action( 'object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object );
+				do_action('object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object);
 
 				return;
 			} // End try().
 
-			if ( ! isset( $salesforce_data ) ) {
+			if ( ! isset($salesforce_data)) {
 				// if we didn't set $salesforce_data already, set it now to api call result
 				$salesforce_data = $result['data'];
 			}
@@ -826,78 +826,78 @@ 
 			// this means the object has already been created/updated in Salesforce
 			// this is not redundant because this is where it creates the object mapping rows in WordPress if the object does not already have one (we are still inside $is_new === TRUE here)
 
-			if ( empty( $result['errorCode'] ) ) {
+			if (empty($result['errorCode'])) {
 				$salesforce_id = $salesforce_data['id'];
 				$status        = 'success';
 
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-				$title = sprintf( esc_html__( 'Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['salesforce_object'] ),
-					esc_attr( $salesforce_id ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['salesforce_object']),
+					esc_attr($salesforce_id),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				$logging->setup(
 					$title,
 					'',
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
 				// update that mapping object
 				$mapping_object['salesforce_id']     = $salesforce_id;
-				$mapping_object['last_sync_message'] = esc_html__( 'Mapping object updated via function: ', 'object-sync-for-salesforce' ) . __FUNCTION__;
-				$mapping_object                      = $this->mappings->update_object_map( $mapping_object, $mapping_object['id'] );
+				$mapping_object['last_sync_message'] = esc_html__('Mapping object updated via function: ', 'object-sync-for-salesforce') . __FUNCTION__;
+				$mapping_object                      = $this->mappings->update_object_map($mapping_object, $mapping_object['id']);
 
 				// hook for push success
-				do_action( 'object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id );
+				do_action('object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id);
 			} else {
 
 				// create log entry for failed create or upsert
 				// this is part of the drupal module but i am failing to understand when it would ever fire, since the catch should catch the errors
 				// if we see this in the log entries, we can understand what it does, but probably not until then
 				$status = 'error';
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholders are: 1) error code the Salesforce API returned, 2) what operation is happening, 3) the name of the WordPress object type, 4) the WordPress id field name, 5) the WordPress object id value
-				$title = sprintf( esc_html__( '%1$s error syncing: %2$s to Salesforce (WordPress %3$s with %4$s of %5$s)', 'object-sync-for-salesforce' ),
-					absint( $salesforce_data['errorCode'] ),
-					esc_attr( $op ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('%1$s error syncing: %2$s to Salesforce (WordPress %3$s with %4$s of %5$s)', 'object-sync-for-salesforce'),
+					absint($salesforce_data['errorCode']),
+					esc_attr($op),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				// translators: placeholders are 1) the name of the Salesforce object type, 2) the error message returned from the Salesforce APIs
-				$body = sprintf( '<p>' . esc_html__( 'Object: %1$s', 'object-sync-for-salesforce' ) . '</p><p>' . esc_html__( 'Message: %2$s', 'object-sync-for-salesforce' ) . '</p>',
-					esc_attr( $mapping['salesforce_object'] ),
-					esc_html( $salesforce_data['message'] )
+				$body = sprintf('<p>' . esc_html__('Object: %1$s', 'object-sync-for-salesforce') . '</p><p>' . esc_html__('Message: %2$s', 'object-sync-for-salesforce') . '</p>',
+					esc_attr($mapping['salesforce_object']),
+					esc_html($salesforce_data['message'])
 				);
 
 				$logging->setup(
 					$title,
 					$body,
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
 				// hook for push fail
-				do_action( 'object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object );
+				do_action('object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object);
 
 				return;
 			} // End if().
@@ -905,41 +905,41 @@ 
 			// $is_new is false here; we are updating an already mapped object
 
 			// right here we should set the pushing transient
-			set_transient( 'salesforce_pushing_' . $mapping_object['id'], 1, $seconds );
-			set_transient( 'salesforce_pushing_object_id', $mapping_object['id'] );
+			set_transient('salesforce_pushing_' . $mapping_object['id'], 1, $seconds);
+			set_transient('salesforce_pushing_object_id', $mapping_object['id']);
 
 			// there is an existing object link
 			// if the last sync is greater than the last time this object was updated, skip it
 			// this keeps us from doing redundant syncs
-			$mapping_object['object_updated'] = current_time( 'mysql' );
-			if ( $mapping_object['last_sync'] > $mapping_object['object_updated'] ) {
+			$mapping_object['object_updated'] = current_time('mysql');
+			if ($mapping_object['last_sync'] > $mapping_object['object_updated']) {
 				$status = 'notice';
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholders are: 1) what operation is happening, 2) the name of the WordPress object type, 3) the WordPress id field name, 4) the WordPress object id value, 5) the Salesforce Id value
-				$title = sprintf( esc_html__( 'Notice: %1$s: Did not sync WordPress %2$s with %3$s of %4$s with Salesforce Id %5$s because the last sync timestamp was greater than the object updated timestamp.', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] ),
-					esc_attr( $mapping_object['salesforce_id'] )
+				$title = sprintf(esc_html__('Notice: %1$s: Did not sync WordPress %2$s with %3$s of %4$s with Salesforce Id %5$s because the last sync timestamp was greater than the object updated timestamp.', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"]),
+					esc_attr($mapping_object['salesforce_id'])
 				);
 
 				// translators: placeholders are 1) when a sync on this mapping last occured, 2) when the object was last updated
-				$body = sprintf( '<p>' . esc_html__( 'Last sync time: %1$s', 'object-sync-for-salesforce' ) . '</p><p>' . esc_html__( 'Object updated time: %2$s', 'object-sync-for-salesforce' ) . '</p>',
-					esc_attr( $mapping_object['last_sync'] ),
-					esc_html( $mapping_object['object_updated'] )
+				$body = sprintf('<p>' . esc_html__('Last sync time: %1$s', 'object-sync-for-salesforce') . '</p><p>' . esc_html__('Object updated time: %2$s', 'object-sync-for-salesforce') . '</p>',
+					esc_attr($mapping_object['last_sync']),
+					esc_html($mapping_object['object_updated'])
 				);
 
 				$logging->setup(
 					$title,
 					$body,
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 				return;
@@ -950,71 +950,71 @@ 
 
 				// hook to allow other plugins to do something right before Salesforce data is saved
 				// ex: run WordPress methods on an object if it exists, or do something in preparation for it if it doesn't
-				do_action( 'object_sync_for_salesforce_pre_push', $mapping_object['salesforce_id'], $mapping, $object, $object_id, $params );
+				do_action('object_sync_for_salesforce_pre_push', $mapping_object['salesforce_id'], $mapping, $object, $object_id, $params);
 
 				// hook to allow other plugins to change params on update actions only
 				// use hook to map fields between the WordPress and Salesforce objects
 				// returns $params.
-				$params = apply_filters( 'object_sync_for_salesforce_push_update_params_modify', $params, $mapping_object['salesforce_id'], $mapping, $object );
+				$params = apply_filters('object_sync_for_salesforce_push_update_params_modify', $params, $mapping_object['salesforce_id'], $mapping, $object);
 
 				$op     = 'Update';
-				$result = $sfapi->object_update( $mapping['salesforce_object'], $mapping_object['salesforce_id'], $params );
+				$result = $sfapi->object_update($mapping['salesforce_object'], $mapping_object['salesforce_id'], $params);
 
 				$mapping_object['last_sync_status']  = $this->mappings->status_success;
-				$mapping_object['last_sync_message'] = esc_html__( 'Mapping object updated via function: ', 'object-sync-for-salesforce' ) . __FUNCTION__;
+				$mapping_object['last_sync_message'] = esc_html__('Mapping object updated via function: ', 'object-sync-for-salesforce') . __FUNCTION__;
 
 				$status = 'success';
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-				$title = sprintf( esc_html__( 'Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['salesforce_object'] ),
-					esc_attr( $mapping_object['salesforce_id'] ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['salesforce_object']),
+					esc_attr($mapping_object['salesforce_id']),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				$logging->setup(
 					$title,
 					'',
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
 				// hook for push success
-				do_action( 'object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id );
+				do_action('object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id);
 
-			} catch ( Object_Sync_Sf_Exception $e ) {
+			} catch (Object_Sync_Sf_Exception $e) {
 				// create log entry for failed update
 				$status = 'error';
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-				$title = sprintf( esc_html__( 'Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['salesforce_object'] ),
-					esc_attr( $mapping_object['salesforce_id'] ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['salesforce_object']),
+					esc_attr($mapping_object['salesforce_id']),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				$logging->setup(
 					$title,
 					$e->getMessage(),
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
@@ -1022,16 +1022,16 @@ 
 				$mapping_object['last_sync_message'] = $e->getMessage();
 
 				// hook for push fail
-				do_action( 'object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object );
+				do_action('object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object);
 
 			} // End try().
 
 			// tell the mapping object - whether it is new or already existed - how we just used it
 			$mapping_object['last_sync_action'] = 'push';
-			$mapping_object['last_sync']        = current_time( 'mysql' );
+			$mapping_object['last_sync']        = current_time('mysql');
 
 			// update that mapping object
-			$result = $this->mappings->update_object_map( $mapping_object, $mapping_object['id'] );
+			$result = $this->mappings->update_object_map($mapping_object, $mapping_object['id']);
 
 		} // End if(). this is the end of the if is_new stuff
 
@@ -1053,9 +1053,9 @@ 
 	*   This is the database row for the map object
 	*
 	*/
-	private function create_object_map( $wordpress_object, $id_field_name, $salesforce_id, $field_mapping, $pending = false ) {
+	private function create_object_map($wordpress_object, $id_field_name, $salesforce_id, $field_mapping, $pending = false) {
 
-		if ( true === $pending ) {
+		if (true === $pending) {
 			$action = 'pending';
 		} else {
 			$action = 'created';
@@ -1064,15 +1064,15 @@ 
 		// Create object map and save it
 		$mapping_object = $this->mappings->create_object_map(
 			array(
-				'wordpress_id'      => $wordpress_object[ $id_field_name ], // wordpress unique id
+				'wordpress_id'      => $wordpress_object[$id_field_name], // wordpress unique id
 				'salesforce_id'     => $salesforce_id, // salesforce unique id. we don't care what kind of object it is at this point
 				'wordpress_object'  => $field_mapping['wordpress_object'], // keep track of what kind of wp object this is
-				'last_sync'         => current_time( 'mysql' ),
+				'last_sync'         => current_time('mysql'),
 				'last_sync_action'  => 'push',
 				'last_sync_status'  => $this->mappings->status_success,
 				// translators: placeholder is for the action that occurred on the mapping object (pending or created)
-				'last_sync_message' => sprintf( esc_html__( 'Mapping object %1$s via function: ', 'object-sync-for-salesforce' ) . __FUNCTION__,
-					esc_attr( $action )
+				'last_sync_message' => sprintf(esc_html__('Mapping object %1$s via function: ', 'object-sync-for-salesforce') . __FUNCTION__,
+					esc_attr($action)
 				),
 				'action'            => $action,
 			)

object-sync-for-salesforce.php

Spacing +69 added lines, -69 removed lines

@@ -103,7 +103,7 @@ 
 	*
 	*/
 	static public function get_instance() {
-		if ( null === self::$instance ) {
+		if (null === self::$instance) {
 			self::$instance = new Object_Sync_Salesforce();
 		}
 		return self::$instance;
@@ -142,7 +142,7 @@ 
 		);
 
 		// users can modify the list of schedulable classes
-		$this->schedulable_classes = apply_filters( 'object_sync_for_salesforce_modify_schedulable_classes', $this->schedulable_classes );
+		$this->schedulable_classes = apply_filters('object_sync_for_salesforce_modify_schedulable_classes', $this->schedulable_classes);
 
 		/*
 		 * example to modify the array of classes by adding one and removing one
@@ -167,25 +167,25 @@ 
 		 * }
 		*/
 
-		$this->load = $this->load( $this->wpdb, $this->version, $this->slug );
+		$this->load = $this->load($this->wpdb, $this->version, $this->slug);
 
-		$this->queue = $this->queue( $this->wpdb, $this->version, $this->slug, $this->schedulable_classes );
+		$this->queue = $this->queue($this->wpdb, $this->version, $this->slug, $this->schedulable_classes);
 
-		$this->activated = $this->activate( $this->wpdb, $this->version, $this->slug );
-		$this->deactivate( $this->wpdb, $this->version, $this->slug, $this->schedulable_classes );
+		$this->activated = $this->activate($this->wpdb, $this->version, $this->slug);
+		$this->deactivate($this->wpdb, $this->version, $this->slug, $this->schedulable_classes);
 
-		$this->logging = $this->logging( $this->wpdb, $this->version );
+		$this->logging = $this->logging($this->wpdb, $this->version);
 
-		$this->mappings = $this->mappings( $this->wpdb, $this->version, $this->slug, $this->logging );
+		$this->mappings = $this->mappings($this->wpdb, $this->version, $this->slug, $this->logging);
 
-		$this->wordpress  = $this->wordpress( $this->wpdb, $this->version, $this->slug, $this->mappings, $this->logging );
+		$this->wordpress  = $this->wordpress($this->wpdb, $this->version, $this->slug, $this->mappings, $this->logging);
 		$this->salesforce = $this->salesforce_get_api();
 
-		$this->push = $this->push( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes, $this->queue );
+		$this->push = $this->push($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes, $this->queue);
 
-		$this->pull = $this->pull( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes, $this->queue );
+		$this->pull = $this->pull($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes, $this->queue);
 
-		$this->load_admin( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->push, $this->pull, $this->logging, $this->schedulable_classes, $this->queue );
+		$this->load_admin($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->push, $this->pull, $this->logging, $this->schedulable_classes, $this->queue);
 
 	}
 
@@ -197,8 +197,8 @@ 
 	 * @param string $slug
 	 *
 	 */
-	private function load( $wpdb, $version, $slug ) {
-		require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';
+	private function load($wpdb, $version, $slug) {
+		require_once plugin_dir_path(__FILE__) . 'vendor/autoload.php';
 	}
 
 	/**
@@ -210,9 +210,9 @@ 
 	 * @param array $schedulable_classes
 	 * @return Object_Sync_Sf_Queue
 	 */
-	public function queue( $wpdb, $version, $slug, $schedulable_classes ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/class-object-sync-sf-queue.php';
-		$queue = new Object_Sync_Sf_Queue( $wpdb, $version, $slug, $schedulable_classes );
+	public function queue($wpdb, $version, $slug, $schedulable_classes) {
+		require_once plugin_dir_path(__FILE__) . 'classes/class-object-sync-sf-queue.php';
+		$queue = new Object_Sync_Sf_Queue($wpdb, $version, $slug, $schedulable_classes);
 		return $queue;
 	}
 
@@ -226,9 +226,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Logging
 	 */
-	private function logging( $wpdb, $version ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/logging.php';
-		$logging = new Object_Sync_Sf_Logging( $wpdb, $version );
+	private function logging($wpdb, $version) {
+		require_once plugin_dir_path(__FILE__) . 'classes/logging.php';
+		$logging = new Object_Sync_Sf_Logging($wpdb, $version);
 		return $logging;
 	}
 
@@ -243,9 +243,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Mapping
 	 */
-	private function mappings( $wpdb, $version, $slug, $logging ) {
-		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce_mapping.php' );
-		$mappings = new Object_Sync_Sf_Mapping( $wpdb, $version, $slug, $logging );
+	private function mappings($wpdb, $version, $slug, $logging) {
+		require_once(plugin_dir_path(__FILE__) . 'classes/salesforce_mapping.php');
+		$mappings = new Object_Sync_Sf_Mapping($wpdb, $version, $slug, $logging);
 		return $mappings;
 	}
 
@@ -261,9 +261,9 @@ 
 	* @return object
 	*   Instance of Object_Sync_Sf_WordPress
 	*/
-	private function wordpress( $wpdb, $version, $slug, $mappings, $logging ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/wordpress.php';
-		$wordpress = new Object_Sync_Sf_WordPress( $wpdb, $version, $slug, $mappings, $logging );
+	private function wordpress($wpdb, $version, $slug, $mappings, $logging) {
+		require_once plugin_dir_path(__FILE__) . 'classes/wordpress.php';
+		$wordpress = new Object_Sync_Sf_WordPress($wpdb, $version, $slug, $mappings, $logging);
 		return $wordpress;
 	}
 
@@ -276,8 +276,8 @@ 
 	*   The sfapi object if it is authenticated (empty, otherwise)
 	*/
 	public function salesforce_get_api() {
-		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce.php' );
-		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce_query.php' ); // this can be used to generate soql queries, but we don't often need it so it gets initialized whenever it's needed
+		require_once(plugin_dir_path(__FILE__) . 'classes/salesforce.php');
+		require_once(plugin_dir_path(__FILE__) . 'classes/salesforce_query.php'); // this can be used to generate soql queries, but we don't often need it so it gets initialized whenever it's needed
 		$consumer_key        = $this->login_credentials['consumer_key'];
 		$consumer_secret     = $this->login_credentials['consumer_secret'];
 		$login_url           = $this->login_credentials['login_url'];
@@ -291,9 +291,9 @@ 
 		$schedulable_classes = $this->schedulable_classes;
 		$is_authorized       = false;
 		$sfapi               = '';
-		if ( $consumer_key && $consumer_secret ) {
-			$sfapi = new Object_Sync_Sf_Salesforce( $consumer_key, $consumer_secret, $login_url, $callback_url, $authorize_path, $token_path, $rest_api_version, $wordpress, $slug, $logging, $schedulable_classes );
-			if ( $sfapi->is_authorized() === true ) {
+		if ($consumer_key && $consumer_secret) {
+			$sfapi = new Object_Sync_Sf_Salesforce($consumer_key, $consumer_secret, $login_url, $callback_url, $authorize_path, $token_path, $rest_api_version, $wordpress, $slug, $logging, $schedulable_classes);
+			if ($sfapi->is_authorized() === true) {
 				$is_authorized = true;
 			}
 		}
@@ -313,9 +313,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Activate
 	 */
-	private function activate( $wpdb, $version, $slug ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/activate.php';
-		$activate = new Object_Sync_Sf_Activate( $wpdb, $version, $slug );
+	private function activate($wpdb, $version, $slug) {
+		require_once plugin_dir_path(__FILE__) . 'classes/activate.php';
+		$activate = new Object_Sync_Sf_Activate($wpdb, $version, $slug);
 		return $activate;
 	}
 
@@ -330,9 +330,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Deactivate
 	 */
-	private function deactivate( $wpdb, $version, $slug, $schedulable_classes ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/deactivate.php';
-		$deactivate = new Object_Sync_Sf_Deactivate( $wpdb, $version, $slug, $schedulable_classes );
+	private function deactivate($wpdb, $version, $slug, $schedulable_classes) {
+		require_once plugin_dir_path(__FILE__) . 'classes/deactivate.php';
+		$deactivate = new Object_Sync_Sf_Deactivate($wpdb, $version, $slug, $schedulable_classes);
 	}
 
 
@@ -352,9 +352,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Salesforce_Push
 	 */
-	private function push( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/salesforce_push.php';
-		$push = new Object_Sync_Sf_Salesforce_Push( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue );
+	private function push($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue) {
+		require_once plugin_dir_path(__FILE__) . 'classes/salesforce_push.php';
+		$push = new Object_Sync_Sf_Salesforce_Push($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue);
 		return $push;
 	}
 
@@ -373,9 +373,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Salesforce_Pull
 	 */
-	private function pull( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/salesforce_pull.php';
-		$pull = new Object_Sync_Sf_Salesforce_Pull( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue );
+	private function pull($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue) {
+		require_once plugin_dir_path(__FILE__) . 'classes/salesforce_pull.php';
+		$pull = new Object_Sync_Sf_Salesforce_Pull($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue);
 		return $pull;
 	}
 
@@ -399,13 +399,13 @@ 
 	*   Instance of Object_Sync_Sf_Admin
 	*
 	*/
-	private function load_admin( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes, $queue ) {
-		require_once( plugin_dir_path( __FILE__ ) . 'classes/admin.php' );
-		$admin = new Object_Sync_Sf_Admin( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes, $queue );
-		add_action( 'admin_menu', array( $admin, 'create_admin_menu' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_scripts_and_styles' ) );
-		add_action( 'plugins_loaded', array( $this, 'textdomain' ) );
-		add_filter( 'plugin_action_links', array( $this, 'plugin_action_links' ), 10, 5 );
+	private function load_admin($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes, $queue) {
+		require_once(plugin_dir_path(__FILE__) . 'classes/admin.php');
+		$admin = new Object_Sync_Sf_Admin($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes, $queue);
+		add_action('admin_menu', array($admin, 'create_admin_menu'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_scripts_and_styles'));
+		add_action('plugins_loaded', array($this, 'textdomain'));
+		add_filter('plugin_action_links', array($this, 'plugin_action_links'), 10, 5);
 		return $admin;
 	}
 
@@ -417,11 +417,11 @@ 
 	* @return array $links
 	*   These are the links that go with this plugin's entry
 	*/
-	public function plugin_action_links( $links, $file ) {
-		if ( plugin_basename( __FILE__ ) === $file ) {
-			$settings = '<a href="' . get_admin_url() . 'options-general.php?page=object-sync-salesforce-admin">' . __( 'Settings', 'object-sync-for-salesforce' ) . '</a>';
+	public function plugin_action_links($links, $file) {
+		if (plugin_basename(__FILE__) === $file) {
+			$settings = '<a href="' . get_admin_url() . 'options-general.php?page=object-sync-salesforce-admin">' . __('Settings', 'object-sync-for-salesforce') . '</a>';
 			// make the 'Settings' link appear first
-			array_unshift( $links, $settings );
+			array_unshift($links, $settings);
 		}
 		return $links;
 	}
@@ -435,7 +435,7 @@ 
 	public function admin_scripts_and_styles() {
 
 		// I think some developers might not want to bother with select2 or selectwoo, so let's allow that to be changeable
-		$select_library = apply_filters( 'object_sync_for_salesforce_select_library', 'selectwoo' );
+		$select_library = apply_filters('object_sync_for_salesforce_select_library', 'selectwoo');
 
 		/*
 		 * example to modify the select library
@@ -447,19 +447,19 @@ 
 		 * }
 		*/
 
-		$javascript_dependencies = array( 'jquery' );
+		$javascript_dependencies = array('jquery');
 		$css_dependencies        = array();
-		if ( '' !== $select_library ) {
-			wp_enqueue_script( $select_library . 'js', plugins_url( 'assets/js/' . $select_library . '.min.js', __FILE__ ), array( 'jquery' ), filemtime( plugin_dir_path( __FILE__ ) . 'assets/js/' . $select_library . '.min.js' ), true );
+		if ('' !== $select_library) {
+			wp_enqueue_script($select_library . 'js', plugins_url('assets/js/' . $select_library . '.min.js', __FILE__), array('jquery'), filemtime(plugin_dir_path(__FILE__) . 'assets/js/' . $select_library . '.min.js'), true);
 			$javascript_dependencies[] = $select_library . 'js';
 
-			wp_enqueue_style( $select_library . 'css', plugins_url( 'assets/css/' . $select_library . '.min.css', __FILE__ ), array(), filemtime( plugin_dir_path( __FILE__ ) . 'assets/css/' . $select_library . '.min.css' ), 'all' );
+			wp_enqueue_style($select_library . 'css', plugins_url('assets/css/' . $select_library . '.min.css', __FILE__), array(), filemtime(plugin_dir_path(__FILE__) . 'assets/css/' . $select_library . '.min.css'), 'all');
 			$css_dependencies[] = $select_library . 'css';
 		}
 
-		wp_enqueue_script( $this->slug . '-admin', plugins_url( 'assets/js/object-sync-for-salesforce-admin.min.js', __FILE__ ), $javascript_dependencies, filemtime( plugin_dir_path( __FILE__ ) . 'assets/js/object-sync-for-salesforce-admin.min.js' ), true );
+		wp_enqueue_script($this->slug . '-admin', plugins_url('assets/js/object-sync-for-salesforce-admin.min.js', __FILE__), $javascript_dependencies, filemtime(plugin_dir_path(__FILE__) . 'assets/js/object-sync-for-salesforce-admin.min.js'), true);
 
-		wp_enqueue_style( $this->slug . '-admin', plugins_url( 'assets/css/object-sync-for-salesforce-admin.min.css', __FILE__ ), $css_dependencies, filemtime( plugin_dir_path( __FILE__ ) . 'assets/css/object-sync-for-salesforce-admin.min.css' ), 'all' );
+		wp_enqueue_style($this->slug . '-admin', plugins_url('assets/css/object-sync-for-salesforce-admin.min.css', __FILE__), $css_dependencies, filemtime(plugin_dir_path(__FILE__) . 'assets/css/object-sync-for-salesforce-admin.min.css'), 'all');
 	}
 
 	/**
@@ -468,7 +468,7 @@ 
 	 * @return void
 	 */
 	public function textdomain() {
-		load_plugin_textdomain( 'object-sync-for-salesforce', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
+		load_plugin_textdomain('object-sync-for-salesforce', false, dirname(plugin_basename(__FILE__)) . '/languages/');
 	}
 
 	/**
@@ -481,13 +481,13 @@ 
 	*/
 	private function get_login_credentials() {
 
-		$consumer_key       = defined( 'OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY' ) ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY : get_option( 'object_sync_for_salesforce_consumer_key', '' );
-		$consumer_secret    = defined( 'OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET' ) ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET : get_option( 'object_sync_for_salesforce_consumer_secret', '' );
-		$callback_url       = defined( 'OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL' ) ? OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL : get_option( 'object_sync_for_salesforce_callback_url', '' );
-		$login_base_url     = defined( 'OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL' ) ? OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL : get_option( 'object_sync_for_salesforce_login_base_url', '' );
-		$authorize_url_path = defined( 'OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH' ) ? OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH : get_option( 'object_sync_for_salesforce_authorize_url_path', '' );
-		$token_url_path     = defined( 'OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH' ) ? OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH : get_option( 'object_sync_for_salesforce_token_url_path', '' );
-		$api_version        = defined( 'OBJECT_SYNC_SF_SALESFORCE_API_VERSION' ) ? OBJECT_SYNC_SF_SALESFORCE_API_VERSION : get_option( 'object_sync_for_salesforce_api_version', '' );
+		$consumer_key       = defined('OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY') ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY : get_option('object_sync_for_salesforce_consumer_key', '');
+		$consumer_secret    = defined('OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET') ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET : get_option('object_sync_for_salesforce_consumer_secret', '');
+		$callback_url       = defined('OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL') ? OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL : get_option('object_sync_for_salesforce_callback_url', '');
+		$login_base_url     = defined('OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL') ? OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL : get_option('object_sync_for_salesforce_login_base_url', '');
+		$authorize_url_path = defined('OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH') ? OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH : get_option('object_sync_for_salesforce_authorize_url_path', '');
+		$token_url_path     = defined('OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH') ? OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH : get_option('object_sync_for_salesforce_token_url_path', '');
+		$api_version        = defined('OBJECT_SYNC_SF_SALESFORCE_API_VERSION') ? OBJECT_SYNC_SF_SALESFORCE_API_VERSION : get_option('object_sync_for_salesforce_api_version', '');
 
 		$login_credentials = array(
 			'consumer_key'     => $consumer_key,