MinnPost / object-sync-for-salesforce

classes/salesforce_push.php

Indentation +145 added lines, -145 removed lines

@@ -26,26 +26,26 @@ 
 	protected $queue;
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	public $schedule_name; // allow for naming the queue in case there are multiple queues
 
 	/**
-	* Constructor which sets up push schedule
-	*
-	* @param object $wpdb
-	* @param string $version
-	* @param array $login_credentials
-	* @param string $slug
-	* @param string $option_prefix
-	* @param object $wordpress
-	* @param object $salesforce
-	* @param object $mappings
-	* @param object $logging
-	* @param array $schedulable_classes
-	* @param object $queue
-	* @throws \Object_Sync_Sf_Exception
-	*/
+	 * Constructor which sets up push schedule
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param array $login_credentials
+	 * @param string $slug
+	 * @param string $option_prefix
+	 * @param object $wordpress
+	 * @param object $salesforce
+	 * @param object $mappings
+	 * @param object $logging
+	 * @param array $schedulable_classes
+	 * @param object $queue
+	 * @throws \Object_Sync_Sf_Exception
+	 */
 	public function __construct( $wpdb, $version, $login_credentials, $slug, $option_prefix, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue ) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
@@ -69,10 +69,10 @@ 
 	}
 
 	/**
-	* Create the action hooks based on what object maps exist from the admin settings.
-	* We do not have any actions for blogroll at this time.
-	*
-	*/
+	 * Create the action hooks based on what object maps exist from the admin settings.
+	 * We do not have any actions for blogroll at this time.
+	 *
+	 */
 	public function add_actions() {
 		$db_version = get_option( $this->option_prefix . 'db_version', false );
 		if ( $db_version === $this->version ) {
@@ -113,63 +113,63 @@ 
 	}
 
 	/**
-	* Method for ajax hooks to call for pushing manually
-	*
-	* @param array $object
-	* @param string $type
-	*
-	*/
+	 * Method for ajax hooks to call for pushing manually
+	 *
+	 * @param array $object
+	 * @param string $type
+	 *
+	 */
 	public function manual_object_update( $object, $type ) {
 		$this->salesforce_push_object_crud( $type, $object, $this->mappings->sync_wordpress_update, true );
 	}
 
 	/**
-	* Callback method for adding a user
-	*
-	* @param string $user_id
-	*/
+	 * Callback method for adding a user
+	 *
+	 * @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' );
 	}
 
 	/**
-	* Callback method for adding a user via the Ultimate Member plugin
-	*
-	* @param string $user_id
-	*/
+	 * Callback method for adding a user via the Ultimate Member plugin
+	 *
+	 * @param string $user_id
+	 */
 	public function um_add_user( $user_id, $form_data = array() ) {
 		$this->object_insert( $form_data, 'user' );
 	}
 
 	/**
-	* Callback method for editing a user
-	*
-	* @param string $user_id
-	* @param object $old_user_data
-	*/
+	 * Callback method for editing a user
+	 *
+	 * @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' );
 	}
 
 	/**
-	* Callback method for deleting a user
-	*
-	* @param string $user_id
-	*/
+	 * Callback method for deleting a user
+	 *
+	 * @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' );
 	}
 
 	/**
-	* Callback method for posts of any type
-	* This can handle create, update, and delete actions
-	*
-	* @param string $post_id
-	* @param object $post
-	*/
+	 * Callback method for posts of any type
+	 * This can handle create, update, and delete actions
+	 *
+	 * @param string $post_id
+	 * @param object $post
+	 */
 	public function post_actions( $post_id, $post ) {
 
 		$post_type = $post->post_type;
@@ -216,66 +216,66 @@ 
 	}
 
 	/**
-	* Callback method for adding an attachment
-	*
-	* @param string $post_id
-	*/
+	 * Callback method for adding an attachment
+	 *
+	 * @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' );
 	}
 
 	/**
-	* Callback method for editing an attachment
-	*
-	* @param string $post_id
-	*/
+	 * Callback method for editing an attachment
+	 *
+	 * @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' );
 	}
 
 	/**
-	* Callback method for editing an attachment
-	*
-	* @param string $post_id
-	*/
+	 * Callback method for editing an attachment
+	 *
+	 * @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' );
 	}
 
 	/**
-	* Callback method for adding a term
-	*
-	* @param string $term_id
-	* @param string $tt_id
-	* @param string $taxonomy
-	*/
+	 * Callback method for adding a term
+	 *
+	 * @param string $term_id
+	 * @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 );
 	}
 
 	/**
-	* Callback method for editing a term
-	*
-	* @param string $term_id
-	* @param string $taxonomy
-	*/
+	 * Callback method for editing a term
+	 *
+	 * @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 );
 	}
 
 	/**
-	* Callback method for deleting a term
-	*
-	* @param int $term (id)
-	* @param int $term_taxonomy_id
-	* @param string $taxonomy (slug)
-	* @param object $deleted_term
-	*/
+	 * Callback method for deleting a term
+	 *
+	 * @param int $term (id)
+	 * @param int $term_taxonomy_id
+	 * @param string $taxonomy (slug)
+	 * @param object $deleted_term
+	 */
 	public function delete_term( $term, $tt_id, $taxonomy, $deleted_term ) {
 		$deleted_term = (array) $deleted_term;
 		$type         = $deleted_term['taxonomy'];
@@ -283,75 +283,75 @@ 
 	}
 
 	/**
-	* Callback method for adding a comment
-	*
-	* @param string $comment_id
-	* @param int|string comment_approved
-	* @param array $commentdata
-	*/
+	 * Callback method for adding a comment
+	 *
+	 * @param string $comment_id
+	 * @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' );
 	}
 
 	/**
-	* Callback method for editing a comment
-	*
-	* @param string $comment_id
-	*/
+	 * Callback method for editing a comment
+	 *
+	 * @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' );
 	}
 
 	/**
-	* Callback method for deleting a comment
-	*
-	* @param string $comment_id
-	*/
+	 * Callback method for deleting a comment
+	 *
+	 * @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' );
 	}
 
 	/**
-	* Insert a new object
-	* This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
-	*/
+	 * 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 );
 	}
 
 	/**
-	* Update an existing object
-	* This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
-	*/
+	 * 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 );
 	}
 
 	/**
-	* Delete an existing object
-	* This calls the overall push crud method, which controls queuing and sending data to the Salesforce class
-	*/
+	 * 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 );
 	}
 
 	/**
-	* Push objects to Salesforce.
-	* This method decides whether to do the processing immediately or queue it to the schedule class (or skip it based on another plugin's activity)
-	*
-	* @param string $object_type
-	*   Type of WordPress object.
-	* @param array $object
-	*   The WordPress data that needs to be sent to Salesforce.
-	* @param int $sf_sync_trigger
-	*   The trigger being responded to.
-	* @param bool $manual
-	*   Are we calling this manually?
-	*
-	*/
+	 * Push objects to Salesforce.
+	 * This method decides whether to do the processing immediately or queue it to the schedule class (or skip it based on another plugin's activity)
+	 *
+	 * @param string $object_type
+	 *   Type of WordPress object.
+	 * @param array $object
+	 *   The WordPress data that needs to be sent to Salesforce.
+	 * @param int $sf_sync_trigger
+	 *   The trigger being responded to.
+	 * @param bool $manual
+	 *   Are we calling this manually?
+	 *
+	 */
 	private function salesforce_push_object_crud( $object_type, $object, $sf_sync_trigger, $manual = false ) {
 
 		$structure       = $this->wordpress->get_wordpress_table_structure( $object_type );
@@ -475,20 +475,20 @@ 
 	}
 
 	/**
-	* Sync WordPress objects and Salesforce objects using the REST API.
-	*
-	* @param string $object_type
-	*   Type of WordPress object.
-	* @param array|int $object|$object_id
-	*   The WordPress object data or its ID.
-	* @param array $mapping|$mapping_id
-	*   Salesforce field mapping data array or ID.
-	* @param int $sf_sync_trigger
-	*   Trigger for this sync.
-	*
-	* @return true or exit the method
-	*
-	*/
+	 * Sync WordPress objects and Salesforce objects using the REST API.
+	 *
+	 * @param string $object_type
+	 *   Type of WordPress object.
+	 * @param array|int $object|$object_id
+	 *   The WordPress object data or its ID.
+	 * @param array $mapping|$mapping_id
+	 *   Salesforce field mapping data array or ID.
+	 * @param int $sf_sync_trigger
+	 *   Trigger for this sync.
+	 *
+	 * @return true or exit the method
+	 *
+	 */
 	public function salesforce_push_sync_rest( $object_type, $object, $mapping, $sf_sync_trigger ) {
 
 		if ( is_int( $object ) ) {
@@ -1041,21 +1041,21 @@ 
 	}
 
 	/**
-	* Create an object map between a WordPress object and a Salesforce object
-	*
-	* @param array $wordpress_object
-	*   Array of the WordPress object's data
-	* @param string $id_field_name
-	*   How this object names its primary field. ie Id or comment_id or whatever
-	* @param string $salesforce_id
-	*   Unique identifier for the Salesforce object
-	* @param array $field_mapping
-	*   The row that maps the object types together, including which fields match which other fields
-	*
-	* @return int $wpdb->insert_id
-	*   This is the database row for the map object
-	*
-	*/
+	 * Create an object map between a WordPress object and a Salesforce object
+	 *
+	 * @param array $wordpress_object
+	 *   Array of the WordPress object's data
+	 * @param string $id_field_name
+	 *   How this object names its primary field. ie Id or comment_id or whatever
+	 * @param string $salesforce_id
+	 *   Unique identifier for the Salesforce object
+	 * @param array $field_mapping
+	 *   The row that maps the object types together, including which fields match which other fields
+	 *
+	 * @return int $wpdb->insert_id
+	 *   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 ) {
 
 		if ( true === $pending ) {

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();
 }
 
@@ -46,7 +46,7 @@ 
 	* @param object $queue
 	* @throws \Object_Sync_Sf_Exception
 	*/
-	public function __construct( $wpdb, $version, $login_credentials, $slug, $option_prefix, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue ) {
+	public function __construct($wpdb, $version, $login_credentials, $slug, $option_prefix, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
 		$this->login_credentials   = $login_credentials;
@@ -62,9 +62,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( $this->option_prefix . 'debug_mode', false );
+		$this->debug = get_option($this->option_prefix . 'debug_mode', false);
 
 	}
 
@@ -74,41 +74,41 @@ 
 	*
 	*/
 	public function add_actions() {
-		$db_version = get_option( $this->option_prefix . 'db_version', false );
-		if ( $db_version === $this->version ) {
-			foreach ( $this->mappings->get_fieldmaps() as $mapping ) {
+		$db_version = get_option($this->option_prefix . '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( $this->option_prefix . 'push_record', array( $this, 'salesforce_push_sync_rest' ), 10, 4 );
+		add_action($this->option_prefix . 'push_record', array($this, 'salesforce_push_sync_rest'), 10, 4);
 
 	}
 
@@ -119,8 +119,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);
 	}
 
 	/**
@@ -128,9 +128,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');
 	}
 
 	/**
@@ -138,8 +138,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');
 	}
 
 	/**
@@ -148,9 +148,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');
 	}
 
 	/**
@@ -158,9 +158,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');
 	}
 
 	/**
@@ -170,48 +170,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);
 		}
 	}
 
@@ -220,9 +220,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');
 	}
 
 	/**
@@ -230,9 +230,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');
 	}
 
 	/**
@@ -240,9 +240,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');
 	}
 
 	/**
@@ -252,9 +252,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);
 	}
 
 	/**
@@ -263,9 +263,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);
 	}
 
 	/**
@@ -276,10 +276,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);
 	}
 
 	/**
@@ -289,9 +289,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');
 	}
 
 	/**
@@ -299,9 +299,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');
 	}
 
 	/**
@@ -309,33 +309,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);
 	}
 
 	/**
@@ -352,50 +352,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
@@ -412,14 +412,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( $this->option_prefix . 'push_object_allowed', true, $object_type, $object, $sf_sync_trigger, $mapping );
+				$push_allowed = apply_filters($this->option_prefix . 'push_object_allowed', true, $object_type, $object, $sf_sync_trigger, $mapping);
 
 				// example to keep from pushing the user with id of 1
 				/*
@@ -432,18 +432,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 below code does not perform well, worst case scenario is we could save $data to a custom table, and pass the id to the callback method.
@@ -457,18 +457,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().
@@ -489,35 +489,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( $this->option_prefix . 'push_mapping_object', $mapping_object, $object, $mapping );
+		$mapping_object = apply_filters($this->option_prefix . '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(
@@ -531,84 +531,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( $this->option_prefix . 'push_fail', $op, $sfapi->response, $synced_object, $object_id );
+						do_action($this->option_prefix . '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( $this->option_prefix . 'push_success', $op, $sfapi->response, $synced_object, $object_id );
+						do_action($this->option_prefix . '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>';
@@ -618,34 +618,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
 
@@ -653,52 +653,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( $this->option_prefix . 'push_params_modify', $params, $mapping, $object, $sf_sync_trigger, false, $is_new );
+		$params = apply_filters($this->option_prefix . '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,
@@ -707,7 +707,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'];
 			}
 
@@ -719,61 +719,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( $this->option_prefix . 'find_sf_object_match', null, $object, $mapping, 'push' );
+				$salesforce_id = apply_filters($this->option_prefix . '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( $this->option_prefix . 'pre_push', $salesforce_id, $mapping, $object, $object_id, $params );
+				do_action($this->option_prefix . '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( $this->option_prefix . 'push_update_params_modify', $params, $salesforce_id, $mapping, $object );
+				$params = apply_filters($this->option_prefix . '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.
@@ -784,43 +784,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( $this->option_prefix . 'push_fail', $op, $sfapi->response, $synced_object );
+				do_action($this->option_prefix . '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'];
 			}
@@ -829,78 +829,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( $this->option_prefix . 'push_success', $op, $sfapi->response, $synced_object, $object_id );
+				do_action($this->option_prefix . '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( $this->option_prefix . 'push_fail', $op, $sfapi->response, $synced_object );
+				do_action($this->option_prefix . 'push_fail', $op, $sfapi->response, $synced_object);
 
 				return;
 			} // End if().
@@ -908,41 +908,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;
@@ -953,71 +953,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( $this->option_prefix . 'pre_push', $mapping_object['salesforce_id'], $mapping, $object, $object_id, $params );
+				do_action($this->option_prefix . '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( $this->option_prefix . 'push_update_params_modify', $params, $mapping_object['salesforce_id'], $mapping, $object );
+				$params = apply_filters($this->option_prefix . '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( $this->option_prefix . 'push_success', $op, $sfapi->response, $synced_object, $object_id );
+				do_action($this->option_prefix . '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
 				);
 
@@ -1025,16 +1025,16 @@ 
 				$mapping_object['last_sync_message'] = $e->getMessage();
 
 				// hook for push fail
-				do_action( $this->option_prefix . 'push_fail', $op, $sfapi->response, $synced_object );
+				do_action($this->option_prefix . '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
 
@@ -1056,9 +1056,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';
@@ -1067,15 +1067,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,
 			)

classes/salesforce.php

Indentation +408 added lines, -408 removed lines

@@ -17,33 +17,33 @@ 
 	public $response;
 
 	/**
-	* Constructor which initializes the Salesforce APIs.
-	*
-	* @param string $consumer_key
-	*   Salesforce key to connect to your Salesforce instance.
-	* @param string $consumer_secret
-	*   Salesforce secret to connect to your Salesforce instance.
-	* @param string $login_url
-	*   Login URL for Salesforce auth requests - differs for production and sandbox
-	* @param string $callback_url
-	*   WordPress URL where Salesforce should send you after authentication
-	* @param string $authorize_path
-	*   Oauth path that Salesforce wants
-	* @param string $token_path
-	*   Path Salesforce uses to give you a token
-	* @param string $rest_api_version
-	*   What version of the Salesforce REST API to use
-	* @param object $wordpress
-	*   Object for doing things to WordPress - retrieving data, cache, etc.
-	* @param string $slug
-	*   Slug for this plugin. Can be used for file including, especially
-	* @param string $option_prefix
-	*   Option prefix for this plugin. Used for getting and setting options, actions, etc.
-	* @param object $logging
-	*   Logging object for this plugin.
-	* @param array $schedulable_classes
-	*   array of classes that can have scheduled tasks specific to them
-	*/
+	 * Constructor which initializes the Salesforce APIs.
+	 *
+	 * @param string $consumer_key
+	 *   Salesforce key to connect to your Salesforce instance.
+	 * @param string $consumer_secret
+	 *   Salesforce secret to connect to your Salesforce instance.
+	 * @param string $login_url
+	 *   Login URL for Salesforce auth requests - differs for production and sandbox
+	 * @param string $callback_url
+	 *   WordPress URL where Salesforce should send you after authentication
+	 * @param string $authorize_path
+	 *   Oauth path that Salesforce wants
+	 * @param string $token_path
+	 *   Path Salesforce uses to give you a token
+	 * @param string $rest_api_version
+	 *   What version of the Salesforce REST API to use
+	 * @param object $wordpress
+	 *   Object for doing things to WordPress - retrieving data, cache, etc.
+	 * @param string $slug
+	 *   Slug for this plugin. Can be used for file including, especially
+	 * @param string $option_prefix
+	 *   Option prefix for this plugin. Used for getting and setting options, actions, etc.
+	 * @param object $logging
+	 *   Logging object for this plugin.
+	 * @param array $schedulable_classes
+	 *   array of classes that can have scheduled tasks specific to them
+	 */
 	public function __construct( $consumer_key, $consumer_secret, $login_url, $callback_url, $authorize_path, $token_path, $rest_api_version, $wordpress, $slug, $option_prefix, $logging, $schedulable_classes ) {
 		$this->consumer_key        = $consumer_key;
 		$this->consumer_secret     = $consumer_secret;
@@ -73,14 +73,14 @@ 
 	}
 
 	/**
-	* Converts a 15-character case-sensitive Salesforce ID to 18-character
-	* case-insensitive ID. If input is not 15-characters, return input unaltered.
-	*
-	* @param string $sf_id_15
-	*   15-character case-sensitive Salesforce ID
-	* @return string
-	*   18-character case-insensitive Salesforce ID
-	*/
+	 * Converts a 15-character case-sensitive Salesforce ID to 18-character
+	 * case-insensitive ID. If input is not 15-characters, return input unaltered.
+	 *
+	 * @param string $sf_id_15
+	 *   15-character case-sensitive Salesforce ID
+	 * @return string
+	 *   18-character case-insensitive Salesforce ID
+	 */
 	public static function convert_id( $sf_id_15 ) {
 		if ( strlen( $sf_id_15 ) !== 15 ) {
 			return $sf_id_15;
@@ -100,17 +100,17 @@ 
 	}
 
 	/**
-	* Given a Salesforce ID, return the corresponding SObject name. (Based on
-	*  keyPrefix from object definition, @see
-	*  https://developer.salesforce.com/forums/?id=906F0000000901ZIAQ )
-	*
-	* @param string $sf_id
-	*   15- or 18-character Salesforce ID
-	* @return string
-	*   sObject name, e.g. "Account", "Contact", "my__Custom_Object__c" or FALSE
-	*   if no match could be found.
-	* @throws Object_Sync_Sf_Exception
-	*/
+	 * Given a Salesforce ID, return the corresponding SObject name. (Based on
+	 *  keyPrefix from object definition, @see
+	 *  https://developer.salesforce.com/forums/?id=906F0000000901ZIAQ )
+	 *
+	 * @param string $sf_id
+	 *   15- or 18-character Salesforce ID
+	 * @return string
+	 *   sObject name, e.g. "Account", "Contact", "my__Custom_Object__c" or FALSE
+	 *   if no match could be found.
+	 * @throws Object_Sync_Sf_Exception
+	 */
 	public function get_sobject_type( $sf_id ) {
 		$objects = $this->objects(
 			array(
@@ -127,17 +127,17 @@ 
 	}
 
 	/**
-	* Determine if this SF instance is fully configured.
-	*
-	*/
+	 * Determine if this SF instance is fully configured.
+	 *
+	 */
 	public function is_authorized() {
 		return ! empty( $this->consumer_key ) && ! empty( $this->consumer_secret ) && $this->get_refresh_token();
 	}
 
 	/**
-	* Get REST API versions available on this Salesforce organization
-	* This is not an authenticated call, so it would not be a helpful test
-	*/
+	 * Get REST API versions available on this Salesforce organization
+	 * This is not an authenticated call, so it would not be a helpful test
+	 */
 	public function get_api_versions() {
 		$options = array(
 			'authenticated' => false,
@@ -147,26 +147,26 @@ 
 	}
 
 	/**
-	* Make a call to the Salesforce REST API.
-	*
-	* @param string $path
-	*   Path to resource.
-	* @param array $params
-	*   Parameters to provide.
-	* @param string $method
-	*   Method to initiate the call, such as GET or POST. Defaults to GET.
-	* @param array $options
-	*   Any method can supply options for the API call, and they'll be preserved as far as the curl request
-	*   They get merged with the class options
-	* @param string $type
-	*   Type of call. Defaults to 'rest' - currently we don't support other types.
-	*   Other exammple in Drupal is 'apexrest'
-	*
-	* @return mixed
-	*   The requested response.
-	*
-	* @throws Object_Sync_Sf_Exception
-	*/
+	 * Make a call to the Salesforce REST API.
+	 *
+	 * @param string $path
+	 *   Path to resource.
+	 * @param array $params
+	 *   Parameters to provide.
+	 * @param string $method
+	 *   Method to initiate the call, such as GET or POST. Defaults to GET.
+	 * @param array $options
+	 *   Any method can supply options for the API call, and they'll be preserved as far as the curl request
+	 *   They get merged with the class options
+	 * @param string $type
+	 *   Type of call. Defaults to 'rest' - currently we don't support other types.
+	 *   Other exammple in Drupal is 'apexrest'
+	 *
+	 * @return mixed
+	 *   The requested response.
+	 *
+	 * @throws Object_Sync_Sf_Exception
+	 */
 	public function api_call( $path, $params = array(), $method = 'GET', $options = array(), $type = 'rest' ) {
 		if ( ! $this->get_access_token() ) {
 			$this->refresh_token();
@@ -217,25 +217,25 @@ 
 	}
 
 	/**
-	* Private helper to issue an SF API request.
-	* This method is the only place where we read to or write from the cache
-	*
-	* @param string $path
-	*   Path to resource.
-	* @param array $params
-	*   Parameters to provide.
-	* @param string $method
-	*   Method to initiate the call, such as GET or POST.  Defaults to GET.
-	* @param array $options
-	*   This is the options array from the api_call method
-	*   This is where it gets merged with $this->options
-	* @param string $type
-	*   Type of call. Defaults to 'rest' - currently we don't support other types
-	*   Other exammple in Drupal is 'apexrest'
-	*
-	* @return array
-	*   The requested data.
-	*/
+	 * Private helper to issue an SF API request.
+	 * This method is the only place where we read to or write from the cache
+	 *
+	 * @param string $path
+	 *   Path to resource.
+	 * @param array $params
+	 *   Parameters to provide.
+	 * @param string $method
+	 *   Method to initiate the call, such as GET or POST.  Defaults to GET.
+	 * @param array $options
+	 *   This is the options array from the api_call method
+	 *   This is where it gets merged with $this->options
+	 * @param string $type
+	 *   Type of call. Defaults to 'rest' - currently we don't support other types
+	 *   Other exammple in Drupal is 'apexrest'
+	 *
+	 * @return array
+	 *   The requested data.
+	 */
 	protected function api_http_request( $path, $params, $method, $options = array(), $type = 'rest' ) {
 		$options = array_merge( $this->options, $options ); // this will override a value in $this->options with the one in $options if there is a matching key
 		$url     = $this->get_api_endpoint( $type ) . $path;
@@ -313,22 +313,22 @@ 
 	}
 
 	/**
-	* Make the HTTP request. Wrapper around curl().
-	*
-	* @param string $url
-	*   Path to make request from.
-	* @param array $data
-	*   The request body.
-	* @param array $headers
-	*   Request headers to send as name => value.
-	* @param string $method
-	*   Method to initiate the call, such as GET or POST. Defaults to GET.
-	* @param array $options
-	*   This is the options array from the api_http_request method
-	*
-	* @return array
-	*   Salesforce response object.
-	*/
+	 * Make the HTTP request. Wrapper around curl().
+	 *
+	 * @param string $url
+	 *   Path to make request from.
+	 * @param array $data
+	 *   The request body.
+	 * @param array $headers
+	 *   Request headers to send as name => value.
+	 * @param string $method
+	 *   Method to initiate the call, such as GET or POST. Defaults to GET.
+	 * @param array $options
+	 *   This is the options array from the api_http_request method
+	 *
+	 * @return array
+	 *   Salesforce response object.
+	 */
 	protected function http_request( $url, $data, $headers = array(), $method = 'GET', $options = array() ) {
 		// Build the request, including path and headers. Internal use.
 
@@ -463,14 +463,14 @@ 
 	}
 
 	/**
-	* Get the API end point for a given type of the API.
-	*
-	* @param string $api_type
-	*   E.g., rest, partner, enterprise.
-	*
-	* @return string
-	*   Complete URL endpoint for API access.
-	*/
+	 * Get the API end point for a given type of the API.
+	 *
+	 * @param string $api_type
+	 *   E.g., rest, partner, enterprise.
+	 *
+	 * @return string
+	 *   Complete URL endpoint for API access.
+	 */
 	public function get_api_endpoint( $api_type = 'rest' ) {
 		// Special handling for apexrest, since it's not in the identity object.
 		if ( 'apexrest' === $api_type ) {
@@ -486,67 +486,67 @@ 
 	}
 
 	/**
-	* Get the SF instance URL. Useful for linking to objects.
-	*/
+	 * Get the SF instance URL. Useful for linking to objects.
+	 */
 	public function get_instance_url() {
 		return get_option( $this->option_prefix . 'instance_url', '' );
 	}
 
 	/**
-	* Set the SF instanc URL.
-	*
-	* @param string $url
-	*   URL to set.
-	*/
+	 * Set the SF instanc URL.
+	 *
+	 * @param string $url
+	 *   URL to set.
+	 */
 	protected function set_instance_url( $url ) {
 		update_option( $this->option_prefix . 'instance_url', $url );
 	}
 
 	/**
-	* Get the access token.
-	*/
+	 * Get the access token.
+	 */
 	public function get_access_token() {
 		return get_option( $this->option_prefix . 'access_token', '' );
 	}
 
 	/**
-	* Set the access token.
-	*
-	* It is stored in session.
-	*
-	* @param string $token
-	*   Access token from Salesforce.
-	*/
+	 * Set the access token.
+	 *
+	 * It is stored in session.
+	 *
+	 * @param string $token
+	 *   Access token from Salesforce.
+	 */
 	protected function set_access_token( $token ) {
 		update_option( $this->option_prefix . 'access_token', $token );
 	}
 
 	/**
-	* Get refresh token.
-	*/
+	 * Get refresh token.
+	 */
 	protected function get_refresh_token() {
 		return get_option( $this->option_prefix . 'refresh_token', '' );
 	}
 
 	/**
-	* Set refresh token.
-	*
-	* @param string $token
-	*   Refresh token from Salesforce.
-	*/
+	 * Set refresh token.
+	 *
+	 * @param string $token
+	 *   Refresh token from Salesforce.
+	 */
 	protected function set_refresh_token( $token ) {
 		update_option( $this->option_prefix . 'refresh_token', $token );
 	}
 
 	/**
-	* Refresh access token based on the refresh token. Updates session variable.
-	*
-	* todo: figure out how to do this as part of the schedule class
-	* this is a scheduleable class and so we could add a method from this class to run every 24 hours, but it's unclear to me that we need it. salesforce seems to refresh itself as it needs to.
-	* but it could be a performance boost to do it at scheduleable intervals instead.
-	*
-	* @throws Object_Sync_Sf_Exception
-	*/
+	 * Refresh access token based on the refresh token. Updates session variable.
+	 *
+	 * todo: figure out how to do this as part of the schedule class
+	 * this is a scheduleable class and so we could add a method from this class to run every 24 hours, but it's unclear to me that we need it. salesforce seems to refresh itself as it needs to.
+	 * but it could be a performance boost to do it at scheduleable intervals instead.
+	 *
+	 * @throws Object_Sync_Sf_Exception
+	 */
 	protected function refresh_token() {
 		$refresh_token = $this->get_refresh_token();
 		if ( empty( $refresh_token ) ) {
@@ -593,13 +593,13 @@ 
 	}
 
 	/**
-	* Retrieve and store the Salesforce identity given an ID url.
-	*
-	* @param string $id
-	*   Identity URL.
-	*
-	* @throws Object_Sync_Sf_Exception
-	*/
+	 * Retrieve and store the Salesforce identity given an ID url.
+	 *
+	 * @param string $id
+	 *   Identity URL.
+	 *
+	 * @throws Object_Sync_Sf_Exception
+	 */
 	protected function set_identity( $id ) {
 		$headers  = array(
 			'Authorization'   => 'Authorization: OAuth ' . $this->get_access_token(),
@@ -615,18 +615,18 @@ 
 	}
 
 	/**
-	* Return the Salesforce identity, which is stored in a variable.
-	*
-	* @return array
-	*   Returns FALSE if no identity has been stored.
-	*/
+	 * Return the Salesforce identity, which is stored in a variable.
+	 *
+	 * @return array
+	 *   Returns FALSE if no identity has been stored.
+	 */
 	public function get_identity() {
 		return get_option( $this->option_prefix . 'identity', false );
 	}
 
 	/**
-	* OAuth step 1: Redirect to Salesforce and request and authorization code.
-	*/
+	 * OAuth step 1: Redirect to Salesforce and request and authorization code.
+	 */
 	public function get_authorization_code() {
 		$url = add_query_arg(
 			array(
@@ -640,11 +640,11 @@ 
 	}
 
 	/**
-	* OAuth step 2: Exchange an authorization code for an access token.
-	*
-	* @param string $code
-	*   Code from Salesforce.
-	*/
+	 * OAuth step 2: Exchange an authorization code for an access token.
+	 *
+	 * @param string $code
+	 *   Code from Salesforce.
+	 */
 	public function request_token( $code ) {
 		$data = array(
 			'code'          => $code,
@@ -689,22 +689,22 @@ 
 	/* Core API calls */
 
 	/**
-	* Available objects and their metadata for your organization's data.
-	*
-	* @param array $conditions
-	*   Associative array of filters to apply to the returned objects. Filters
-	*   are applied after the list is returned from Salesforce.
-	* @param bool $reset
-	*   Whether to reset the cache and retrieve a fresh version from Salesforce.
-	*
-	* @return array
-	*   Available objects and metadata.
-	*
-	* part of core API calls. this call does require authentication, and the basic url it becomes is like this:
-	* https://instance.salesforce.com/services/data/v#.0/sobjects
-	*
-	* updateable is really how the api spells it
-	*/
+	 * Available objects and their metadata for your organization's data.
+	 *
+	 * @param array $conditions
+	 *   Associative array of filters to apply to the returned objects. Filters
+	 *   are applied after the list is returned from Salesforce.
+	 * @param bool $reset
+	 *   Whether to reset the cache and retrieve a fresh version from Salesforce.
+	 *
+	 * @return array
+	 *   Available objects and metadata.
+	 *
+	 * part of core API calls. this call does require authentication, and the basic url it becomes is like this:
+	 * https://instance.salesforce.com/services/data/v#.0/sobjects
+	 *
+	 * updateable is really how the api spells it
+	 */
 	public function objects(
 		$conditions = array(
 			'updateable'  => true,
@@ -734,22 +734,22 @@ 
 	}
 
 	/**
-	* Use SOQL to get objects based on query string.
-	*
-	* @param string $query
-	*   The SOQL query.
-	* @param array $options
-	*   Allow for the query to have options based on what the user needs from it, ie caching, read/write, etc.
-	* @param boolean $all
-	*   Whether this should get all results for the query
-	* @param boolean $explain
-	*   If set, Salesforce will return feedback on the query performance
-	*
-	* @return array
-	*   Array of Salesforce objects that match the query.
-	*
-	* part of core API calls
-	*/
+	 * Use SOQL to get objects based on query string.
+	 *
+	 * @param string $query
+	 *   The SOQL query.
+	 * @param array $options
+	 *   Allow for the query to have options based on what the user needs from it, ie caching, read/write, etc.
+	 * @param boolean $all
+	 *   Whether this should get all results for the query
+	 * @param boolean $explain
+	 *   If set, Salesforce will return feedback on the query performance
+	 *
+	 * @return array
+	 *   Array of Salesforce objects that match the query.
+	 *
+	 * part of core API calls
+	 */
 	public function query( $query, $options = array(), $all = false, $explain = false ) {
 		$search_data = [
 			'q' => (string) $query,
@@ -769,19 +769,19 @@ 
 	}
 
 	/**
-	* Retrieve all the metadata for an object.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account, etc.
-	* @param bool $reset
-	*   Whether to reset the cache and retrieve a fresh version from Salesforce.
-	*
-	* @return array
-	*   All the metadata for an object, including information about each field,
-	*   URLs, and child relationships.
-	*
-	* part of core API calls
-	*/
+	 * Retrieve all the metadata for an object.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account, etc.
+	 * @param bool $reset
+	 *   Whether to reset the cache and retrieve a fresh version from Salesforce.
+	 *
+	 * @return array
+	 *   All the metadata for an object, including information about each field,
+	 *   URLs, and child relationships.
+	 *
+	 * part of core API calls
+	 */
 	public function object_describe( $name, $reset = false ) {
 		if ( empty( $name ) ) {
 			return array();
@@ -809,26 +809,26 @@ 
 	}
 
 	/**
-	* Create a new object of the given type.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account, etc.
-	* @param array $params
-	*   Values of the fields to set for the object.
-	*
-	* @return array
-	*   json: {"id":"00190000001pPvHAAU","success":true,"errors":[]}
-	*   code: 201
-	*   data:
-	*     "id" : "00190000001pPvHAAU",
-	*     "success" : true
-	*     "errors" : [ ],
-	*   from_cache:
-	*   cached:
-	*   is_redo:
-	*
-	* part of core API calls
-	*/
+	 * Create a new object of the given type.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account, etc.
+	 * @param array $params
+	 *   Values of the fields to set for the object.
+	 *
+	 * @return array
+	 *   json: {"id":"00190000001pPvHAAU","success":true,"errors":[]}
+	 *   code: 201
+	 *   data:
+	 *     "id" : "00190000001pPvHAAU",
+	 *     "success" : true
+	 *     "errors" : [ ],
+	 *   from_cache:
+	 *   cached:
+	 *   is_redo:
+	 *
+	 * part of core API calls
+	 */
 	public function object_create( $name, $params ) {
 		$options = array(
 			'type' => 'write',
@@ -838,34 +838,34 @@ 
 	}
 
 	/**
-	* Create new records or update existing records.
-	*
-	* The new records or updated records are based on the value of the specified
-	* field.  If the value is not unique, REST API returns a 300 response with
-	* the list of matching records.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account.
-	* @param string $key
-	*   The field to check if this record should be created or updated.
-	* @param string $value
-	*   The value for this record of the field specified for $key.
-	* @param array $params
-	*   Values of the fields to set for the object.
-	*
-	* @return array
-	*   json: {"id":"00190000001pPvHAAU","success":true,"errors":[]}
-	*   code: 201
-	*   data:
-	*     "id" : "00190000001pPvHAAU",
-	*     "success" : true
-	*     "errors" : [ ],
-	*   from_cache:
-	*   cached:
-	*   is_redo:
-	*
-	* part of core API calls
-	*/
+	 * Create new records or update existing records.
+	 *
+	 * The new records or updated records are based on the value of the specified
+	 * field.  If the value is not unique, REST API returns a 300 response with
+	 * the list of matching records.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account.
+	 * @param string $key
+	 *   The field to check if this record should be created or updated.
+	 * @param string $value
+	 *   The value for this record of the field specified for $key.
+	 * @param array $params
+	 *   Values of the fields to set for the object.
+	 *
+	 * @return array
+	 *   json: {"id":"00190000001pPvHAAU","success":true,"errors":[]}
+	 *   code: 201
+	 *   data:
+	 *     "id" : "00190000001pPvHAAU",
+	 *     "success" : true
+	 *     "errors" : [ ],
+	 *   from_cache:
+	 *   cached:
+	 *   is_redo:
+	 *
+	 * part of core API calls
+	 */
 	public function object_upsert( $name, $key, $value, $params ) {
 		$options = array(
 			'type' => 'write',
@@ -887,27 +887,27 @@ 
 	}
 
 	/**
-	* Update an existing object.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account.
-	* @param string $id
-	*   Salesforce id of the object.
-	* @param array $params
-	*   Values of the fields to set for the object.
-	*
-	* part of core API calls
-	*
-	* @return array
-	*   json: {"success":true,"body":""}
-	*   code: 204
-	*   data:
+	 * Update an existing object.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account.
+	 * @param string $id
+	 *   Salesforce id of the object.
+	 * @param array $params
+	 *   Values of the fields to set for the object.
+	 *
+	 * part of core API calls
+	 *
+	 * @return array
+	 *   json: {"success":true,"body":""}
+	 *   code: 204
+	 *   data:
 		success: 1
 		body:
-	*   from_cache:
-	*   cached:
-	*   is_redo:
-	*/
+	 *   from_cache:
+	 *   cached:
+	 *   is_redo:
+	 */
 	public function object_update( $name, $id, $params ) {
 		$options = array(
 			'type' => 'write',
@@ -917,62 +917,62 @@ 
 	}
 
 	/**
-	* Return a full loaded Salesforce object.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account.
-	* @param string $id
-	*   Salesforce id of the object.
-	*
-	* @return object
-	*   Object of the requested Salesforce object.
-	*
-	* part of core API calls
-	*/
+	 * Return a full loaded Salesforce object.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account.
+	 * @param string $id
+	 *   Salesforce id of the object.
+	 *
+	 * @return object
+	 *   Object of the requested Salesforce object.
+	 *
+	 * part of core API calls
+	 */
 	public function object_read( $name, $id ) {
 		return $this->api_call( "sobjects/{$name}/{$id}", array(), 'GET' );
 	}
 
 	/**
-	* Make a call to the Analytics API
-	*
-	* @param string $name
-	*   Object type name, E.g., Report
-	* @param string $id
-	*   Salesforce id of the object.
-	* @param string $route
-	*   What comes after the ID? E.g. instances, ?includeDetails=True
-	* @param array $params
-	*   Params to put with the request
-	* @param string $method
-	*   GET or POST
-	*
-	* @return object
-	*   Object of the requested Salesforce object.
-	*
-	* part of core API calls
-	*/
+	 * Make a call to the Analytics API
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Report
+	 * @param string $id
+	 *   Salesforce id of the object.
+	 * @param string $route
+	 *   What comes after the ID? E.g. instances, ?includeDetails=True
+	 * @param array $params
+	 *   Params to put with the request
+	 * @param string $method
+	 *   GET or POST
+	 *
+	 * @return object
+	 *   Object of the requested Salesforce object.
+	 *
+	 * part of core API calls
+	 */
 	public function analytics_api( $name, $id, $route = '', $params = array(), $method = 'GET' ) {
 		return $this->api_call( "analytics/{$name}/{$id}/{$route}", $params, $method );
 	}
 
 	/**
-	* Run a specific Analytics report
-	*
-	* @param string $id
-	*   Salesforce id of the object.
-	* @param bool $async
-	*   Whether the report is asynchronous
-	* @param array $params
-	*   Params to put with the request
-	* @param string $method
-	*   GET or POST
-	*
-	* @return object
-	*   Object of the requested Salesforce object.
-	*
-	* part of core API calls
-	*/
+	 * Run a specific Analytics report
+	 *
+	 * @param string $id
+	 *   Salesforce id of the object.
+	 * @param bool $async
+	 *   Whether the report is asynchronous
+	 * @param array $params
+	 *   Params to put with the request
+	 * @param string $method
+	 *   GET or POST
+	 *
+	 * @return object
+	 *   Object of the requested Salesforce object.
+	 *
+	 * part of core API calls
+	 */
 	public function run_analytics_report( $id, $async = true, $clear_cache = false, $params = array(), $method = 'GET', $report_cache_expiration = '', $cache_instance = true, $instance_cache_expiration = '' ) {
 
 		$id         = $this->convert_id( $id );
@@ -1058,36 +1058,36 @@ 
 	}
 
 	/**
-	* Return a full loaded Salesforce object from External ID.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account.
-	* @param string $field
-	*   Salesforce external id field name.
-	* @param string $value
-	*   Value of external id.
-	*
-	* @return object
-	*   Object of the requested Salesforce object.
-	*
-	* part of core API calls
-	*/
+	 * Return a full loaded Salesforce object from External ID.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account.
+	 * @param string $field
+	 *   Salesforce external id field name.
+	 * @param string $value
+	 *   Value of external id.
+	 *
+	 * @return object
+	 *   Object of the requested Salesforce object.
+	 *
+	 * part of core API calls
+	 */
 	public function object_readby_external_id( $name, $field, $value ) {
 		return $this->api_call( "sobjects/{$name}/{$field}/{$value}" );
 	}
 
 	/**
-	* Delete a Salesforce object.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account.
-	* @param string $id
-	*   Salesforce id of the object.
-	*
-	* @return array
-	*
-	* part of core API calls
-	*/
+	 * Delete a Salesforce object.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account.
+	 * @param string $id
+	 *   Salesforce id of the object.
+	 *
+	 * @return array
+	 *
+	 * part of core API calls
+	 */
 	public function object_delete( $name, $id ) {
 		$options = array(
 			'type' => 'write',
@@ -1097,17 +1097,17 @@ 
 	}
 
 	/**
-	* Retrieves the list of individual objects that have been deleted within the
-	* given timespan for a specified object type.
-	*
-	* @param string $type
-	*   Object type name, E.g., Contact, Account.
-	* @param string $startDate
-	*   Start date to check for deleted objects (in ISO 8601 format).
-	* @param string $endDate
-	*   End date to check for deleted objects (in ISO 8601 format).
-	* @return GetDeletedResult
-	*/
+	 * Retrieves the list of individual objects that have been deleted within the
+	 * given timespan for a specified object type.
+	 *
+	 * @param string $type
+	 *   Object type name, E.g., Contact, Account.
+	 * @param string $startDate
+	 *   Start date to check for deleted objects (in ISO 8601 format).
+	 * @param string $endDate
+	 *   End date to check for deleted objects (in ISO 8601 format).
+	 * @return GetDeletedResult
+	 */
 	public function get_deleted( $type, $start_date, $end_date ) {
 		$options = array(
 			'cache' => false,
@@ -1117,13 +1117,13 @@ 
 
 
 	/**
-	* Return a list of available resources for the configured API version.
-	*
-	* @return array
-	*   Associative array keyed by name with a URI value.
-	*
-	* part of core API calls
-	*/
+	 * Return a list of available resources for the configured API version.
+	 *
+	 * @return array
+	 *   Associative array keyed by name with a URI value.
+	 *
+	 * part of core API calls
+	 */
 	public function list_resources() {
 		$resources = $this->api_call( '' );
 		foreach ( $resources as $key => $path ) {
@@ -1133,31 +1133,31 @@ 
 	}
 
 	/**
-	* Return a list of SFIDs for the given object, which have been created or
-	* updated in the given timeframe.
-	*
-	* @param string $type
-	*   Object type name, E.g., Contact, Account.
-	*
-	* @param int $start
-	*   unix timestamp for older timeframe for updates.
-	*   Defaults to "-29 days" if empty.
-	*
-	* @param int $end
-	*   unix timestamp for end of timeframe for updates.
-	*   Defaults to now if empty
-	*
-	* @return array
-	*   return array has 2 indexes:
-	*     "ids": a list of SFIDs of those records which have been created or
-	*       updated in the given timeframe.
-	*     "latestDateCovered": ISO 8601 format timestamp (UTC) of the last date
-	*       covered in the request.
-	*
-	* @see https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_getupdated.htm
-	*
-	* part of core API calls
-	*/
+	 * Return a list of SFIDs for the given object, which have been created or
+	 * updated in the given timeframe.
+	 *
+	 * @param string $type
+	 *   Object type name, E.g., Contact, Account.
+	 *
+	 * @param int $start
+	 *   unix timestamp for older timeframe for updates.
+	 *   Defaults to "-29 days" if empty.
+	 *
+	 * @param int $end
+	 *   unix timestamp for end of timeframe for updates.
+	 *   Defaults to now if empty
+	 *
+	 * @return array
+	 *   return array has 2 indexes:
+	 *     "ids": a list of SFIDs of those records which have been created or
+	 *       updated in the given timeframe.
+	 *     "latestDateCovered": ISO 8601 format timestamp (UTC) of the last date
+	 *       covered in the request.
+	 *
+	 * @see https://developer.salesforce.com/docs/atlas.en-us.api_rest.meta/api_rest/resources_getupdated.htm
+	 *
+	 * part of core API calls
+	 */
 	public function get_updated( $type, $start = null, $end = null ) {
 		if ( empty( $start ) ) {
 			$start = strtotime( '-29 days' );
@@ -1176,19 +1176,19 @@ 
 	}
 
 	/**
-	* Given a DeveloperName and SObject Name, return the SFID of the
-	* corresponding RecordType. DeveloperName doesn't change between Salesforce
-	* environments, so it's safer to rely on compared to SFID.
-	*
-	* @param string $name
-	*   Object type name, E.g., Contact, Account.
-	*
-	* @param string $devname
-	*   RecordType DeveloperName, e.g. Donation, Membership, etc.
-	*
-	* @return string SFID
-	*   The Salesforce ID of the given Record Type, or null.
-	*/
+	 * Given a DeveloperName and SObject Name, return the SFID of the
+	 * corresponding RecordType. DeveloperName doesn't change between Salesforce
+	 * environments, so it's safer to rely on compared to SFID.
+	 *
+	 * @param string $name
+	 *   Object type name, E.g., Contact, Account.
+	 *
+	 * @param string $devname
+	 *   RecordType DeveloperName, e.g. Donation, Membership, etc.
+	 *
+	 * @return string SFID
+	 *   The Salesforce ID of the given Record Type, or null.
+	 */
 
 	public function get_record_type_id_by_developer_name( $name, $devname, $reset = false ) {
 
@@ -1216,10 +1216,10 @@ 
 	}
 
 	/**
-	* If there is a WordPress setting for how long to keep the cache, return it and set the object property
-	* Otherwise, return seconds in 24 hours
-	*
-	*/
+	 * If there is a WordPress setting for how long to keep the cache, return it and set the object property
+	 * Otherwise, return seconds in 24 hours
+	 *
+	 */
 	private function cache_expiration() {
 		$cache_expiration = $this->wordpress->cache_expiration( $this->option_prefix . 'cache_expiration', 86400 );
 		return $cache_expiration;

Spacing +232 added lines, -232 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 array $schedulable_classes
 	*   array of classes that can have scheduled tasks specific to them
 	*/
-	public function __construct( $consumer_key, $consumer_secret, $login_url, $callback_url, $authorize_path, $token_path, $rest_api_version, $wordpress, $slug, $option_prefix, $logging, $schedulable_classes ) {
+	public function __construct($consumer_key, $consumer_secret, $login_url, $callback_url, $authorize_path, $token_path, $rest_api_version, $wordpress, $slug, $option_prefix, $logging, $schedulable_classes) {
 		$this->consumer_key        = $consumer_key;
 		$this->consumer_secret     = $consumer_secret;
 		$this->login_url           = $login_url;
@@ -63,12 +63,12 @@ 
 			'type'             => 'read',
 		);
 
-		$this->success_codes              = array( 200, 201, 204 );
+		$this->success_codes              = array(200, 201, 204);
 		$this->refresh_code               = 401;
 		$this->success_or_refresh_codes   = $this->success_codes;
 		$this->success_or_refresh_codes[] = $this->refresh_code;
 
-		$this->debug = get_option( $this->option_prefix . 'debug_mode', false );
+		$this->debug = get_option($this->option_prefix . 'debug_mode', false);
 
 	}
 
@@ -81,20 +81,20 @@ 
 	* @return string
 	*   18-character case-insensitive Salesforce ID
 	*/
-	public static function convert_id( $sf_id_15 ) {
-		if ( strlen( $sf_id_15 ) !== 15 ) {
+	public static function convert_id($sf_id_15) {
+		if (strlen($sf_id_15) !== 15) {
 			return $sf_id_15;
 		}
-		$chunks = str_split( $sf_id_15, 5 );
+		$chunks = str_split($sf_id_15, 5);
 		$extra  = '';
-		foreach ( $chunks as $chunk ) {
-			$chars = str_split( $chunk, 1 );
+		foreach ($chunks as $chunk) {
+			$chars = str_split($chunk, 1);
 			$bits  = '';
-			foreach ( $chars as $char ) {
-				$bits .= ( ! is_numeric( $char ) && strtoupper( $char ) === $char ) ? '1' : '0';
+			foreach ($chars as $char) {
+				$bits .= ( ! is_numeric($char) && strtoupper($char) === $char) ? '1' : '0';
 			}
 			$map    = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ012345';
-			$extra .= substr( $map, base_convert( strrev( $bits ), 2, 10 ), 1 );
+			$extra .= substr($map, base_convert(strrev($bits), 2, 10), 1);
 		}
 		return $sf_id_15 . $extra;
 	}
@@ -111,15 +111,15 @@ 
 	*   if no match could be found.
 	* @throws Object_Sync_Sf_Exception
 	*/
-	public function get_sobject_type( $sf_id ) {
+	public function get_sobject_type($sf_id) {
 		$objects = $this->objects(
 			array(
-				'keyPrefix' => substr( $sf_id, 0, 3 ),
+				'keyPrefix' => substr($sf_id, 0, 3),
 			)
 		);
-		if ( 1 === count( $objects ) ) {
+		if (1 === count($objects)) {
 			// keyPrefix is unique across objects. If there is exactly one return value from objects(), then we have a match.
-			$object = reset( $objects );
+			$object = reset($objects);
 			return $object['name'];
 		}
 		// Otherwise, we did not find a match.
@@ -131,7 +131,7 @@ 
 	*
 	*/
 	public function is_authorized() {
-		return ! empty( $this->consumer_key ) && ! empty( $this->consumer_secret ) && $this->get_refresh_token();
+		return ! empty($this->consumer_key) && ! empty($this->consumer_secret) && $this->get_refresh_token();
 	}
 
 	/**
@@ -143,7 +143,7 @@ 
 			'authenticated' => false,
 			'full_url'      => true,
 		);
-		return $this->api_call( $this->get_instance_url() . '/services/data', [], 'GET', $options );
+		return $this->api_call($this->get_instance_url() . '/services/data', [], 'GET', $options);
 	}
 
 	/**
@@ -167,50 +167,50 @@ 
 	*
 	* @throws Object_Sync_Sf_Exception
 	*/
-	public function api_call( $path, $params = array(), $method = 'GET', $options = array(), $type = 'rest' ) {
-		if ( ! $this->get_access_token() ) {
+	public function api_call($path, $params = array(), $method = 'GET', $options = array(), $type = 'rest') {
+		if ( ! $this->get_access_token()) {
 			$this->refresh_token();
 		}
-		$this->response = $this->api_http_request( $path, $params, $method, $options, $type );
+		$this->response = $this->api_http_request($path, $params, $method, $options, $type);
 
 		// analytic calls that are expired return 404s for some absurd reason
-		if ( $this->response['code'] && 'run_analytics_report' === debug_backtrace()[1]['function'] ) {
+		if ($this->response['code'] && 'run_analytics_report' === debug_backtrace()[1]['function']) {
 			return $this->response;
 		}
 
-		switch ( $this->response['code'] ) {
+		switch ($this->response['code']) {
 			// The session ID or OAuth token used has expired or is invalid.
 			case $this->response['code'] === $this->refresh_code:
 				// Refresh token.
 				$this->refresh_token();
 				// Rebuild our request and repeat request.
 				$options['is_redo'] = true;
-				$this->response     = $this->api_http_request( $path, $params, $method, $options, $type );
+				$this->response     = $this->api_http_request($path, $params, $method, $options, $type);
 				// Throw an error if we still have bad response.
-				if ( ! in_array( $this->response['code'], $this->success_codes, true ) ) {
-					throw new Object_Sync_Sf_Exception( $this->response['data'][0]['message'], $this->response['code'] );
+				if ( ! in_array($this->response['code'], $this->success_codes, true)) {
+					throw new Object_Sync_Sf_Exception($this->response['data'][0]['message'], $this->response['code']);
 				}
 				break;
-			case in_array( $this->response['code'], $this->success_codes, true ):
+			case in_array($this->response['code'], $this->success_codes, true):
 				// All clear.
 				break;
 			default:
 				// We have problem and no specific Salesforce error provided.
-				if ( empty( $this->response['data'] ) ) {
-					throw new Object_Sync_Sf_Exception( $this->response['error'], $this->response['code'] );
+				if (empty($this->response['data'])) {
+					throw new Object_Sync_Sf_Exception($this->response['error'], $this->response['code']);
 				}
 		}
 
-		if ( ! empty( $this->response['data'][0] ) && 1 === count( $this->response['data'] ) ) {
+		if ( ! empty($this->response['data'][0]) && 1 === count($this->response['data'])) {
 			$this->response['data'] = $this->response['data'][0];
 		}
 
-		if ( isset( $this->response['data']['error'] ) ) {
-			throw new Object_Sync_Sf_Exception( $this->response['data']['error_description'], $this->response['data']['error'] );
+		if (isset($this->response['data']['error'])) {
+			throw new Object_Sync_Sf_Exception($this->response['data']['error_description'], $this->response['data']['error']);
 		}
 
-		if ( ! empty( $this->response['data']['errorCode'] ) ) {
-			throw new Object_Sync_Sf_Exception( $this->response['data']['message'], $this->response['code'] );
+		if ( ! empty($this->response['data']['errorCode'])) {
+			throw new Object_Sync_Sf_Exception($this->response['data']['message'], $this->response['code']);
 		}
 
 		return $this->response;
@@ -236,73 +236,73 @@ 
 	* @return array
 	*   The requested data.
 	*/
-	protected function api_http_request( $path, $params, $method, $options = array(), $type = 'rest' ) {
-		$options = array_merge( $this->options, $options ); // this will override a value in $this->options with the one in $options if there is a matching key
-		$url     = $this->get_api_endpoint( $type ) . $path;
-		if ( isset( $options['full_url'] ) && true === $options['full_url'] ) {
+	protected function api_http_request($path, $params, $method, $options = array(), $type = 'rest') {
+		$options = array_merge($this->options, $options); // this will override a value in $this->options with the one in $options if there is a matching key
+		$url     = $this->get_api_endpoint($type) . $path;
+		if (isset($options['full_url']) && true === $options['full_url']) {
 			$url = $path;
 		}
 		$headers = array(
 			'Authorization'   => 'Authorization: OAuth ' . $this->get_access_token(),
 			'Accept-Encoding' => 'Accept-Encoding: gzip, deflate',
 		);
-		if ( 'POST' === $method || 'PATCH' === $method ) {
+		if ('POST' === $method || 'PATCH' === $method) {
 			$headers['Content-Type'] = 'Content-Type: application/json';
 		}
-		if ( isset( $options['authenticated'] ) && true === $options['authenticated'] ) {
+		if (isset($options['authenticated']) && true === $options['authenticated']) {
 			$headers = false;
 		}
 		// if this request should be cached, see if it already exists
 		// if it is already cached, load it. if not, load it and then cache it if it should be cached
 		// add parameters to the array so we can tell if it was cached or not
-		if ( true === $options['cache'] && 'write' !== $options['type'] ) {
-			$cached = $this->wordpress->cache_get( $url, $params );
+		if (true === $options['cache'] && 'write' !== $options['type']) {
+			$cached = $this->wordpress->cache_get($url, $params);
 			// some api calls can send a reset option, in which case we should redo the request anyway
-			if ( is_array( $cached ) && ( ! isset( $options['reset'] ) || true !== $options['reset'] ) ) {
+			if (is_array($cached) && ( ! isset($options['reset']) || true !== $options['reset'])) {
 				$result               = $cached;
 				$result['from_cache'] = true;
 				$result['cached']     = true;
 			} else {
-				$data   = wp_json_encode( $params );
-				$result = $this->http_request( $url, $data, $headers, $method, $options );
-				if ( in_array( $result['code'], $this->success_codes, true ) ) {
-					$result['cached'] = $this->wordpress->cache_set( $url, $params, $result, $options['cache_expiration'] );
+				$data   = wp_json_encode($params);
+				$result = $this->http_request($url, $data, $headers, $method, $options);
+				if (in_array($result['code'], $this->success_codes, true)) {
+					$result['cached'] = $this->wordpress->cache_set($url, $params, $result, $options['cache_expiration']);
 				} else {
 					$result['cached'] = false;
 				}
 				$result['from_cache'] = false;
 			}
 		} else {
-			$data                 = wp_json_encode( $params );
-			$result               = $this->http_request( $url, $data, $headers, $method, $options );
+			$data                 = wp_json_encode($params);
+			$result               = $this->http_request($url, $data, $headers, $method, $options);
 			$result['from_cache'] = false;
 			$result['cached']     = false;
 		}
 
-		if ( isset( $options['is_redo'] ) && true === $options['is_redo'] ) {
+		if (isset($options['is_redo']) && true === $options['is_redo']) {
 			$result['is_redo'] = true;
 		} else {
 			$result['is_redo'] = false;
 		}
 
 		// it would be very unfortunate to ever have to do this in a production site
-		if ( 1 === (int) $this->debug ) {
+		if (1 === (int) $this->debug) {
 			// create log entry for the api call if debug is true
 			$status = 'debug';
-			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 URL of the Salesforce API request
-			$title = sprintf( esc_html__( 'Debug: on Salesforce API HTTP Request to URL: %1$s.', 'object-sync-for-salesforce' ),
-				esc_url( $url )
+			$title = sprintf(esc_html__('Debug: on Salesforce API HTTP Request to URL: %1$s.', 'object-sync-for-salesforce'),
+				esc_url($url)
 			);
 
 			$logging->setup(
 				$title,
-				print_r( $result, true ), // log the result because we are debugging the whole api call
+				print_r($result, true), // log the result because we are debugging the whole api call
 				0,
 				0,
 				$status
@@ -329,7 +329,7 @@ 
 	* @return array
 	*   Salesforce response object.
 	*/
-	protected function http_request( $url, $data, $headers = array(), $method = 'GET', $options = array() ) {
+	protected function http_request($url, $data, $headers = array(), $method = 'GET', $options = array()) {
 		// Build the request, including path and headers. Internal use.
 
 		/*
@@ -338,60 +338,60 @@ 
 		*/
 
 		$curl = curl_init();
-		curl_setopt( $curl, CURLOPT_URL, $url );
-		curl_setopt( $curl, CURLOPT_RETURNTRANSFER, true );
-		curl_setopt( $curl, CURLOPT_FOLLOWLOCATION, true );
-		if ( false !== $headers ) {
-			curl_setopt( $curl, CURLOPT_HTTPHEADER, $headers );
+		curl_setopt($curl, CURLOPT_URL, $url);
+		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+		if (false !== $headers) {
+			curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
 		} else {
-			curl_setopt( $curl, CURLOPT_HEADER, false );
+			curl_setopt($curl, CURLOPT_HEADER, false);
 		}
 
-		if ( 'POST' === $method ) {
-			curl_setopt( $curl, CURLOPT_POST, true );
-			curl_setopt( $curl, CURLOPT_POSTFIELDS, $data );
-		} elseif ( 'PATCH' === $method || 'DELETE' === $method ) {
-			curl_setopt( $curl, CURLOPT_CUSTOMREQUEST, $method );
-			curl_setopt( $curl, CURLOPT_POSTFIELDS, $data );
+		if ('POST' === $method) {
+			curl_setopt($curl, CURLOPT_POST, true);
+			curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+		} elseif ('PATCH' === $method || 'DELETE' === $method) {
+			curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $method);
+			curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
 		}
-		$json_response = curl_exec( $curl ); // this is possibly gzipped json data
-		$code          = curl_getinfo( $curl, CURLINFO_HTTP_CODE );
+		$json_response = curl_exec($curl); // this is possibly gzipped json data
+		$code          = curl_getinfo($curl, CURLINFO_HTTP_CODE);
 
-		if ( ( 'PATCH' === $method || 'DELETE' === $method ) && '' === $json_response && 204 === $code ) {
+		if (('PATCH' === $method || 'DELETE' === $method) && '' === $json_response && 204 === $code) {
 			// delete and patch requests return a 204 with an empty body upon success for whatever reason
 			$data = array(
 				'success' => true,
 				'body'    => '',
 			);
-			curl_close( $curl );
+			curl_close($curl);
 			return array(
-				'json' => wp_json_encode( $data ),
+				'json' => wp_json_encode($data),
 				'code' => $code,
 				'data' => $data,
 			);
 		}
 
-		if ( ( ord( $json_response[0] ) == 0x1f ) && ( ord( $json_response[1] ) == 0x8b ) ) {
+		if ((ord($json_response[0]) == 0x1f) && (ord($json_response[1]) == 0x8b)) {
 			// skip header and ungzip the data
-			$json_response = gzinflate( substr( $json_response, 10 ) );
+			$json_response = gzinflate(substr($json_response, 10));
 		}
-		$data = json_decode( $json_response, true ); // decode it into an array
+		$data = json_decode($json_response, true); // decode it into an array
 
 		// don't use the exception if the status is a success one, or if it just needs a refresh token (salesforce uses 401 for this)
-		if ( ! in_array( $code, $this->success_or_refresh_codes, true ) ) {
-			$curl_error = curl_error( $curl );
-			if ( '' !== $curl_error ) {
+		if ( ! in_array($code, $this->success_or_refresh_codes, true)) {
+			$curl_error = curl_error($curl);
+			if ('' !== $curl_error) {
 				// create log entry for failed curl
 				$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 URL of the Salesforce API request
-				$title = sprintf( esc_html__( 'Error: %1$s: on Salesforce http request', 'object-sync-for-salesforce' ),
-					esc_attr( $code )
+				$title = sprintf(esc_html__('Error: %1$s: on Salesforce http request', 'object-sync-for-salesforce'),
+					esc_attr($code)
 				);
 
 				$logging->setup(
@@ -401,25 +401,25 @@ 
 					0,
 					$status
 				);
-			} elseif ( isset( $data[0]['errorCode'] ) && '' !== $data[0]['errorCode'] ) { // salesforce uses this structure to return errors
+			} elseif (isset($data[0]['errorCode']) && '' !== $data[0]['errorCode']) { // salesforce uses this structure to return errors
 				// create log entry for failed curl
 				$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 server code returned by the api
-				$title = sprintf( esc_html__( 'Error: %1$s: on Salesforce http request', 'object-sync-for-salesforce' ),
-					absint( $code )
+				$title = sprintf(esc_html__('Error: %1$s: on Salesforce http request', 'object-sync-for-salesforce'),
+					absint($code)
 				);
 
 				// translators: placeholders are: 1) the URL requested, 2) the message returned by the error, 3) the server code returned
-				$body = sprintf( '<p>' . esc_html__( 'URL: %1$s', 'object-sync-for-salesforce' ) . '</p><p>' . esc_html__( 'Message: %2$s', 'object-sync-for-salesforce' ) . '</p><p>' . esc_html__( 'Code: %3$s', 'object-sync-for-salesforce' ),
-					esc_attr( $url ),
-					esc_html( $data[0]['message'] ),
-					absint( $code )
+				$body = sprintf('<p>' . esc_html__('URL: %1$s', 'object-sync-for-salesforce') . '</p><p>' . esc_html__('Message: %2$s', 'object-sync-for-salesforce') . '</p><p>' . esc_html__('Code: %3$s', 'object-sync-for-salesforce'),
+					esc_attr($url),
+					esc_html($data[0]['message']),
+					absint($code)
 				);
 
 				$logging->setup(
@@ -432,20 +432,20 @@ 
 			} else {
 				// create log entry for failed curl
 				$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 server code returned by Salesforce
-				$title = sprintf( esc_html__( 'Error: %1$s: on Salesforce http request', 'object-sync-for-salesforce' ),
-					absint( $code )
+				$title = sprintf(esc_html__('Error: %1$s: on Salesforce http request', 'object-sync-for-salesforce'),
+					absint($code)
 				);
 
 				$logging->setup(
 					$title,
-					print_r( $data, true ), // log the result because we are debugging the whole api call
+					print_r($data, true), // log the result because we are debugging the whole api call
 					0,
 					0,
 					$status
@@ -453,7 +453,7 @@ 
 			} // End if().
 		} // End if().
 
-		curl_close( $curl );
+		curl_close($curl);
 
 		return array(
 			'json' => $json_response,
@@ -471,14 +471,14 @@ 
 	* @return string
 	*   Complete URL endpoint for API access.
 	*/
-	public function get_api_endpoint( $api_type = 'rest' ) {
+	public function get_api_endpoint($api_type = 'rest') {
 		// Special handling for apexrest, since it's not in the identity object.
-		if ( 'apexrest' === $api_type ) {
+		if ('apexrest' === $api_type) {
 			$url = $this->get_instance_url() . '/services/apexrest/';
 		} else {
 			$identity = $this->get_identity();
-			$url      = str_replace( '{version}', $this->rest_api_version, $identity['urls'][ $api_type ] );
-			if ( '' === $identity ) {
+			$url      = str_replace('{version}', $this->rest_api_version, $identity['urls'][$api_type]);
+			if ('' === $identity) {
 				$url = $this->get_instance_url() . '/services/data/v' . $this->rest_api_version . '/';
 			}
 		}
@@ -489,7 +489,7 @@ 
 	* Get the SF instance URL. Useful for linking to objects.
 	*/
 	public function get_instance_url() {
-		return get_option( $this->option_prefix . 'instance_url', '' );
+		return get_option($this->option_prefix . 'instance_url', '');
 	}
 
 	/**
@@ -498,15 +498,15 @@ 
 	* @param string $url
 	*   URL to set.
 	*/
-	protected function set_instance_url( $url ) {
-		update_option( $this->option_prefix . 'instance_url', $url );
+	protected function set_instance_url($url) {
+		update_option($this->option_prefix . 'instance_url', $url);
 	}
 
 	/**
 	* Get the access token.
 	*/
 	public function get_access_token() {
-		return get_option( $this->option_prefix . 'access_token', '' );
+		return get_option($this->option_prefix . 'access_token', '');
 	}
 
 	/**
@@ -517,15 +517,15 @@ 
 	* @param string $token
 	*   Access token from Salesforce.
 	*/
-	protected function set_access_token( $token ) {
-		update_option( $this->option_prefix . 'access_token', $token );
+	protected function set_access_token($token) {
+		update_option($this->option_prefix . 'access_token', $token);
 	}
 
 	/**
 	* Get refresh token.
 	*/
 	protected function get_refresh_token() {
-		return get_option( $this->option_prefix . 'refresh_token', '' );
+		return get_option($this->option_prefix . 'refresh_token', '');
 	}
 
 	/**
@@ -534,8 +534,8 @@ 
 	* @param string $token
 	*   Refresh token from Salesforce.
 	*/
-	protected function set_refresh_token( $token ) {
-		update_option( $this->option_prefix . 'refresh_token', $token );
+	protected function set_refresh_token($token) {
+		update_option($this->option_prefix . 'refresh_token', $token);
 	}
 
 	/**
@@ -549,8 +549,8 @@ 
 	*/
 	protected function refresh_token() {
 		$refresh_token = $this->get_refresh_token();
-		if ( empty( $refresh_token ) ) {
-			throw new Object_Sync_Sf_Exception( esc_html__( 'There is no refresh token.', 'object-sync-for-salesforce' ) );
+		if (empty($refresh_token)) {
+			throw new Object_Sync_Sf_Exception(esc_html__('There is no refresh token.', 'object-sync-for-salesforce'));
 		}
 
 		$data = array(
@@ -568,13 +568,13 @@ 
 			'Authorization'   => 'Authorization: OAuth ' . $this->get_access_token(),
 		);
 		$headers  = false;
-		$response = $this->http_request( $url, $data, $headers, 'POST' );
+		$response = $this->http_request($url, $data, $headers, 'POST');
 
-		if ( 200 !== $response['code'] ) {
+		if (200 !== $response['code']) {
 			throw new Object_Sync_Sf_Exception(
 				esc_html(
 					sprintf(
-						__( 'Unable to get a Salesforce access token. Salesforce returned the following errorCode: ', 'object-sync-for-salesforce' ) . $response['code']
+						__('Unable to get a Salesforce access token. Salesforce returned the following errorCode: ', 'object-sync-for-salesforce') . $response['code']
 					)
 				),
 				$response['code']
@@ -583,13 +583,13 @@ 
 
 		$data = $response['data'];
 
-		if ( is_array( $data ) && isset( $data['error'] ) ) {
-			throw new Object_Sync_Sf_Exception( $data['error_description'], $data['error'] );
+		if (is_array($data) && isset($data['error'])) {
+			throw new Object_Sync_Sf_Exception($data['error_description'], $data['error']);
 		}
 
-		$this->set_access_token( $data['access_token'] );
-		$this->set_identity( $data['id'] );
-		$this->set_instance_url( $data['instance_url'] );
+		$this->set_access_token($data['access_token']);
+		$this->set_identity($data['id']);
+		$this->set_instance_url($data['instance_url']);
 	}
 
 	/**
@@ -600,18 +600,18 @@ 
 	*
 	* @throws Object_Sync_Sf_Exception
 	*/
-	protected function set_identity( $id ) {
-		$headers  = array(
+	protected function set_identity($id) {
+		$headers = array(
 			'Authorization'   => 'Authorization: OAuth ' . $this->get_access_token(),
 			//'Content-type'  => 'application/json',
 			'Accept-Encoding' => 'Accept-Encoding: gzip, deflate',
 		);
-		$response = $this->http_request( $id, null, $headers );
-		if ( 200 !== $response['code'] ) {
-			throw new Object_Sync_Sf_Exception( esc_html__( 'Unable to access identity service.', 'object-sync-for-salesforce' ), $response['code'] );
+		$response = $this->http_request($id, null, $headers);
+		if (200 !== $response['code']) {
+			throw new Object_Sync_Sf_Exception(esc_html__('Unable to access identity service.', 'object-sync-for-salesforce'), $response['code']);
 		}
 		$data = $response['data'];
-		update_option( $this->option_prefix . 'identity', $data );
+		update_option($this->option_prefix . 'identity', $data);
 	}
 
 	/**
@@ -621,7 +621,7 @@ 
 	*   Returns FALSE if no identity has been stored.
 	*/
 	public function get_identity() {
-		return get_option( $this->option_prefix . 'identity', false );
+		return get_option($this->option_prefix . 'identity', false);
 	}
 
 	/**
@@ -645,7 +645,7 @@ 
 	* @param string $code
 	*   Code from Salesforce.
 	*/
-	public function request_token( $code ) {
+	public function request_token($code) {
 		$data = array(
 			'code'          => $code,
 			'grant_type'    => 'authorization_code',
@@ -660,28 +660,28 @@ 
 			//'Content-Type'  => 'application/x-www-form-urlencoded',
 			'Accept-Encoding' => 'Accept-Encoding: gzip, deflate',
 		);
-		$response = $this->http_request( $url, $data, $headers, 'POST' );
+		$response = $this->http_request($url, $data, $headers, 'POST');
 
 		$data = $response['data'];
 
-		if ( 200 !== $response['code'] ) {
-			$error = isset( $data['error_description'] ) ? $data['error_description'] : $response['error'];
-			throw new Object_Sync_Sf_Exception( $error, $response['code'] );
+		if (200 !== $response['code']) {
+			$error = isset($data['error_description']) ? $data['error_description'] : $response['error'];
+			throw new Object_Sync_Sf_Exception($error, $response['code']);
 		}
 
 		// Ensure all required attributes are returned. They can be omitted if the
 		// OAUTH scope is inadequate.
-		$required = array( 'refresh_token', 'access_token', 'id', 'instance_url' );
-		foreach ( $required as $key ) {
-			if ( ! isset( $data[ $key ] ) ) {
+		$required = array('refresh_token', 'access_token', 'id', 'instance_url');
+		foreach ($required as $key) {
+			if ( ! isset($data[$key])) {
 				return false;
 			}
 		}
 
-		$this->set_refresh_token( $data['refresh_token'] );
-		$this->set_access_token( $data['access_token'] );
-		$this->set_identity( $data['id'] );
-		$this->set_instance_url( $data['instance_url'] );
+		$this->set_refresh_token($data['refresh_token']);
+		$this->set_access_token($data['access_token']);
+		$this->set_identity($data['id']);
+		$this->set_instance_url($data['instance_url']);
 
 		return true;
 	}
@@ -716,19 +716,19 @@ 
 		$options = array(
 			'reset' => $reset,
 		);
-		$result  = $this->api_call( 'sobjects', array(), 'GET', $options );
+		$result  = $this->api_call('sobjects', array(), 'GET', $options);
 
-		if ( ! empty( $conditions ) ) {
-			foreach ( $result['data']['sobjects'] as $key => $object ) {
-				foreach ( $conditions as $condition => $value ) {
-					if ( $object[ $condition ] !== $value ) {
-						unset( $result['data']['sobjects'][ $key ] );
+		if ( ! empty($conditions)) {
+			foreach ($result['data']['sobjects'] as $key => $object) {
+				foreach ($conditions as $condition => $value) {
+					if ($object[$condition] !== $value) {
+						unset($result['data']['sobjects'][$key]);
 					}
 				}
 			}
 		}
 
-		ksort( $result['data']['sobjects'] );
+		ksort($result['data']['sobjects']);
 
 		return $result['data']['sobjects'];
 	}
@@ -750,21 +750,21 @@ 
 	*
 	* part of core API calls
 	*/
-	public function query( $query, $options = array(), $all = false, $explain = false ) {
+	public function query($query, $options = array(), $all = false, $explain = false) {
 		$search_data = [
 			'q' => (string) $query,
 		];
-		if ( true === $explain ) {
+		if (true === $explain) {
 			$search_data['explain'] = $search_data['q'];
-			unset( $search_data['q'] );
+			unset($search_data['q']);
 		}
 		// all is a search through deleted and merged data as well
-		if ( true === $all ) {
+		if (true === $all) {
 			$path = 'queryAll';
 		} else {
 			$path = 'query';
 		}
-		$result = $this->api_call( $path . '?' . http_build_query( $search_data ), array(), 'GET', $options );
+		$result = $this->api_call($path . '?' . http_build_query($search_data), array(), 'GET', $options);
 		return $result;
 	}
 
@@ -782,28 +782,28 @@ 
 	*
 	* part of core API calls
 	*/
-	public function object_describe( $name, $reset = false ) {
-		if ( empty( $name ) ) {
+	public function object_describe($name, $reset = false) {
+		if (empty($name)) {
 			return array();
 		}
 		$options = array(
 			'reset' => $reset,
 		);
-		$object  = $this->api_call( "sobjects/{$name}/describe", array(), 'GET', $options );
+		$object  = $this->api_call("sobjects/{$name}/describe", array(), 'GET', $options);
 		// Sort field properties, because salesforce API always provides them in a
 		// random order. We sort them so that stored and exported data are
 		// standardized and predictable.
 		$fields = array();
-		foreach ( $object['data']['fields'] as &$field ) {
-			ksort( $field );
-			if ( ! empty( $field['picklistValues'] ) ) {
-				foreach ( $field['picklistValues'] as &$picklist_value ) {
-					ksort( $picklist_value );
+		foreach ($object['data']['fields'] as &$field) {
+			ksort($field);
+			if ( ! empty($field['picklistValues'])) {
+				foreach ($field['picklistValues'] as &$picklist_value) {
+					ksort($picklist_value);
 				}
 			}
-			$fields[ $field['name'] ] = $field;
+			$fields[$field['name']] = $field;
 		}
-		ksort( $fields );
+		ksort($fields);
 		$object['fields'] = $fields;
 		return $object;
 	}
@@ -829,11 +829,11 @@ 
 	*
 	* part of core API calls
 	*/
-	public function object_create( $name, $params ) {
+	public function object_create($name, $params) {
 		$options = array(
 			'type' => 'write',
 		);
-		$result  = $this->api_call( "sobjects/{$name}", $params, 'POST', $options );
+		$result  = $this->api_call("sobjects/{$name}", $params, 'POST', $options);
 		return $result;
 	}
 
@@ -866,22 +866,22 @@ 
 	*
 	* part of core API calls
 	*/
-	public function object_upsert( $name, $key, $value, $params ) {
+	public function object_upsert($name, $key, $value, $params) {
 		$options = array(
 			'type' => 'write',
 		);
 		// If key is set, remove from $params to avoid UPSERT errors.
-		if ( isset( $params[ $key ] ) ) {
-			unset( $params[ $key ] );
+		if (isset($params[$key])) {
+			unset($params[$key]);
 		}
 
 		// allow developers to change both the key and value by which objects should be matched
-		$key   = apply_filters( $this->option_prefix . 'modify_upsert_key', $key );
-		$value = apply_filters( $this->option_prefix . 'modify_upsert_value', $value );
+		$key   = apply_filters($this->option_prefix . 'modify_upsert_key', $key);
+		$value = apply_filters($this->option_prefix . 'modify_upsert_value', $value);
 
-		$data = $this->api_call( "sobjects/{$name}/{$key}/{$value}", $params, 'PATCH', $options );
-		if ( 300 === $this->response['code'] ) {
-			$data['message'] = esc_html( 'The value provided is not unique.' );
+		$data = $this->api_call("sobjects/{$name}/{$key}/{$value}", $params, 'PATCH', $options);
+		if (300 === $this->response['code']) {
+			$data['message'] = esc_html('The value provided is not unique.');
 		}
 		return $data;
 	}
@@ -908,11 +908,11 @@ 
 	*   cached:
 	*   is_redo:
 	*/
-	public function object_update( $name, $id, $params ) {
+	public function object_update($name, $id, $params) {
 		$options = array(
 			'type' => 'write',
 		);
-		$result  = $this->api_call( "sobjects/{$name}/{$id}", $params, 'PATCH', $options );
+		$result  = $this->api_call("sobjects/{$name}/{$id}", $params, 'PATCH', $options);
 		return $result;
 	}
 
@@ -929,8 +929,8 @@ 
 	*
 	* part of core API calls
 	*/
-	public function object_read( $name, $id ) {
-		return $this->api_call( "sobjects/{$name}/{$id}", array(), 'GET' );
+	public function object_read($name, $id) {
+		return $this->api_call("sobjects/{$name}/{$id}", array(), 'GET');
 	}
 
 	/**
@@ -952,8 +952,8 @@ 
 	*
 	* part of core API calls
 	*/
-	public function analytics_api( $name, $id, $route = '', $params = array(), $method = 'GET' ) {
-		return $this->api_call( "analytics/{$name}/{$id}/{$route}", $params, $method );
+	public function analytics_api($name, $id, $route = '', $params = array(), $method = 'GET') {
+		return $this->api_call("analytics/{$name}/{$id}/{$route}", $params, $method);
 	}
 
 	/**
@@ -973,19 +973,19 @@ 
 	*
 	* part of core API calls
 	*/
-	public function run_analytics_report( $id, $async = true, $clear_cache = false, $params = array(), $method = 'GET', $report_cache_expiration = '', $cache_instance = true, $instance_cache_expiration = '' ) {
+	public function run_analytics_report($id, $async = true, $clear_cache = false, $params = array(), $method = 'GET', $report_cache_expiration = '', $cache_instance = true, $instance_cache_expiration = '') {
 
-		$id         = $this->convert_id( $id );
+		$id         = $this->convert_id($id);
 		$report_url = 'analytics/reports/' . $id . '/' . 'instances';
 
-		if ( true === $clear_cache ) {
-			delete_transient( $report_url );
+		if (true === $clear_cache) {
+			delete_transient($report_url);
 		}
 
-		$instance_id = $this->wordpress->cache_get( $report_url, '' );
+		$instance_id = $this->wordpress->cache_get($report_url, '');
 
 		// there is no stored instance id or this is synchronous; retrieve the results for that instance
-		if ( false === $async || false === $instance_id ) {
+		if (false === $async || false === $instance_id) {
 
 			$result = $this->analytics_api(
 				'reports',
@@ -995,7 +995,7 @@ 
 				'GET'
 			);
 			// if we get a reportmetadata array out of this, continue
-			if ( is_array( $result['data']['reportMetadata'] ) ) {
+			if (is_array($result['data']['reportMetadata'])) {
 				$params = array(
 					'reportMetadata' => $result['data']['reportMetadata'],
 				);
@@ -1007,48 +1007,48 @@ 
 					'POST'
 				);
 				// if we get an id from the post, that is the instance id
-				if ( isset( $report['data']['id'] ) ) {
+				if (isset($report['data']['id'])) {
 					$instance_id = $report['data']['id'];
 				} else {
 					// run the call again if we don't have an instance id
 					//error_log('run report again. we have no instance id.');
-					$this->run_analytics_report( $id, true );
+					$this->run_analytics_report($id, true);
 				}
 
 				// cache the instance id so we can get the report results if they are applicable
-				if ( '' === $report_cache_expiration ) {
+				if ('' === $report_cache_expiration) {
 					$report_cache_expiration = $this->cache_expiration();
 				}
-				$this->wordpress->cache_set( $report_url, '', $instance_id, $report_cache_expiration );
+				$this->wordpress->cache_set($report_url, '', $instance_id, $report_cache_expiration);
 			} else {
 				// run the call again if we don't have a reportMetadata array
 				//error_log('run report again. we have no reportmetadata.');
-				$this->run_analytics_report( $id, true );
+				$this->run_analytics_report($id, true);
 			}
 		} // End if().
 
-		$result = $this->api_call( $report_url . "/{$instance_id}", array(), $method );
+		$result = $this->api_call($report_url . "/{$instance_id}", array(), $method);
 
 		// the report instance is expired. rerun it.
-		if ( 404 === $result['code'] ) {
+		if (404 === $result['code']) {
 			//error_log('run report again. it expired.');
-			$this->run_analytics_report( $id, true, true );
+			$this->run_analytics_report($id, true, true);
 		}
 
 		// cache the instance results as a long fallback if the setting says so
 		// do this because salesforce will have errors if the instance has expired or is currently running
 		// remember: the result of the above api_call is already cached (or not) according to the plugin's generic settings
 		// this is fine I think, although it is a bit of redundancy in this case
-		if ( true === $cache_instance ) {
-			$cached = $this->wordpress->cache_get( $report_url . '_instance_cached', '' );
-			if ( is_array( $cached ) ) {
+		if (true === $cache_instance) {
+			$cached = $this->wordpress->cache_get($report_url . '_instance_cached', '');
+			if (is_array($cached)) {
 				$result = $cached;
 			} else {
-				if ( 'Success' === $result['data']['attributes']['status'] ) {
-					if ( '' === $instance_cache_expiration ) {
+				if ('Success' === $result['data']['attributes']['status']) {
+					if ('' === $instance_cache_expiration) {
 						$instance_cache_expiration = $this->cache_expiration();
 					}
-					$this->wordpress->cache_set( $report_url . '_instance_cached', '', $result, $instance_cache_expiration );
+					$this->wordpress->cache_set($report_url . '_instance_cached', '', $result, $instance_cache_expiration);
 				}
 			}
 		}
@@ -1072,8 +1072,8 @@ 
 	*
 	* part of core API calls
 	*/
-	public function object_readby_external_id( $name, $field, $value ) {
-		return $this->api_call( "sobjects/{$name}/{$field}/{$value}" );
+	public function object_readby_external_id($name, $field, $value) {
+		return $this->api_call("sobjects/{$name}/{$field}/{$value}");
 	}
 
 	/**
@@ -1088,11 +1088,11 @@ 
 	*
 	* part of core API calls
 	*/
-	public function object_delete( $name, $id ) {
+	public function object_delete($name, $id) {
 		$options = array(
 			'type' => 'write',
 		);
-		$result  = $this->api_call( "sobjects/{$name}/{$id}", array(), 'DELETE', $options );
+		$result  = $this->api_call("sobjects/{$name}/{$id}", array(), 'DELETE', $options);
 		return $result;
 	}
 
@@ -1108,11 +1108,11 @@ 
 	*   End date to check for deleted objects (in ISO 8601 format).
 	* @return GetDeletedResult
 	*/
-	public function get_deleted( $type, $start_date, $end_date ) {
+	public function get_deleted($type, $start_date, $end_date) {
 		$options = array(
 			'cache' => false,
 		); // this is timestamp level specific; probably should not cache it
-		return $this->api_call( "sobjects/{$type}/deleted/?start={$start_date}&end={$end_date}", array(), 'GET', $options );
+		return $this->api_call("sobjects/{$type}/deleted/?start={$start_date}&end={$end_date}", array(), 'GET', $options);
 	}
 
 
@@ -1125,9 +1125,9 @@ 
 	* part of core API calls
 	*/
 	public function list_resources() {
-		$resources = $this->api_call( '' );
-		foreach ( $resources as $key => $path ) {
-			$items[ $key ] = $path;
+		$resources = $this->api_call('');
+		foreach ($resources as $key => $path) {
+			$items[$key] = $path;
 		}
 		return $items;
 	}
@@ -1158,21 +1158,21 @@ 
 	*
 	* part of core API calls
 	*/
-	public function get_updated( $type, $start = null, $end = null ) {
-		if ( empty( $start ) ) {
-			$start = strtotime( '-29 days' );
+	public function get_updated($type, $start = null, $end = null) {
+		if (empty($start)) {
+			$start = strtotime('-29 days');
 		}
-		$start = rawurlencode( gmdate( DATE_ATOM, $start ) );
+		$start = rawurlencode(gmdate(DATE_ATOM, $start));
 
-		if ( empty( $end ) ) {
+		if (empty($end)) {
 			$end = time();
 		}
-		$end = rawurlencode( gmdate( DATE_ATOM, $end ) );
+		$end = rawurlencode(gmdate(DATE_ATOM, $end));
 
 		$options = array(
 			'cache' => false,
 		); // this is timestamp level specific; probably should not cache it
-		return $this->api_call( "sobjects/{$type}/updated/?start=$start&end=$end", array(), 'GET', $options );
+		return $this->api_call("sobjects/{$type}/updated/?start=$start&end=$end", array(), 'GET', $options);
 	}
 
 	/**
@@ -1190,28 +1190,28 @@ 
 	*   The Salesforce ID of the given Record Type, or null.
 	*/
 
-	public function get_record_type_id_by_developer_name( $name, $devname, $reset = false ) {
+	public function get_record_type_id_by_developer_name($name, $devname, $reset = false) {
 
 		// example of how this runs: $this->get_record_type_id_by_developer_name( 'Account', 'HH_Account' );
 
-		$cached = $this->wordpress->cache_get( 'salesforce_record_types', '' );
-		if ( is_array( $cached ) && ( ! isset( $reset ) || true !== $reset ) ) {
-			return ! empty( $cached[ $name ][ $devname ] ) ? $cached[ $name ][ $devname ]['Id'] : null;
+		$cached = $this->wordpress->cache_get('salesforce_record_types', '');
+		if (is_array($cached) && ( ! isset($reset) || true !== $reset)) {
+			return ! empty($cached[$name][$devname]) ? $cached[$name][$devname]['Id'] : null;
 		}
 
-		$query         = new Object_Sync_Sf_Salesforce_Select_Query( 'RecordType' );
-		$query->fields = array( 'Id', 'Name', 'DeveloperName', 'SobjectType' );
+		$query         = new Object_Sync_Sf_Salesforce_Select_Query('RecordType');
+		$query->fields = array('Id', 'Name', 'DeveloperName', 'SobjectType');
 
-		$result       = $this->query( $query );
+		$result       = $this->query($query);
 		$record_types = array();
 
-		foreach ( $result['data']['records'] as $record_type ) {
-			$record_types[ $record_type['SobjectType'] ][ $record_type['DeveloperName'] ] = $record_type;
+		foreach ($result['data']['records'] as $record_type) {
+			$record_types[$record_type['SobjectType']][$record_type['DeveloperName']] = $record_type;
 		}
 
-		$cached = $this->wordpress->cache_set( 'salesforce_record_types', '', $record_types, $this->options['cache_expiration'] );
+		$cached = $this->wordpress->cache_set('salesforce_record_types', '', $record_types, $this->options['cache_expiration']);
 
-		return ! empty( $record_types[ $name ][ $devname ] ) ? $record_types[ $name ][ $devname ]['Id'] : null;
+		return ! empty($record_types[$name][$devname]) ? $record_types[$name][$devname]['Id'] : null;
 
 	}
 
@@ -1221,7 +1221,7 @@ 
 	*
 	*/
 	private function cache_expiration() {
-		$cache_expiration = $this->wordpress->cache_expiration( $this->option_prefix . 'cache_expiration', 86400 );
+		$cache_expiration = $this->wordpress->cache_expiration($this->option_prefix . 'cache_expiration', 86400);
 		return $cache_expiration;
 	}
 

classes/salesforce_pull.php

Indentation +92 added lines, -92 removed lines

@@ -26,26 +26,26 @@ 
 	protected $queue;
 
 	/**
-	* @var string
-	*/
+	 * @var string
+	 */
 	public $schedule_name; // allow for naming the queue in case there are multiple queues
 
 	/**
-	* Constructor which sets up pull schedule
-	*
-	* @param object $wpdb
-	* @param string $version
-	* @param array $login_credentials
-	* @param string $slug
-	* @param string $option_prefix
-	* @param object $wordpress
-	* @param object $salesforce
-	* @param object $mappings
-	* @param object $logging
-	* @param array $schedulable_classes
-	* @param object $queue
-	* @throws \Exception
-	*/
+	 * Constructor which sets up pull schedule
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param array $login_credentials
+	 * @param string $slug
+	 * @param string $option_prefix
+	 * @param object $wordpress
+	 * @param object $salesforce
+	 * @param object $mappings
+	 * @param object $logging
+	 * @param array $schedulable_classes
+	 * @param object $queue
+	 * @throws \Exception
+	 */
 	public function __construct( $wpdb, $version, $login_credentials, $slug, $option_prefix, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue ) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
@@ -69,9 +69,9 @@ 
 	}
 
 	/**
-	* Create the action hooks based on what object maps exist from the admin settings
-	*
-	*/
+	 * Create the action hooks based on what object maps exist from the admin settings
+	 *
+	 */
 	public function add_actions() {
 
 		// ajax hook
@@ -83,11 +83,11 @@ 
 	}
 
 	/**
-	* Ajax callback for salesforce pull. Returns status of 200 for successful
-	* attempt or 403 for a failed pull attempt (SF not authorized, threshhold
-	* reached, etc.
-	* this is the ajax callback; not a cron run
-	*/
+	 * Ajax callback for salesforce pull. Returns status of 200 for successful
+	 * attempt or 403 for a failed pull attempt (SF not authorized, threshhold
+	 * reached, etc.
+	 * this is the ajax callback; not a cron run
+	 */
 	public function salesforce_pull_webhook() {
 
 		if ( true === $this->salesforce_pull() ) {
@@ -113,8 +113,8 @@ 
 	}
 
 	/**
-	* Callback for the standard pull process used by webhooks and cron.
-	*/
+	 * Callback for the standard pull process used by webhooks and cron.
+	 */
 	public function salesforce_pull() {
 		$sfapi = $this->salesforce['sfapi'];
 
@@ -134,13 +134,13 @@ 
 	}
 
 	/**
-	* Determines if the Salesforce pull should be allowed, or throttled.
-	*
-	* Prevents too many pull processes from running at once.
-	*
-	* @return bool
-	*    Returns false if the time elapsed between recent pulls is too short.
-	*/
+	 * Determines if the Salesforce pull should be allowed, or throttled.
+	 *
+	 * Prevents too many pull processes from running at once.
+	 *
+	 * @return bool
+	 *    Returns false if the time elapsed between recent pulls is too short.
+	 */
 	private function check_throttle() {
 		$pull_throttle = get_option( $this->option_prefix . 'pull_throttle', 5 );
 		$last_sync     = get_option( $this->option_prefix . 'pull_last_sync', 0 );
@@ -153,14 +153,14 @@ 
 	}
 
 	/**
-	* Pull updated records from Salesforce and place them in the queue.
-	*
-	* Executes a SOQL query based on defined mappings, loops through the results,
-	* and places each updated SF object into the queue for later processing.
-	*
-	* We copy the convention from the Drupal module here, and run a separate SOQL query for each type of object in SF
-	*
-	*/
+	 * Pull updated records from Salesforce and place them in the queue.
+	 *
+	 * Executes a SOQL query based on defined mappings, loops through the results,
+	 * and places each updated SF object into the queue for later processing.
+	 *
+	 * We copy the convention from the Drupal module here, and run a separate SOQL query for each type of object in SF
+	 *
+	 */
 	private function get_updated_records() {
 		$sfapi = $this->salesforce['sfapi'];
 		foreach ( $this->mappings->get_fieldmaps() as $salesforce_mapping ) {
@@ -344,18 +344,18 @@ 
 	}
 
 	/**
-	* Given a SObject type name, build an SOQL query to include all fields for all
-	* SalesforceMappings mapped to that SObject.
-	*
-	* @param string $type
-	*   e.g. "Contact", "Account", etc.
-	*
-	* @return Object_Sync_Sf_Salesforce_Select_Query or null if no mappings or no mapped fields
-	*   were found.
-	*
-	* @see Object_Sync_Sf_Mapping::get_mapped_fields
-	* @see Object_Sync_Sf_Mapping::get_mapped_record_types
-	*/
+	 * Given a SObject type name, build an SOQL query to include all fields for all
+	 * SalesforceMappings mapped to that SObject.
+	 *
+	 * @param string $type
+	 *   e.g. "Contact", "Account", etc.
+	 *
+	 * @return Object_Sync_Sf_Salesforce_Select_Query or null if no mappings or no mapped fields
+	 *   were found.
+	 *
+	 * @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() ) {
 		$mapped_fields       = array();
 		$mapped_record_types = array();
@@ -440,10 +440,10 @@ 
 	}
 
 	/**
-	* Get deleted records from salesforce.
-	* Note that deletions can only be queried via REST with an API version >= 29.0.
-	*
-	*/
+	 * Get deleted records from salesforce.
+	 * Note that deletions can only be queried via REST with an API version >= 29.0.
+	 *
+	 */
 	private function get_deleted_records() {
 
 		$sfapi = $this->salesforce['sfapi'];
@@ -544,13 +544,13 @@ 
 	}
 
 	/**
-	* Method for ajax hooks to call for pulling manually
-	*
-	* @param string $object_type
-	* @param string $salesforce_id
-	* @param string $wordpress_object
-	*
-	*/
+	 * Method for ajax hooks to call for pulling manually
+	 *
+	 * @param string $object_type
+	 * @param string $salesforce_id
+	 * @param string $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 );
@@ -565,20 +565,20 @@ 
 	}
 
 	/**
-	* Sync WordPress objects and Salesforce objects from the queue using the REST API.
-	*
-	* @param string $object_type
-	*   Type of Salesforce object.
-	* @param array|string $object
-	*   The Salesforce data or its Id value.
-	* @param array|int $mapping
-	*   Salesforce/WP mapping data or its id.
-	* @param int $sf_sync_trigger
-	*   Trigger for this sync.
-	*
-	* @return true or exit the method
-	*
-	*/
+	 * Sync WordPress objects and Salesforce objects from the queue using the REST API.
+	 *
+	 * @param string $object_type
+	 *   Type of Salesforce object.
+	 * @param array|string $object
+	 *   The Salesforce data or its Id value.
+	 * @param array|int $mapping
+	 *   Salesforce/WP mapping data or its id.
+	 * @param int $sf_sync_trigger
+	 *   Trigger for this sync.
+	 *
+	 * @return true or exit the method
+	 *
+	 */
 	public function salesforce_pull_process_records( $object_type, $object, $mapping, $sf_sync_trigger ) {
 
 		$sfapi = $this->salesforce['sfapi'];
@@ -1308,19 +1308,19 @@ 
 	}
 
 	/**
-	* Create an object map between a Salesforce object and a WordPress object
-	*
-	* @param array $salesforce_object
-	*   Array of the salesforce object's data
-	* @param string $wordpress_id
-	*   Unique identifier for the WordPress object
-	* @param array $field_mapping
-	*   The row that maps the object types together, including which fields match which other fields
-	*
-	* @return int $wpdb->insert_id
-	*   This is the database row for the map object
-	*
-	*/
+	 * Create an object map between a Salesforce object and a WordPress object
+	 *
+	 * @param array $salesforce_object
+	 *   Array of the salesforce object's data
+	 * @param string $wordpress_id
+	 *   Unique identifier for the WordPress object
+	 * @param array $field_mapping
+	 *   The row that maps the object types together, including which fields match which other fields
+	 *
+	 * @return int $wpdb->insert_id
+	 *   This is the database row for the map object
+	 *
+	 */
 	private function create_object_map( $salesforce_object, $wordpress_id, $field_mapping ) {
 		// Create object map and save it
 		$mapping_object = $this->mappings->create_object_map(

Spacing +320 added lines, -320 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -46,7 +46,7 @@ 
 	* @param object $queue
 	* @throws \Exception
 	*/
-	public function __construct( $wpdb, $version, $login_credentials, $slug, $option_prefix, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue ) {
+	public function __construct($wpdb, $version, $login_credentials, $slug, $option_prefix, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
 		$this->login_credentials   = $login_credentials;
@@ -62,9 +62,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( $this->option_prefix . 'debug_mode', false );
+		$this->debug = get_option($this->option_prefix . 'debug_mode', false);
 
 	}
 
@@ -75,11 +75,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( $this->option_prefix . 'pull_check_records', array( $this, 'salesforce_pull' ), 10 );
-		add_action( $this->option_prefix . 'pull_process_records', array( $this, 'salesforce_pull_process_records' ), 10, 4 );
+		add_action($this->option_prefix . 'pull_check_records', array($this, 'salesforce_pull'), 10);
+		add_action($this->option_prefix . 'pull_process_records', array($this, 'salesforce_pull_process_records'), 10, 4);
 	}
 
 	/**
@@ -90,12 +90,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
 			);
@@ -104,8 +104,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;
 		}
@@ -118,13 +118,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( $this->option_prefix . 'pull_last_sync', current_time( 'timestamp', true ) );
+			update_option($this->option_prefix . 'pull_last_sync', current_time('timestamp', true));
 			return true;
 
 		} else {
@@ -142,10 +142,10 @@ 
 	*    Returns false if the time elapsed between recent pulls is too short.
 	*/
 	private function check_throttle() {
-		$pull_throttle = get_option( $this->option_prefix . 'pull_throttle', 5 );
-		$last_sync     = get_option( $this->option_prefix . 'pull_last_sync', 0 );
+		$pull_throttle = get_option($this->option_prefix . 'pull_throttle', 5);
+		$last_sync     = get_option($this->option_prefix . '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;
@@ -163,14 +163,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;
 			}
 
@@ -185,17 +185,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( $this->option_prefix . 'pull_last_sync_' . $type, null );
-			$last_sync    = gmdate( 'Y-m-d\TH:i:s\Z', $sf_last_sync );
+			$sf_last_sync = get_option($this->option_prefix . '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;
@@ -203,7 +203,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,
@@ -215,16 +215,16 @@ 
 						$pull_allowed = true;
 
 						// if the current fieldmap does not allow create, we need to check if there is an object map 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( $this->option_prefix . 'pull_object_allowed', $pull_allowed, $type, $result, $sf_sync_trigger, $salesforce_mapping );
+						$pull_allowed = apply_filters($this->option_prefix . 'pull_object_allowed', $pull_allowed, $type, $result, $sf_sync_trigger, $salesforce_mapping);
 
 						// example to keep from pulling the Contact with id of abcdef
 						/*
@@ -237,35 +237,35 @@ 
 						}
 						*/
 
-						if ( false === $pull_allowed ) {
-							update_option( $this->option_prefix . 'pull_last_sync_' . $type, current_time( 'timestamp', true ) );
+						if (false === $pull_allowed) {
+							update_option($this->option_prefix . '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( $this->option_prefix . '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($this->option_prefix . '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',
@@ -274,11 +274,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;
@@ -286,7 +286,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,
@@ -296,39 +296,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( $this->option_prefix . '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($this->option_prefix . '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(
@@ -356,7 +356,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();
 
@@ -368,35 +368,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(
@@ -408,7 +408,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';
 		}
 
@@ -416,14 +416,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( $this->option_prefix . 'activate_time', '' );
-		$sf_last_sync     = get_option( $this->option_prefix . '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($this->option_prefix . 'activate_time', '');
+		$sf_last_sync     = get_option($this->option_prefix . '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
 		}
 
@@ -433,7 +433,7 @@ 
 		);
 
 		// Set a limit on the number of records that can be retrieved from the API at one time.
-		$soql->limit = filter_var( get_option( $this->option_prefix . 'pull_query_limit', 25 ), FILTER_VALIDATE_INT );
+		$soql->limit = filter_var(get_option($this->option_prefix . 'pull_query_limit', 25), FILTER_VALIDATE_INT);
 
 		return $soql;
 
@@ -452,7 +452,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'];
 
@@ -464,37 +464,37 @@ 
 			);
 
 			// Iterate over each field mapping to determine our query parameters.
-			foreach ( $mappings as $mapping ) {
+			foreach ($mappings as $mapping) {
 
-				$last_delete_sync = get_option( $this->option_prefix . 'pull_delete_last_' . $type, current_time( 'timestamp', true ) );
-				$now              = current_time( 'timestamp', true );
-				update_option( $this->option_prefix . 'pull_delete_last_' . $type, $now );
+				$last_delete_sync = get_option($this->option_prefix . 'pull_delete_last_' . $type, current_time('timestamp', true));
+				$now              = current_time('timestamp', true);
+				update_option($this->option_prefix . '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(
@@ -506,7 +506,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( $this->option_prefix . 'pull_object_allowed', true, $type, $result, $sf_sync_trigger, $salesforce_mapping );
+					$pull_allowed = apply_filters($this->option_prefix . 'pull_object_allowed', true, $type, $result, $sf_sync_trigger, $salesforce_mapping);
 
 					// example to keep from pulling the Contact with id of abcdef
 					/*
@@ -519,17 +519,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
@@ -537,7 +537,7 @@ 
 
 				}
 
-				update_option( $this->option_prefix . 'pull_delete_last_' . $type, current_time( 'timestamp', true ) );
+				update_option($this->option_prefix . 'pull_delete_last_' . $type, current_time('timestamp', true));
 
 			} // End foreach().
 		} // End foreach().
@@ -551,9 +551,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(
@@ -561,7 +561,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);
 	}
 
 	/**
@@ -579,59 +579,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
@@ -643,7 +643,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( $this->option_prefix . 'pull_mapping_object', $mapping_object, $object, $mapping );
+			$mapping_object = apply_filters($this->option_prefix . '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(
@@ -652,58 +652,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(
@@ -714,38 +714,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( $this->option_prefix . 'pull_fail', $op, $result, $synced_object );
+							do_action($this->option_prefix . '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(
@@ -757,38 +757,38 @@ 
 							);
 
 							// hook for pull success
-							do_action( $this->option_prefix . 'pull_success', $op, $result, $synced_object );
+							do_action($this->option_prefix . '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(
@@ -802,27 +802,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( $this->option_prefix . 'pull_params_modify', $params, $mapping, $object, $sf_sync_trigger, false, $is_new );
+			$params = apply_filters($this->option_prefix . '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'];
@@ -832,22 +832,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(
@@ -865,24 +865,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( $this->option_prefix . 'find_wp_object_match', null, $object, $mapping, 'pull' );
+					$wordpress_id = apply_filters($this->option_prefix . '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( $this->option_prefix . 'pre_pull', $wordpress_id, $mapping, $object, $object_id, $params );
+					do_action($this->option_prefix . '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();
@@ -891,13 +891,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,
@@ -912,35 +912,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(
@@ -954,37 +954,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;
@@ -1003,9 +1003,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,
@@ -1014,50 +1014,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;
@@ -1071,26 +1071,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( $this->option_prefix . 'pull_fail', $op, $result, $synced_object );
+					do_action($this->option_prefix . '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;
 				}
@@ -1099,23 +1099,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(
@@ -1128,40 +1128,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( $this->option_prefix . 'pull_success', $op, $result, $synced_object );
+					do_action($this->option_prefix . '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(
@@ -1173,52 +1173,52 @@ 
 					);
 
 					// hook for pull fail
-					do_action( $this->option_prefix . 'pull_fail', $op, $result, $synced_object );
+					do_action($this->option_prefix . '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( $this->option_prefix . 'pre_pull', $mapping_object['wordpress_id'], $mapping, $object, $object_id, $params );
+					do_action($this->option_prefix . '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(
@@ -1230,25 +1230,25 @@ 
 					);
 
 					// hook for pull success
-					do_action( $this->option_prefix . 'pull_success', $op, $result, $synced_object );
+					do_action($this->option_prefix . '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(
@@ -1262,18 +1262,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( $this->option_prefix . 'pull_fail', $op, $result, $synced_object );
+					do_action($this->option_prefix . 'pull_fail', $op, $result, $synced_object);
 
 				} // End try().
 
@@ -1282,26 +1282,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;
 		}
 
@@ -1321,17 +1321,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/logging.php

Spacing +57 added lines, -57 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -32,14 +32,14 @@ 
 	 * @param string $option_prefix The plugin's option prefix
 	 * @throws \Exception
 	 */
-	public function __construct( $wpdb, $version, $slug, $option_prefix ) {
+	public function __construct($wpdb, $version, $slug, $option_prefix) {
 		$this->wpdb          = $wpdb;
 		$this->version       = $version;
 		$this->slug          = $slug;
 		$this->option_prefix = $option_prefix;
 
-		$this->enabled         = get_option( $this->option_prefix . 'enable_logging', false );
-		$this->statuses_to_log = get_option( $this->option_prefix . 'statuses_to_log', array() );
+		$this->enabled         = get_option($this->option_prefix . 'enable_logging', false);
+		$this->statuses_to_log = get_option($this->option_prefix . 'statuses_to_log', array());
 
 		$this->schedule_name = 'wp_logging_prune_routine';
 
@@ -53,26 +53,26 @@ 
 	 * @throws \Exception
 	 */
 	private function init() {
-		if ( '1' === $this->enabled ) {
-			add_filter( 'cron_schedules', array( $this, 'add_prune_interval' ) );
-			add_filter( 'wp_log_types', array( $this, 'set_log_types' ), 10, 1 );
-			add_filter( 'wp_logging_should_we_prune', array( $this, 'set_prune_option' ), 10, 1 );
-			add_filter( 'wp_logging_prune_when', array( $this, 'set_prune_age' ), 10, 1 );
-			add_filter( 'wp_logging_prune_query_args', array( $this, 'set_prune_args' ), 10, 1 );
-			add_filter( 'wp_logging_post_type_args', array( $this, 'set_log_visibility' ), 10, 1 );
-
-			$schedule_unit   = get_option( $this->option_prefix . 'logs_how_often_unit', '' );
-			$schedule_number = get_option( $this->option_prefix . 'logs_how_often_number', '' );
-			$frequency       = $this->get_schedule_frequency( $schedule_unit, $schedule_number );
+		if ('1' === $this->enabled) {
+			add_filter('cron_schedules', array($this, 'add_prune_interval'));
+			add_filter('wp_log_types', array($this, 'set_log_types'), 10, 1);
+			add_filter('wp_logging_should_we_prune', array($this, 'set_prune_option'), 10, 1);
+			add_filter('wp_logging_prune_when', array($this, 'set_prune_age'), 10, 1);
+			add_filter('wp_logging_prune_query_args', array($this, 'set_prune_args'), 10, 1);
+			add_filter('wp_logging_post_type_args', array($this, 'set_log_visibility'), 10, 1);
+
+			$schedule_unit   = get_option($this->option_prefix . 'logs_how_often_unit', '');
+			$schedule_number = get_option($this->option_prefix . 'logs_how_often_number', '');
+			$frequency       = $this->get_schedule_frequency($schedule_unit, $schedule_number);
 			$key             = $frequency['key'];
 
-			if ( ! wp_next_scheduled( $this->schedule_name ) ) {
-				wp_schedule_event( time(), $key, $this->schedule_name );
+			if ( ! wp_next_scheduled($this->schedule_name)) {
+				wp_schedule_event(time(), $key, $this->schedule_name);
 			}
 		}
 	}
 
-	public function set_log_visibility( $log_args ) {
+	public function set_log_visibility($log_args) {
 		// set public to true overrides the WP_DEBUG setting that is the default on the class
 		// capabilities makes it so (currently) only admin users can see the log posts in their admin view
 		// note: there is no actual "public" view for this post type
@@ -88,7 +88,7 @@ 
 			'read_private_posts' => 'configure_salesforce',
 		);
 
-		$log_args = apply_filters( $this->option_prefix . 'logging_post_type_args', $log_args );
+		$log_args = apply_filters($this->option_prefix . 'logging_post_type_args', $log_args);
 
 		return $log_args;
 	}
@@ -99,15 +99,15 @@ 
 	 * @param array $schedules An array of scheduled cron items.
 	 * @return array $frequency
 	 */
-	public function add_prune_interval( $schedules ) {
+	public function add_prune_interval($schedules) {
 
-		$schedule_unit   = get_option( $this->option_prefix . 'logs_how_often_unit', '' );
-		$schedule_number = get_option( $this->option_prefix . 'logs_how_often_number', '' );
-		$frequency       = $this->get_schedule_frequency( $schedule_unit, $schedule_number );
+		$schedule_unit   = get_option($this->option_prefix . 'logs_how_often_unit', '');
+		$schedule_number = get_option($this->option_prefix . 'logs_how_often_number', '');
+		$frequency       = $this->get_schedule_frequency($schedule_unit, $schedule_number);
 		$key             = $frequency['key'];
 		$seconds         = $frequency['seconds'];
 
-		$schedules[ $key ] = array(
+		$schedules[$key] = array(
 			'interval' => $seconds * $schedule_number,
 			'display'  => 'Every ' . $schedule_number . ' ' . $schedule_unit,
 		);
@@ -124,9 +124,9 @@ 
 	 * @param number $number The number of those units.
 	 * @return array
 	 */
-	public function get_schedule_frequency( $unit, $number ) {
+	public function get_schedule_frequency($unit, $number) {
 
-		switch ( $unit ) {
+		switch ($unit) {
 			case 'minutes':
 				$seconds = 60;
 				break;
@@ -155,7 +155,7 @@ 
 	 * @param array $terms An array of string log types in the WP_Logging class.
 	 * @return array $terms
 	 */
-	public function set_log_types( $terms ) {
+	public function set_log_types($terms) {
 		$terms[] = 'salesforce';
 		return $terms;
 	}
@@ -166,9 +166,9 @@ 
 	 * @param string $should_we_prune Whether to prune old log items.
 	 * @return string $should_we_prune Whether to prune old log items.
 	 */
-	public function set_prune_option( $should_we_prune ) {
-		$should_we_prune = get_option( $this->option_prefix . 'prune_logs', $should_we_prune );
-		if ( '1' === $should_we_prune ) {
+	public function set_prune_option($should_we_prune) {
+		$should_we_prune = get_option($this->option_prefix . 'prune_logs', $should_we_prune);
+		if ('1' === $should_we_prune) {
 			$should_we_prune = true;
 		}
 		return $should_we_prune;
@@ -180,9 +180,9 @@ 
 	 * @param string $how_old How old the oldest non-pruned log items should be allowed to be.
 	 * @return string $how_old
 	 */
-	public function set_prune_age( $how_old ) {
-		$value = get_option( $this->option_prefix . 'logs_how_old', '' ) . ' ago';
-		if ( '' !== $value ) {
+	public function set_prune_age($how_old) {
+		$value = get_option($this->option_prefix . 'logs_how_old', '') . ' ago';
+		if ('' !== $value) {
 			return $value;
 		} else {
 			return $how_old;
@@ -195,7 +195,7 @@ 
 	 * @param array $args Argument array for get_posts determining what posts are eligible for pruning.
 	 * @return array $args
 	 */
-	public function set_prune_args( $args ) {
+	public function set_prune_args($args) {
 		$args['wp_log_type'] = 'salesforce';
 		return $args;
 	}
@@ -219,12 +219,12 @@ 
 	 *
 	 * @return      void
 	 */
-	public function setup( $title, $message, $trigger = 0, $parent = 0, $status ) {
-		if ( '1' === $this->enabled && in_array( $status, maybe_unserialize( $this->statuses_to_log ), true ) ) {
-			$triggers_to_log = get_option( $this->option_prefix . 'triggers_to_log', array() );
+	public function setup($title, $message, $trigger = 0, $parent = 0, $status) {
+		if ('1' === $this->enabled && in_array($status, maybe_unserialize($this->statuses_to_log), true)) {
+			$triggers_to_log = get_option($this->option_prefix . 'triggers_to_log', array());
 			// if we force strict on this in_array, it fails because the mapping triggers are bit operators, as indicated in Object_Sync_Sf_Mapping class's method __construct()
-			if ( in_array( $trigger, maybe_unserialize( $triggers_to_log ) ) || 0 === $trigger ) {
-				$this->add( $title, $message, $parent );
+			if (in_array($trigger, maybe_unserialize($triggers_to_log)) || 0 === $trigger) {
+				$this->add($title, $message, $parent);
 			}
 		}
 	}
@@ -247,16 +247,16 @@ 
 	 *
 	 * @return      int The ID of the new log entry
 	 */
-	public static function add( $title = '', $message = '', $parent = 0, $type = 'salesforce' ) {
+	public static function add($title = '', $message = '', $parent = 0, $type = 'salesforce') {
 
 		$log_data = array(
-			'post_title'   => esc_html( $title ),
-			'post_content' => wp_kses_post( $message ),
-			'post_parent'  => absint( $parent ),
-			'log_type'     => esc_attr( $type ),
+			'post_title'   => esc_html($title),
+			'post_content' => wp_kses_post($message),
+			'post_parent'  => absint($parent),
+			'log_type'     => esc_attr($type),
 		);
 
-		return self::insert_log( $log_data );
+		return self::insert_log($log_data);
 
 	}
 
@@ -275,7 +275,7 @@ 
 	 *
 	 * @return      array
 	 */
-	public static function get_logs( $object_id = 0, $type = 'salesforce', $paged = null ) {
+	public static function get_logs($object_id = 0, $type = 'salesforce', $paged = null) {
 		return self::get_connected_logs(
 			array(
 				'post_parent' => (int) $object_id,
@@ -303,20 +303,20 @@ 
 	 *
 	 * @return  array / false
 	 */
-	public static function get_connected_logs( $args = array() ) {
+	public static function get_connected_logs($args = array()) {
 
 		$defaults = array(
 			'post_parent'    => 0,
 			'post_type'      => 'wp_log',
 			'posts_per_page' => 10,
 			'post_status'    => 'publish',
-			'paged'          => get_query_var( 'paged' ),
+			'paged'          => get_query_var('paged'),
 			'log_type'       => 'salesforce',
 		);
 
-		$query_args = wp_parse_args( $args, $defaults );
+		$query_args = wp_parse_args($args, $defaults);
 
-		if ( $query_args['log_type'] && self::valid_type( $query_args['log_type'] ) ) {
+		if ($query_args['log_type'] && self::valid_type($query_args['log_type'])) {
 
 			$query_args['tax_query'] = array(
 				array(
@@ -328,9 +328,9 @@ 
 
 		}
 
-		$logs = get_posts( $query_args );
+		$logs = get_posts($query_args);
 
-		if ( $logs ) {
+		if ($logs) {
 			return $logs;
 		}
 
@@ -355,7 +355,7 @@ 
 	 *
 	 * @return  int
 	 */
-	public static function get_log_count( $object_id = 0, $type = 'salesforce', $meta_query = null ) {
+	public static function get_log_count($object_id = 0, $type = 'salesforce', $meta_query = null) {
 
 		$query_args = array(
 			'post_parent'    => (int) $object_id,
@@ -364,23 +364,23 @@ 
 			'post_status'    => 'publish',
 		);
 
-		if ( ! empty( $type ) && self::valid_type( $type ) ) {
+		if ( ! empty($type) && self::valid_type($type)) {
 
 			$query_args['tax_query'] = array(
 				array(
 					'taxonomy' => 'wp_log_type',
 					'field'    => 'slug',
-					'terms'    => sanitize_key( $type ),
+					'terms'    => sanitize_key($type),
 				),
 			);
 
 		}
 
-		if ( ! empty( $meta_query ) ) {
+		if ( ! empty($meta_query)) {
 			$query_args['meta_query'] = $meta_query;
 		}
 
-		$logs = new WP_Query( $query_args );
+		$logs = new WP_Query($query_args);
 
 		return (int) $logs->post_count;
 

classes/wordpress.php

Spacing +492 added lines, -492 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -32,7 +32,7 @@ 
 	 * @param object $logging a Object_Sync_Sf_Logging instance.
 	 * @throws \Exception
 	 */
-	public function __construct( $wpdb, $version, $slug, $option_prefix, $mappings, $logging ) {
+	public function __construct($wpdb, $version, $slug, $option_prefix, $mappings, $logging) {
 		$this->wpdb          = $wpdb;
 		$this->version       = $version;
 		$this->slug          = $slug;
@@ -40,19 +40,19 @@ 
 		$this->mappings      = $mappings;
 		$this->logging       = $logging;
 
-		add_action( 'admin_init', function() {
+		add_action('admin_init', function() {
 			$this->wordpress_objects = $this->get_object_types();
 		} );
 
 		$this->options = array(
 			'cache'            => true,
-			'cache_expiration' => $this->cache_expiration( 'wordpress_data_cache', 86400 ),
+			'cache_expiration' => $this->cache_expiration('wordpress_data_cache', 86400),
 			'type'             => 'read',
 		);
 
-		$this->sfwp_transients = new Object_Sync_Sf_WordPress_Transient( 'sfwp_transients' );
+		$this->sfwp_transients = new Object_Sync_Sf_WordPress_Transient('sfwp_transients');
 
-		$this->debug = get_option( $this->option_prefix . 'debug_mode', false );
+		$this->debug = get_option($this->option_prefix . 'debug_mode', false);
 
 	}
 
@@ -80,20 +80,20 @@ 
 		*/
 
 		// this should include the available object types and send them to the hook
-		$wordpress_types_not_posts_include = array( 'user', 'comment', 'category', 'tag' );
-		$wordpress_objects                 = array_merge( get_post_types(), $wordpress_types_not_posts_include );
+		$wordpress_types_not_posts_include = array('user', 'comment', 'category', 'tag');
+		$wordpress_objects                 = array_merge(get_post_types(), $wordpress_types_not_posts_include);
 		// this should be all the objects
-		$wordpress_objects = apply_filters( $this->option_prefix . 'add_more_wordpress_types', $wordpress_objects );
+		$wordpress_objects = apply_filters($this->option_prefix . 'add_more_wordpress_types', $wordpress_objects);
 
 		// by default, only remove the log type we use in this plugin
-		$types_to_remove = apply_filters( $this->option_prefix . 'remove_wordpress_types', array( 'wp_log' ) );
+		$types_to_remove = apply_filters($this->option_prefix . 'remove_wordpress_types', array('wp_log'));
 
 		// if the hook filters out any types, remove them from the visible list
-		if ( ! empty( $types_to_remove ) ) {
-			$wordpress_objects = array_diff( $wordpress_objects, $types_to_remove );
+		if ( ! empty($types_to_remove)) {
+			$wordpress_objects = array_diff($wordpress_objects, $types_to_remove);
 		}
 
-		sort( $wordpress_objects );
+		sort($wordpress_objects);
 		return $wordpress_objects;
 	}
 
@@ -103,8 +103,8 @@ 
 	 * @param string $object_type The type of object.
 	 * @return array $object_table_structure The table structure.
 	 */
-	public function get_wordpress_table_structure( $object_type ) {
-		if ( 'attachment' === $object_type ) {
+	public function get_wordpress_table_structure($object_type) {
+		if ('attachment' === $object_type) {
 			$object_table_structure = array(
 				'object_name'     => 'post',
 				'content_methods' => array(
@@ -126,7 +126,7 @@ 
 				'where'           => 'AND ' . $this->wpdb->prefix . 'posts.post_type = "' . $object_type . '"',
 				'ignore_keys'     => array(),
 			);
-		} elseif ( 'user' === $object_type ) {
+		} elseif ('user' === $object_type) {
 			// User meta fields need to use update_user_meta for create as well, otherwise it'll just get created twice because apparently when the post is created it's already there.
 			$object_table_structure = array(
 				'object_name'     => 'user',
@@ -153,7 +153,7 @@ 
 					'session_tokens',
 				),
 			);
-		} elseif ( 'post' === $object_type ) {
+		} elseif ('post' === $object_type) {
 			$object_table_structure = array(
 				'object_name'     => 'post',
 				'content_methods' => array(
@@ -175,7 +175,7 @@ 
 				'where'           => 'AND ' . $this->wpdb->prefix . 'posts.post_type = "' . $object_type . '"',
 				'ignore_keys'     => array(),
 			);
-		} elseif ( 'category' === $object_type || 'tag' === $object_type || 'post_tag' === $object_type ) {
+		} elseif ('category' === $object_type || 'tag' === $object_type || 'post_tag' === $object_type) {
 			// I am unsure why post_tag wasn't here for so long, but i figure it probably needs to be there.
 			$object_table_structure = array(
 				'object_name'     => 'term',
@@ -193,12 +193,12 @@ 
 				),
 				'content_table'   => $this->wpdb->prefix . 'terms',
 				'id_field'        => 'term_id',
-				'meta_table'      => array( $this->wpdb->prefix . 'termmeta', $this->wpdb->prefix . 'term_taxonomy' ),
+				'meta_table'      => array($this->wpdb->prefix . 'termmeta', $this->wpdb->prefix . 'term_taxonomy'),
 				'meta_join_field' => 'term_id',
 				'where'           => '',
 				'ignore_keys'     => array(),
 			);
-		} elseif ( 'comment' === $object_type ) {
+		} elseif ('comment' === $object_type) {
 			$object_table_structure = array(
 				'object_name'     => 'comment',
 				'content_methods' => array(
@@ -254,14 +254,14 @@ 
 	 * @param string $id_field The field of that object that corresponds with its ID in the database.
 	 * @return array $object_fields
 	 */
-	public function get_wordpress_object_fields( $wordpress_object, $id_field = 'ID' ) {
+	public function get_wordpress_object_fields($wordpress_object, $id_field = 'ID') {
 
-		$object_table_structure = $this->get_wordpress_table_structure( $wordpress_object );
+		$object_table_structure = $this->get_wordpress_table_structure($wordpress_object);
 
 		$meta_table      = $object_table_structure['meta_table'];
-		$meta_methods    = maybe_unserialize( $object_table_structure['meta_methods'] );
+		$meta_methods    = maybe_unserialize($object_table_structure['meta_methods']);
 		$content_table   = $object_table_structure['content_table'];
-		$content_methods = maybe_unserialize( $object_table_structure['content_methods'] );
+		$content_methods = maybe_unserialize($object_table_structure['content_methods']);
 		$id_field        = $object_table_structure['id_field'];
 		$object_name     = $object_table_structure['object_name'];
 		$where           = $object_table_structure['where'];
@@ -270,23 +270,23 @@ 
 		$object_fields = array();
 
 		// Try to find the object fields in cache before acquiring it from other source.
-		if ( true === $this->options['cache'] && 'write' !== $this->options['cache'] ) {
-			$cached = $this->cache_get( $wordpress_object, array( 'data', 'meta' ) );
-			if ( is_array( $cached ) ) {
+		if (true === $this->options['cache'] && 'write' !== $this->options['cache']) {
+			$cached = $this->cache_get($wordpress_object, array('data', 'meta'));
+			if (is_array($cached)) {
 				$object_fields['data']       = $cached;
 				$object_fields['from_cache'] = true;
 				$object_fields['cached']     = true;
 			} else {
-				$object_fields['data'] = $this->object_fields( $object_name, $id_field, $content_table, $content_methods, $meta_table, $meta_methods, $where, $ignore_keys );
-				if ( ! empty( $object_fields['data'] ) ) {
-					$object_fields['cached'] = $this->cache_set( $wordpress_object, array( 'data', 'meta' ), $object_fields['data'], $this->options['cache_expiration'] );
+				$object_fields['data'] = $this->object_fields($object_name, $id_field, $content_table, $content_methods, $meta_table, $meta_methods, $where, $ignore_keys);
+				if ( ! empty($object_fields['data'])) {
+					$object_fields['cached'] = $this->cache_set($wordpress_object, array('data', 'meta'), $object_fields['data'], $this->options['cache_expiration']);
 				} else {
 					$object_fields['cached'] = false;
 				}
 				$object_fields['from_cache'] = false;
 			}
 		} else {
-			$object_fields['data']       = $this->object_fields( $object_name, $id_field, $content_table, $content_methods, $meta_table, $meta_methods, $where, $ignore_keys );
+			$object_fields['data']       = $this->object_fields($object_name, $id_field, $content_table, $content_methods, $meta_table, $meta_methods, $where, $ignore_keys);
 			$object_fields['from_cache'] = false;
 			$object_fields['cached']     = false;
 		}
@@ -297,7 +297,7 @@ 
 		 *     $object_fields = array( 'data' => array(), 'from_cache' => bool, 'cached' => bool );
 		 * This is useful for custom objects that do not use the normal metadata table structure.
 		 */
-		$object_fields = apply_filters( $this->option_prefix . 'wordpress_object_fields', $object_fields, $wordpress_object );
+		$object_fields = apply_filters($this->option_prefix . 'wordpress_object_fields', $object_fields, $wordpress_object);
 
 		return $object_fields['data'];
 
@@ -310,36 +310,36 @@ 
 	 * @param string $object_id The ID of the object.
 	 * @return array $wordpress_object
 	 */
-	public function get_wordpress_object_data( $object_type, $object_id ) {
+	public function get_wordpress_object_data($object_type, $object_id) {
 
 		$wordpress_object       = array();
-		$object_table_structure = $this->get_wordpress_table_structure( $object_type );
+		$object_table_structure = $this->get_wordpress_table_structure($object_type);
 
 		$meta_table      = $object_table_structure['meta_table'];
-		$meta_methods    = maybe_unserialize( $object_table_structure['meta_methods'] );
+		$meta_methods    = maybe_unserialize($object_table_structure['meta_methods']);
 		$content_table   = $object_table_structure['content_table'];
-		$content_methods = maybe_unserialize( $object_table_structure['content_methods'] );
+		$content_methods = maybe_unserialize($object_table_structure['content_methods']);
 		$id_field        = $object_table_structure['id_field'];
 		$object_name     = $object_table_structure['object_name'];
 		$where           = $object_table_structure['where'];
 		$ignore_keys     = $object_table_structure['ignore_keys'];
 
-		if ( 'user' === $object_type ) {
-			$data = get_userdata( $object_id );
-		} elseif ( 'post' === $object_type || 'attachment' === $object_type ) {
-			$data = get_post( $object_id );
-		} elseif ( 'category' === $object_type || 'tag' === $object_type || 'post_tag' === $object_type ) {
-			$data = get_term( $object_id );
-		} elseif ( 'comment' === $object_type ) {
-			$data = get_comment( $object_id );
+		if ('user' === $object_type) {
+			$data = get_userdata($object_id);
+		} elseif ('post' === $object_type || 'attachment' === $object_type) {
+			$data = get_post($object_id);
+		} elseif ('category' === $object_type || 'tag' === $object_type || 'post_tag' === $object_type) {
+			$data = get_term($object_id);
+		} elseif ('comment' === $object_type) {
+			$data = get_comment($object_id);
 		} else { // This is for custom post types.
-			$data = get_post( $object_id );
+			$data = get_post($object_id);
 		}
 
-		$fields = $this->get_wordpress_object_fields( $object_type );
-		foreach ( $fields as $key => $value ) {
+		$fields = $this->get_wordpress_object_fields($object_type);
+		foreach ($fields as $key => $value) {
 			$field                      = $value['key'];
-			$wordpress_object[ $field ] = $data->{$field};
+			$wordpress_object[$field] = $data->{$field};
 		}
 
 		/*
@@ -355,7 +355,7 @@ 
 			}
 		*/
 
-		$wordpress_object = apply_filters( $this->option_prefix . 'wordpress_object_data', $wordpress_object );
+		$wordpress_object = apply_filters($this->option_prefix . 'wordpress_object_data', $wordpress_object);
 
 		return $wordpress_object;
 
@@ -369,16 +369,16 @@ 
 	 * @param array  $args The arguents of the API call.
 	 * @return $this->sfwp_transients->get $cachekey
 	 */
-	public function cache_get( $url, $args ) {
-		if ( is_array( $args ) ) {
+	public function cache_get($url, $args) {
+		if (is_array($args)) {
 			$args[] = $url;
-			array_multisort( $args );
+			array_multisort($args);
 		} else {
 			$args .= $url;
 		}
 
-		$cachekey = md5( wp_json_encode( $args ) );
-		return $this->sfwp_transients->get( $cachekey );
+		$cachekey = md5(wp_json_encode($args));
+		return $this->sfwp_transients->get($cachekey);
 	}
 
 	/**
@@ -391,20 +391,20 @@ 
 	 * @return Bool whether or not the value was set
 	 * @link https://wordpress.stackexchange.com/questions/174330/transient-storage-location-database-xcache-w3total-cache
 	 */
-	public function cache_set( $url, $args, $data, $cache_expiration = '' ) {
-		if ( is_array( $args ) ) {
+	public function cache_set($url, $args, $data, $cache_expiration = '') {
+		if (is_array($args)) {
 			$args[] = $url;
-			array_multisort( $args );
+			array_multisort($args);
 		} else {
 			$args .= $url;
 		}
-		$cachekey = md5( wp_json_encode( $args ) );
+		$cachekey = md5(wp_json_encode($args));
 		// Cache_expiration is how long it should be stored in the cache.
 		// If we didn't give a custom one, use the default.
-		if ( '' === $cache_expiration ) {
+		if ('' === $cache_expiration) {
 			$cache_expiration = $this->options['cache_expiration'];
 		}
-		return $this->sfwp_transients->set( $cachekey, $data, $cache_expiration );
+		return $this->sfwp_transients->set($cachekey, $data, $cache_expiration);
 	}
 
 	/**
@@ -415,8 +415,8 @@ 
 	 * @param int    $expire The default time after which to expire the cache.
 	 * @return The cache expiration saved in the database.
 	 */
-	public function cache_expiration( $option_key, $expire ) {
-		$cache_expiration = get_option( $option_key, $expire );
+	public function cache_expiration($option_key, $expire) {
+		$cache_expiration = get_option($option_key, $expire);
 		return $cache_expiration;
 	}
 
@@ -437,15 +437,15 @@ 
 	 * @param array  $ignore_keys Fields to ignore from the database.
 	 * @return array $all_fields The fields for the object.
 	 */
-	private function object_fields( $object_name, $id_field, $content_table, $content_methods, $meta_table, $meta_methods, $where, $ignore_keys ) {
+	private function object_fields($object_name, $id_field, $content_table, $content_methods, $meta_table, $meta_methods, $where, $ignore_keys) {
 		// These two queries load all the fields from the specified object unless they have been specified as ignore fields.
 		// They also load the fields that are meta_keys from the specified object's meta table.
 		// Maybe a box for a custom query, since custom fields get done in so many ways.
 		// Eventually this would be the kind of thing we could use fields api for, if it ever gets done.
-		$data_fields      = $this->wpdb->get_col( "DESC {$content_table}", 0 );
-		$data_field_types = $this->wpdb->get_col( "DESC {$content_table}", 1 ); // get the database field types
+		$data_fields      = $this->wpdb->get_col("DESC {$content_table}", 0);
+		$data_field_types = $this->wpdb->get_col("DESC {$content_table}", 1); // get the database field types
 
-		if ( is_array( $meta_table ) ) {
+		if (is_array($meta_table)) {
 			$tax_table  = $meta_table[1];
 			$meta_table = $meta_table[0];
 		}
@@ -457,39 +457,39 @@ 
 		WHERE ' . $meta_table . '.meta_key != ""
 		' . $where . '
 		';
-		$meta_fields = $this->wpdb->get_results( $select_meta );
+		$meta_fields = $this->wpdb->get_results($select_meta);
 		$all_fields  = array();
 
-		foreach ( $data_fields as $key => $value ) {
-			if ( ! in_array( $value, $ignore_keys, true ) ) {
+		foreach ($data_fields as $key => $value) {
+			if ( ! in_array($value, $ignore_keys, true)) {
 				$all_fields[] = array(
 					'key'     => $value,
 					'table'   => $content_table,
-					'methods' => serialize( $content_methods ),
-					'type'    => $data_field_types[ $key ],
+					'methods' => serialize($content_methods),
+					'type'    => $data_field_types[$key],
 				);
 			}
 		}
 
-		foreach ( $meta_fields as $key => $value ) {
-			if ( ! in_array( $value->meta_key, $ignore_keys, true ) ) {
+		foreach ($meta_fields as $key => $value) {
+			if ( ! in_array($value->meta_key, $ignore_keys, true)) {
 				$all_fields[] = array(
 					'key'     => $value->meta_key,
 					'table'   => $meta_table,
-					'methods' => serialize( $meta_methods ),
+					'methods' => serialize($meta_methods),
 				);
 			}
 		}
 
-		if ( 'term' === $object_name ) {
-			$taxonomy = $this->wpdb->get_col( "DESC {$tax_table}", 0 );
-			foreach ( $taxonomy as $key => $value ) {
-				$exists = array_search( $value, array_column( $all_fields, 'key' ), true );
-				if ( 0 !== $exists ) {
+		if ('term' === $object_name) {
+			$taxonomy = $this->wpdb->get_col("DESC {$tax_table}", 0);
+			foreach ($taxonomy as $key => $value) {
+				$exists = array_search($value, array_column($all_fields, 'key'), true);
+				if (0 !== $exists) {
 					$all_fields[] = array(
 						'key'     => $value,
 						'table'   => $tax_table,
-						'methods' => serialize( $content_methods ),
+						'methods' => serialize($content_methods),
 					);
 				}
 			}
@@ -516,28 +516,28 @@ 
 	 *
 	 * part of CRUD for WordPress objects
 	 */
-	public function object_create( $name, $params ) {
+	public function object_create($name, $params) {
 
-		$structure = $this->get_wordpress_table_structure( $name );
+		$structure = $this->get_wordpress_table_structure($name);
 		$id_field  = $structure['id_field'];
 
-		switch ( $name ) {
+		switch ($name) {
 			case 'user':
-				$result = $this->user_create( $params, $id_field );
+				$result = $this->user_create($params, $id_field);
 				break;
 			case 'post':
-				$result = $this->post_create( $params, $id_field );
+				$result = $this->post_create($params, $id_field);
 				break;
 			case 'attachment':
-				$result = $this->attachment_create( $params, $id_field );
+				$result = $this->attachment_create($params, $id_field);
 				break;
 			case 'category':
 			case 'tag':
 			case 'post_tag':
-				$result = $this->term_create( $params, $name, $id_field );
+				$result = $this->term_create($params, $name, $id_field);
 				break;
 			case 'comment':
-				$result = $this->comment_create( $params, $id_field );
+				$result = $this->comment_create($params, $id_field);
 				break;
 			default:
 				/*
@@ -550,14 +550,14 @@ 
 				 * the one param is: array( 'name' => objecttype, 'params' => array_of_params, 'id_field' => idfield )
 				 */
 				// Check to see if someone is calling the filter, and apply it if so.
-				if ( ! has_filter( $this->option_prefix . 'create_custom_wordpress_item' ) ) {
-					$result = $this->post_create( $params, $id_field, $name );
+				if ( ! has_filter($this->option_prefix . 'create_custom_wordpress_item')) {
+					$result = $this->post_create($params, $id_field, $name);
 				} else {
-					$result = apply_filters( $this->option_prefix . 'create_custom_wordpress_item', array(
+					$result = apply_filters($this->option_prefix . 'create_custom_wordpress_item', array(
 						'params'   => $params,
 						'name'     => $name,
 						'id_field' => $id_field,
-					) );
+					));
 				}
 				break;
 		} // End switch().
@@ -593,37 +593,37 @@ 
 	 *
 	 * part of CRUD for WordPress objects
 	 */
-	public function object_upsert( $name, $key, $value, $methods = array(), $params, $push_drafts = false, $check_only = false ) {
+	public function object_upsert($name, $key, $value, $methods = array(), $params, $push_drafts = false, $check_only = false) {
 
-		$structure = $this->get_wordpress_table_structure( $name );
+		$structure = $this->get_wordpress_table_structure($name);
 		$id_field  = $structure['id_field'];
 
 		// If key is set, remove from $params to avoid SQL errors.
-		if ( isset( $params[ $key ] ) ) {
-			unset( $params[ $key ] );
+		if (isset($params[$key])) {
+			unset($params[$key]);
 		}
 
 		// Allow developers to change both the key and value by which objects should be matched.
-		$key   = apply_filters( $this->option_prefix . 'modify_upsert_key', $key );
-		$value = apply_filters( $this->option_prefix . 'modify_upsert_value', $value );
+		$key   = apply_filters($this->option_prefix . 'modify_upsert_key', $key);
+		$value = apply_filters($this->option_prefix . 'modify_upsert_value', $value);
 
-		switch ( $name ) {
+		switch ($name) {
 			case 'user':
-				$result = $this->user_upsert( $key, $value, $methods, $params, $id_field, $push_drafts, $check_only );
+				$result = $this->user_upsert($key, $value, $methods, $params, $id_field, $push_drafts, $check_only);
 				break;
 			case 'post':
-				$result = $this->post_upsert( $key, $value, $methods, $params, $id_field, $push_drafts, $name, $check_only );
+				$result = $this->post_upsert($key, $value, $methods, $params, $id_field, $push_drafts, $name, $check_only);
 				break;
 			case 'attachment':
-				$result = $this->attachment_upsert( $key, $value, $methods, $params, $id_field, $check_only );
+				$result = $this->attachment_upsert($key, $value, $methods, $params, $id_field, $check_only);
 				break;
 			case 'category':
 			case 'tag':
 			case 'post_tag':
-				$result = $this->term_upsert( $key, $value, $methods, $params, $name, $id_field, $push_drafts, $check_only );
+				$result = $this->term_upsert($key, $value, $methods, $params, $name, $id_field, $push_drafts, $check_only);
 				break;
 			case 'comment':
-				$result = $this->comment_upsert( $key, $value, $methods, $params, $id_field, $push_drafts, $check_only );
+				$result = $this->comment_upsert($key, $value, $methods, $params, $id_field, $push_drafts, $check_only);
 				break;
 			default:
 				/*
@@ -638,10 +638,10 @@ 
 				 *     array( 'key' => key, 'value' => value, 'methods' => methods, 'params' => array_of_params, 'id_field' => idfield, 'push_drafts' => pushdrafts, 'name' => name, 'check_only' => $check_only )
 				*/
 				// Check to see if someone is calling the filter, and apply it if so.
-				if ( ! has_filter( $this->option_prefix . 'upsert_custom_wordpress_item' ) ) {
-					$result = $this->post_upsert( $key, $value, $methods, $params, $id_field, $push_drafts, $name, $check_only );
+				if ( ! has_filter($this->option_prefix . 'upsert_custom_wordpress_item')) {
+					$result = $this->post_upsert($key, $value, $methods, $params, $id_field, $push_drafts, $name, $check_only);
 				} else {
-					$result = apply_filters( $this->option_prefix . 'upsert_custom_wordpress_item', array(
+					$result = apply_filters($this->option_prefix . 'upsert_custom_wordpress_item', array(
 						'key'         => $key,
 						'value'       => $value,
 						'methods'     => $methods,
@@ -650,7 +650,7 @@ 
 						'push_drafts' => $push_drafts,
 						'name'        => $name,
 						'check_only'  => $check_only,
-					) );
+					));
 				}
 				break;
 		} // End switch().
@@ -676,29 +676,29 @@ 
 	 *   cached:
 	 *   is_redo:
 	 */
-	public function object_update( $name, $id, $params ) {
+	public function object_update($name, $id, $params) {
 
-		$structure = $this->get_wordpress_table_structure( $name );
+		$structure = $this->get_wordpress_table_structure($name);
 		$id_field  = $structure['id_field'];
 
-		switch ( $name ) {
+		switch ($name) {
 			case 'user':
 				// User id does not come through by default, but we need it to pass to wp method.
-				$result = $this->user_update( $id, $params, $id_field );
+				$result = $this->user_update($id, $params, $id_field);
 				break;
 			case 'post':
-				$result = $this->post_update( $id, $params, $id_field );
+				$result = $this->post_update($id, $params, $id_field);
 				break;
 			case 'attachment':
-				$result = $this->attachment_update( $id, $params, $id_field );
+				$result = $this->attachment_update($id, $params, $id_field);
 				break;
 			case 'category':
 			case 'tag':
 			case 'post_tag':
-				$result = $this->term_update( $id, $params, $name, $id_field );
+				$result = $this->term_update($id, $params, $name, $id_field);
 				break;
 			case 'comment':
-				$result = $this->comment_update( $id, $params, $id_field );
+				$result = $this->comment_update($id, $params, $id_field);
 				break;
 			default:
 				/*
@@ -713,15 +713,15 @@ 
 				 *     array( 'key' => key, 'value' => value, 'name' => objecttype, 'params' => array_of_params, 'push_drafts' => pushdrafts, 'methods' => methods )
 				 */
 				// Check to see if someone is calling the filter, and apply it if so.
-				if ( ! has_filter( $this->option_prefix . 'update_custom_wordpress_item' ) ) {
-					$result = $this->post_update( $id, $params, $id_field, $name );
+				if ( ! has_filter($this->option_prefix . 'update_custom_wordpress_item')) {
+					$result = $this->post_update($id, $params, $id_field, $name);
 				} else {
-					$result = apply_filters( $this->option_prefix . 'update_custom_wordpress_item', array(
+					$result = apply_filters($this->option_prefix . 'update_custom_wordpress_item', array(
 						'id'       => $id,
 						'params'   => $params,
 						'name'     => $name,
 						'id_field' => $id_field,
-					) );
+					));
 				}
 				break;
 		} // End switch().
@@ -742,27 +742,27 @@ 
 	 *
 	 * part of CRUD for WordPress objects
 	 */
-	public function object_delete( $name, $id ) {
-		$structure = $this->get_wordpress_table_structure( $name );
+	public function object_delete($name, $id) {
+		$structure = $this->get_wordpress_table_structure($name);
 		$id_field  = $structure['id_field'];
 
-		switch ( $name ) {
+		switch ($name) {
 			case 'user':
-				$success = $this->user_delete( $id );
+				$success = $this->user_delete($id);
 				break;
 			case 'post':
-				$success = $this->post_delete( $id );
+				$success = $this->post_delete($id);
 				break;
 			case 'attachment':
-				$success = $this->attachment_delete( $id );
+				$success = $this->attachment_delete($id);
 				break;
 			case 'category':
 			case 'tag':
 			case 'post_tag':
-				$success = $this->term_delete( $id, $name );
+				$success = $this->term_delete($id, $name);
 				break;
 			case 'comment':
-				$success = $this->comment_delete( $id );
+				$success = $this->comment_delete($id);
 				break;
 			default:
 				/*
@@ -774,16 +774,16 @@ 
 				 *     array( 'id' => id, 'name' => objecttype )
 				 */
 				// Check to see if someone is calling the filter, and apply it if so.
-				if ( ! has_filter( $this->option_prefix . 'delete_custom_wordpress_item' ) ) {
-					$success = $this->post_delete( $id );
+				if ( ! has_filter($this->option_prefix . 'delete_custom_wordpress_item')) {
+					$success = $this->post_delete($id);
 				} else {
-					$success = apply_filters( $this->option_prefix . 'delete_custom_wordpress_item', array(
+					$success = apply_filters($this->option_prefix . 'delete_custom_wordpress_item', array(
 						'id'   => $id,
 						'name' => $name,
-					) );
+					));
 				}
 
-				$success = $this->post_delete( $id );
+				$success = $this->post_delete($id);
 				break;
 		} // End switch().
 
@@ -808,13 +808,13 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function user_create( $params, $id_field = 'ID' ) {
+	private function user_create($params, $id_field = 'ID') {
 
 		// Allow username to be email address or username.
 		// The username could be autogenerated before this point for the sake of URLs.
 		$username      = $params['user_email']['value'];
 		$email_address = $params['user_email']['value'];
-		if ( isset( $params['user_login']['value'] ) ) { // User_login is used by username_exists.
+		if (isset($params['user_login']['value'])) { // User_login is used by username_exists.
 			$username = $params['user_login']['value'];
 		} else {
 			$params['user_login'] = array(
@@ -825,44 +825,44 @@ 
 		}
 
 		// This is a new user.
-		if ( false === username_exists( $username ) ) {
+		if (false === username_exists($username)) {
 
 			// Create the user
 			// WordPress sends a password reset link so this password doesn't get used, but it does exist in the database, which is helpful to prevent access before the user uses their password reset email.
 			$params['user_pass'] = array(
-				'value'         => wp_generate_password( 12, false ),
+				'value'         => wp_generate_password(12, false),
 				'method_modify' => 'wp_insert_user',
 				'method_read'   => 'get_user_by',
 			);
 			// Load all params with a method_modify of the object structure's content_method into $content
 			$content   = array();
-			$structure = $this->get_wordpress_table_structure( 'user' );
-			foreach ( $params as $key => $value ) {
-				if ( in_array( $value['method_modify'], $structure['content_methods'] ) ) {
-					$content[ $key ] = $value['value'];
-					unset( $params[ $key ] );
+			$structure = $this->get_wordpress_table_structure('user');
+			foreach ($params as $key => $value) {
+				if (in_array($value['method_modify'], $structure['content_methods'])) {
+					$content[$key] = $value['value'];
+					unset($params[$key]);
 				}
 			}
 
-			$user_id = wp_insert_user( $content );
+			$user_id = wp_insert_user($content);
 
-			if ( is_wp_error( $user_id ) ) {
+			if (is_wp_error($user_id)) {
 				$success = false;
 				$errors  = $user_id;
 			} else {
 				$success = true;
 				$errors  = array();
-				foreach ( $params as $key => $value ) {
+				foreach ($params as $key => $value) {
 					$method = $value['method_modify'];
 					// we need to provide a way for passing the values in a custom order here
-					$meta_id = $method( $user_id, $key, $value['value'] );
-					if ( false === $meta_id ) {
+					$meta_id = $method($user_id, $key, $value['value']);
+					if (false === $meta_id) {
 						$success  = false;
 						$errors[] = array(
 							'message' => sprintf(
 								// translators: %1$s is a method name.
-								esc_html__( 'Tried to upsert meta with method %1$s.', 'object-sync-for-salesforce' ),
-								esc_html( $method )
+								esc_html__('Tried to upsert meta with method %1$s.', 'object-sync-for-salesforce'),
+								esc_html($method)
 							),
 							'key'     => $key,
 							'value'   => $value,
@@ -871,18 +871,18 @@ 
 				}
 
 				// Developers can use this hook to set any other user data - permissions, etc.
-				do_action( $this->option_prefix . 'set_more_user_data', $user_id, $params, 'create' );
+				do_action($this->option_prefix . 'set_more_user_data', $user_id, $params, 'create');
 
 				// Send notification of new user.
 				// todo: Figure out what permissions ought to get notifications for this and make sure it works the right way.
-				wp_new_user_notification( $user_id, null, 'admin user' );
+				wp_new_user_notification($user_id, null, 'admin user');
 
 			}
 		} else {
-			$user_id = username_exists( $username );
+			$user_id = username_exists($username);
 		} // End if().
 
-		if ( is_wp_error( $user_id ) ) {
+		if (is_wp_error($user_id)) {
 			$success = false;
 			$errors  = $user_id;
 		} else {
@@ -919,47 +919,47 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function user_upsert( $key, $value, $methods = array(), $params, $id_field = 'ID', $push_drafts = false, $check_only = false ) {
+	private function user_upsert($key, $value, $methods = array(), $params, $id_field = 'ID', $push_drafts = false, $check_only = false) {
 
 		// If the key is user_email, we need to make it just email because that is how the WordPress method reads it.
 		$method = $methods['method_match'];
-		if ( '' !== $method ) {
+		if ('' !== $method) {
 			// This should give us the user object.
-			$user = $method( str_replace( 'user_', '', $key ), $value );
-			if ( isset( $user->{$id_field} ) ) {
+			$user = $method(str_replace('user_', '', $key), $value);
+			if (isset($user->{$id_field} )) {
 				// User does exist after checking the matching value. we want its id.
 				$user_id = $user->{$id_field};
 
-				if ( true === $check_only ) {
+				if (true === $check_only) {
 					// We are just checking to see if there is a match.
 					return $user_id;
 				}
 
 				// On the prematch fields, we specify the method_update param.
-				if ( isset( $methods['method_update'] ) ) {
+				if (isset($methods['method_update'])) {
 					$method = $methods['method_update'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-			} elseif ( false === $check_only ) {
+			} elseif (false === $check_only) {
 				// User does not exist after checking the matching value. create it.
 				// On the prematch fields, we specify the method_create param.
-				if ( isset( $methods['method_create'] ) ) {
+				if (isset($methods['method_create'])) {
 					$method = $methods['method_create'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$result         = $this->user_create( $params );
+				$result = $this->user_create($params);
 				return $result;
 			} else {
 				// Check only is true but there's not a user yet.
@@ -967,7 +967,7 @@ 
 			} // End if().
 		} else {
 			// There is no method by which to check the user. we can check other ways here.
-			$params[ $key ] = array(
+			$params[$key] = array(
 				'value'         => $value,
 				'method_modify' => $methods['method_modify'],
 				'method_read'   => $methods['method_read'],
@@ -975,21 +975,21 @@ 
 
 			// Allow username to be email address or username.
 			// The username could be autogenerated before this point for the sake of URLs.
-			if ( isset( $params['user_email']['value'] ) ) {
+			if (isset($params['user_email']['value'])) {
 				$username      = $params['user_email']['value'];
 				$email_address = $params['user_email']['value'];
 			}
-			if ( isset( $params['user_login']['value'] ) ) { // user_login is used by username_exists.
+			if (isset($params['user_login']['value'])) { // user_login is used by username_exists.
 				$username = $params['user_login']['value'];
 			}
 
-			$existing_id = username_exists( $username ); // Returns an id if there is a result.
+			$existing_id = username_exists($username); // Returns an id if there is a result.
 
 			// User does not exist after more checking. we want to create it.
-			if ( false === $existing_id && false === $check_only ) {
-				$result = $this->user_create( $params );
+			if (false === $existing_id && false === $check_only) {
+				$result = $this->user_create($params);
 				return $result;
-			} elseif ( true === $check_only ) {
+			} elseif (true === $check_only) {
 				// We are just checking to see if there is a match.
 				return $existing_id;
 			} else {
@@ -998,23 +998,23 @@ 
 			}
 		} // End if().
 
-		if ( isset( $user_id ) ) {
-			foreach ( $params as $key => $value ) {
-				$params[ $key ]['method_modify'] = $methods['method_update'];
+		if (isset($user_id)) {
+			foreach ($params as $key => $value) {
+				$params[$key]['method_modify'] = $methods['method_update'];
 			}
-			$result = $this->user_update( $user_id, $params );
+			$result = $this->user_update($user_id, $params);
 			return $result;
 		}
 
 		// Create log entry for lack of a user 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);
 		}
 		$logging->setup(
 			// todo: can we get any more specific about this?
-			esc_html__( 'Error: Users: Tried to run user_upsert, and ended up without a user id', 'object-sync-for-salesforce' ),
+			esc_html__('Error: Users: Tried to run user_upsert, and ended up without a user id', 'object-sync-for-salesforce'),
 			'',
 			0,
 			0,
@@ -1035,28 +1035,28 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function user_update( $user_id, $params, $id_field = 'ID' ) {
+	private function user_update($user_id, $params, $id_field = 'ID') {
 		$content              = array();
-		$content[ $id_field ] = $user_id;
-		foreach ( $params as $key => $value ) {
-			if ( 'wp_update_user' === $value['method_modify'] ) {
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		$content[$id_field] = $user_id;
+		foreach ($params as $key => $value) {
+			if ('wp_update_user' === $value['method_modify']) {
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
-		$user_id = wp_update_user( $content );
+		$user_id = wp_update_user($content);
 
-		if ( is_wp_error( $user_id ) ) {
+		if (is_wp_error($user_id)) {
 			$success = false;
 			$errors  = $user_id;
 		} else {
 			$success = true;
 			$errors  = array();
-			foreach ( $params as $key => $value ) {
+			foreach ($params as $key => $value) {
 				$method  = $value['method_modify'];
-				$meta_id = $method( $user_id, $key, $value['value'] );
-				if ( false === $meta_id ) {
+				$meta_id = $method($user_id, $key, $value['value']);
+				if (false === $meta_id) {
 					$success  = false;
 					$errors[] = array(
 						'key'   => $key,
@@ -1066,7 +1066,7 @@ 
 			}
 
 			// Developers can use this hook to set any other user data - permissions, etc.
-			do_action( $this->option_prefix . 'set_more_user_data', $user_id, $params, 'update' );
+			do_action($this->option_prefix . 'set_more_user_data', $user_id, $params, 'update');
 
 		}
 
@@ -1088,10 +1088,10 @@ 
 	 *
 	 * @return boolean true if successful
 	 */
-	private function user_delete( $id, $reassign = null ) {
+	private function user_delete($id, $reassign = null) {
 		// According to https://codex.wordpress.org/Function_Reference/wp_delete_user we have to include user.php first; otherwise it throws undefined error.
-		require_once( './wp-admin/includes/user.php' );
-		$result = wp_delete_user( $id, $reassign );
+		require_once('./wp-admin/includes/user.php');
+		$result = wp_delete_user($id, $reassign);
 		return $result;
 	}
 
@@ -1108,18 +1108,18 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function post_create( $params, $id_field = 'ID', $post_type = 'post' ) {
+	private function post_create($params, $id_field = 'ID', $post_type = 'post') {
 		// Load all params with a method_modify of the object structure's content_method into $content
 		$content   = array();
-		$structure = $this->get_wordpress_table_structure( $post_type );
-		foreach ( $params as $key => $value ) {
-			if ( in_array( $value['method_modify'], $structure['content_methods'] ) ) {
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		$structure = $this->get_wordpress_table_structure($post_type);
+		foreach ($params as $key => $value) {
+			if (in_array($value['method_modify'], $structure['content_methods'])) {
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
-		if ( '' !== $post_type ) {
+		if ('' !== $post_type) {
 			$content['post_type'] = $post_type;
 		}
 
@@ -1127,31 +1127,31 @@ 
 		// I think we should allow this to happen and not make users' data decisions, so
 		// if we're receiving nothing for either of these, create a blank one so it doesn't fail
 		// here we have to use $content because $params has already been unset
-		if ( ! isset( $content['post_title'] ) ) {
+		if ( ! isset($content['post_title'])) {
 			$content['post_title'] = ' ';
 		}
-		if ( ! isset( $content['post_content'] ) ) {
+		if ( ! isset($content['post_content'])) {
 			$content['post_content'] = ' ';
 		}
 
-		$post_id = wp_insert_post( $content, true ); // return an error instead of a 0 id
+		$post_id = wp_insert_post($content, true); // return an error instead of a 0 id
 
-		if ( is_wp_error( $post_id ) ) {
+		if (is_wp_error($post_id)) {
 			$success = false;
 			$errors  = $post_id;
 		} else {
 			$success = true;
 			$errors  = array();
 			// If it's a custom post type, fix the methods.
-			if ( isset( $params['RecordTypeId']['value'] ) ) {
+			if (isset($params['RecordTypeId']['value'])) {
 				$params['RecordTypeId']['method_modify'] = 'update_post_meta';
 				$params['RecordTypeId']['method_read']   = 'get_post_meta';
 			}
-			if ( is_array( $params ) && ! empty( $params ) ) {
-				foreach ( $params as $key => $value ) {
+			if (is_array($params) && ! empty($params)) {
+				foreach ($params as $key => $value) {
 					$method  = $value['method_modify'];
-					$meta_id = $method( $post_id, $key, $value['value'] );
-					if ( false === $meta_id ) {
+					$meta_id = $method($post_id, $key, $value['value']);
+					if (false === $meta_id) {
 						$success  = false;
 						$errors[] = array(
 							'key'   => $key,
@@ -1162,11 +1162,11 @@ 
 			}
 
 			// Developers can use this hook to set any other post data.
-			do_action( $this->option_prefix . 'set_more_post_data', $post_id, $params, 'create' );
+			do_action($this->option_prefix . 'set_more_post_data', $post_id, $params, 'create');
 
 		}
 
-		if ( is_wp_error( $post_id ) ) {
+		if (is_wp_error($post_id)) {
 			$success = false;
 			$errors  = $post_id;
 		} else {
@@ -1204,68 +1204,68 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function post_upsert( $key, $value, $methods = array(), $params, $id_field = 'ID', $push_drafts = false, $post_type = 'post', $check_only = false ) {
+	private function post_upsert($key, $value, $methods = array(), $params, $id_field = 'ID', $push_drafts = false, $post_type = 'post', $check_only = false) {
 
 		$method = $methods['method_match'];
 
-		if ( '' !== $method ) {
+		if ('' !== $method) {
 			// By default, posts use get_posts as the method. args can be like this.
 			// The args don't really make sense, and are inconsistently documented.
 			// This should give us the post object.
 			$args = array();
-			if ( 'post_title' === $key ) {
+			if ('post_title' === $key) {
 				$params['post_title'] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$args['name']         = sanitize_title( $value );
+				$args['name'] = sanitize_title($value);
 			} else {
-				$args[ $key ] = $value;
+				$args[$key] = $value;
 			}
 			$args['post_type'] = $post_type;
-			$post_statuses     = array( 'publish' );
-			if ( true === $push_drafts ) {
+			$post_statuses     = array('publish');
+			if (true === $push_drafts) {
 				$post_statuses[] = 'draft';
 			}
 			$args['post_status'] = $post_statuses;
 
-			$posts = $method( $args );
+			$posts = $method($args);
 
-			if ( isset( $posts[0]->{$id_field} ) ) {
+			if (isset($posts[0]->{$id_field} )) {
 				// Post does exist after checking the matching value. We want its id.
 				$post_id = $posts[0]->{$id_field};
 
-				if ( true === $check_only ) {
+				if (true === $check_only) {
 					// We are just checking to see if there is a match.
 					return $post_id;
 				}
 
 				// On the prematch fields, we specify the method_update param.
-				if ( isset( $methods['method_update'] ) ) {
+				if (isset($methods['method_update'])) {
 					$method = $methods['method_update'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-			} elseif ( false === $check_only ) {
+			} elseif (false === $check_only) {
 				// Post does not exist after checking the matching value. create it.
 				// On the prematch fields, we specify the method_create param.
-				if ( isset( $methods['method_create'] ) ) {
+				if (isset($methods['method_create'])) {
 					$method = $methods['method_create'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$result         = $this->post_create( $params, $id_field, $post_type );
+				$result = $this->post_create($params, $id_field, $post_type);
 				return $result;
 			} else {
 				// Check only is true but there's not a post yet.
@@ -1273,38 +1273,38 @@ 
 			} // End if().
 		} else {
 			// There is no method by which to check the post. we can check other ways here.
-			$params[ $key ] = array(
+			$params[$key] = array(
 				'value'         => $value,
 				'method_modify' => $methods['method_modify'],
 				'method_read'   => $methods['method_read'],
 			);
 
 			// If we have a title, use it to check for existing post.
-			if ( isset( $params['post_title']['value'] ) ) {
+			if (isset($params['post_title']['value'])) {
 				$title = $params['post_title']['value'];
 			}
 
 			// If we have content, use it to check for existing post.
-			if ( isset( $params['post_content']['value'] ) ) {
+			if (isset($params['post_content']['value'])) {
 				$content = $params['post_content']['value'];
 			} else {
 				$content = '';
 			}
 
 			// If we have a date, use it to check for existing post.
-			if ( isset( $params['post_date']['value'] ) ) {
+			if (isset($params['post_date']['value'])) {
 				$date = $params['post_date']['value'];
 			} else {
 				$date = '';
 			}
 
-			$existing_id = post_exists( $title, $content, $date ); // Returns an id if there is a result. Returns 0 if not.
+			$existing_id = post_exists($title, $content, $date); // Returns an id if there is a result. Returns 0 if not.
 
 			// Post does not exist after more checking. maybe we want to create it.
-			if ( 0 === $existing_id && false === $check_only ) {
-				$result = $this->post_create( $params, $id_field, $post_type );
+			if (0 === $existing_id && false === $check_only) {
+				$result = $this->post_create($params, $id_field, $post_type);
 				return $result;
-			} elseif ( true === $check_only ) {
+			} elseif (true === $check_only) {
 				// We are just checking to see if there is a match.
 				return $existing_id;
 			} else {
@@ -1316,22 +1316,22 @@ 
 
 		} // End if().
 
-		if ( isset( $post_id ) ) {
-			foreach ( $params as $key => $value ) {
-				$params[ $key ]['method_modify'] = $methods['method_update'];
+		if (isset($post_id)) {
+			foreach ($params as $key => $value) {
+				$params[$key]['method_modify'] = $methods['method_update'];
 			}
-			$result = $this->post_update( $post_id, $params, $id_field, $post_type );
+			$result = $this->post_update($post_id, $params, $id_field, $post_type);
 			return $result;
 		}
 		// Create log entry for lack of a post 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);
 		}
 		$logging->setup(
 			// todo: can we be more explicit here about what post upsert failed?
-			esc_html__( 'Error: Posts: Tried to run post_upsert, and ended up without a post id', 'object-sync-for-salesforce' ),
+			esc_html__('Error: Posts: Tried to run post_upsert, and ended up without a post id', 'object-sync-for-salesforce'),
 			'',
 			0,
 			0,
@@ -1353,38 +1353,38 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function post_update( $post_id, $params, $id_field = 'ID', $post_type = '' ) {
+	private function post_update($post_id, $params, $id_field = 'ID', $post_type = '') {
 		$content              = array();
-		$content[ $id_field ] = $post_id;
-		foreach ( $params as $key => $value ) {
-			if ( 'wp_update_post' === $value['method_modify'] ) {
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		$content[$id_field] = $post_id;
+		foreach ($params as $key => $value) {
+			if ('wp_update_post' === $value['method_modify']) {
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
-		if ( '' !== $post_type ) {
+		if ('' !== $post_type) {
 			$content['post_type'] = $post_type;
 		}
 
-		$post_id = wp_update_post( $content, true ); // return an error instead of a 0 id
+		$post_id = wp_update_post($content, true); // return an error instead of a 0 id
 
-		if ( is_wp_error( $post_id ) ) {
+		if (is_wp_error($post_id)) {
 			$success = false;
 			$errors  = $post_id;
 		} else {
 			$success = true;
 			$errors  = array();
 			// If it's a custom post type, fix the methods.
-			if ( isset( $params['RecordTypeId']['value'] ) ) {
+			if (isset($params['RecordTypeId']['value'])) {
 				$params['RecordTypeId']['method_modify'] = 'update_post_meta';
 				$params['RecordTypeId']['method_read']   = 'get_post_meta';
 			}
-			if ( is_array( $params ) && ! empty( $params ) ) {
-				foreach ( $params as $key => $value ) {
+			if (is_array($params) && ! empty($params)) {
+				foreach ($params as $key => $value) {
 					$method  = $value['method_modify'];
-					$meta_id = $method( $post_id, $key, $value['value'] );
-					if ( false === $meta_id ) {
+					$meta_id = $method($post_id, $key, $value['value']);
+					if (false === $meta_id) {
 						$success  = false;
 						$errors[] = array(
 							'key'   => $key,
@@ -1395,7 +1395,7 @@ 
 			}
 
 			// Developers can use this hook to set any other post data.
-			do_action( $this->option_prefix . 'set_more_post_data', $post_id, $params, 'update' );
+			do_action($this->option_prefix . 'set_more_post_data', $post_id, $params, 'update');
 
 		}
 
@@ -1417,8 +1417,8 @@ 
 	 *
 	 * @return mixed post object if successful, false if failed
 	 */
-	private function post_delete( $id, $force_delete = false ) {
-		$result = wp_delete_post( $id, $force_delete );
+	private function post_delete($id, $force_delete = false) {
+		$result = wp_delete_post($id, $force_delete);
 		return $result;
 	}
 
@@ -1434,56 +1434,56 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function attachment_create( $params, $id_field = 'ID' ) {
+	private function attachment_create($params, $id_field = 'ID') {
 		// Load all params with a method_modify of the object structure's content_method into $content
 		$content   = array();
-		$structure = $this->get_wordpress_table_structure( 'attachment' );
+		$structure = $this->get_wordpress_table_structure('attachment');
 		// WP requires post_title, post_content (can be empty), post_status, and post_mime_type to create an attachment.
-		foreach ( $params as $key => $value ) {
-			if ( in_array( $value['method_modify'], $structure['content_methods'] ) ) {
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		foreach ($params as $key => $value) {
+			if (in_array($value['method_modify'], $structure['content_methods'])) {
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
 		// Developers can use this hook to pass filename and parent data for the attachment.
-		$params = apply_filters( $this->option_prefix . 'set_initial_attachment_data', $params );
+		$params = apply_filters($this->option_prefix . 'set_initial_attachment_data', $params);
 
-		if ( isset( $params['filename']['value'] ) ) {
+		if (isset($params['filename']['value'])) {
 			$filename = $params['filename']['value'];
 		} else {
 			$filename = false;
 		}
 
-		if ( isset( $params['parent']['value'] ) ) {
+		if (isset($params['parent']['value'])) {
 			$parent = $params['parent']['value'];
 		} else {
 			$parent = 0;
 		}
 
-		$attachment_id = wp_insert_attachment( $content, $filename, $parent );
+		$attachment_id = wp_insert_attachment($content, $filename, $parent);
 
-		if ( is_wp_error( $attachment_id ) ) {
+		if (is_wp_error($attachment_id)) {
 			$success = false;
 			$errors  = $attachment_id;
 		} else {
 			$success = true;
 			$errors  = array();
 
-			if ( false !== $filename ) {
+			if (false !== $filename) {
 				// According to https://codex.wordpress.org/Function_Reference/wp_insert_attachment we need this file.
-				require_once( ABSPATH . 'wp-admin/includes/image.php' );
+				require_once(ABSPATH . 'wp-admin/includes/image.php');
 				// Generate metadata for the attachment.
-				$attach_data = wp_generate_attachment_metadata( $attachment_id, $filename );
-				wp_update_attachment_metadata( $attachment_id, $attach_data );
+				$attach_data = wp_generate_attachment_metadata($attachment_id, $filename);
+				wp_update_attachment_metadata($attachment_id, $attach_data);
 			}
 
-			if ( 0 !== $parent ) {
-				set_post_thumbnail( $parent_post_id, $attachment_id );
+			if (0 !== $parent) {
+				set_post_thumbnail($parent_post_id, $attachment_id);
 			}
 
 			// Developers can use this hook to set any other attachment data.
-			do_action( $this->option_prefix . 'set_more_attachment_data', $attachment_id, $params, 'create' );
+			do_action($this->option_prefix . 'set_more_attachment_data', $attachment_id, $params, 'create');
 
 		}
 
@@ -1515,64 +1515,64 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function attachment_upsert( $key, $value, $methods = array(), $params, $id_field = 'ID', $check_only = false ) {
+	private function attachment_upsert($key, $value, $methods = array(), $params, $id_field = 'ID', $check_only = false) {
 
 		$method = $methods['method_match'];
 
-		if ( '' !== $method ) {
+		if ('' !== $method) {
 			// Get_posts is more helpful here, so that is the method attachment uses for 'read'.
 			// By default, posts use get_posts as the method. args can be like this.
 			// The args don't really make sense, and are inconsistently documented.
 			// This should give us the post object.
 			$args = array();
-			if ( 'post_title' === $key ) {
+			if ('post_title' === $key) {
 				$params['post_title'] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$args['name']         = sanitize_title( $value );
+				$args['name'] = sanitize_title($value);
 			} else {
-				$args[ $key ] = $value;
+				$args[$key] = $value;
 			}
 			$args['post_type'] = 'attachment';
 
-			$posts = $method( $args );
+			$posts = $method($args);
 
-			if ( isset( $posts[0]->{$id_field} ) ) {
+			if (isset($posts[0]->{$id_field} )) {
 				// Attachment does exist after checking the matching value. we want its id.
 				$attachment_id = $posts[0]->{$id_field};
 
-				if ( true === $check_only ) {
+				if (true === $check_only) {
 					// We are just checking to see if there is a match.
 					return $attachment_id;
 				}
 
 				// On the prematch fields, we specify the method_update param.
-				if ( isset( $methods['method_update'] ) ) {
+				if (isset($methods['method_update'])) {
 					$method = $methods['method_update'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-			} elseif ( false === $check_only ) {
+			} elseif (false === $check_only) {
 				// Attachment does not exist after checking the matching value. create it.
 				// On the prematch fields, we specify the method_create param.
-				if ( isset( $methods['method_create'] ) ) {
+				if (isset($methods['method_create'])) {
 					$method = $methods['method_create'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$result         = $this->attachment_create( $params );
+				$result = $this->attachment_create($params);
 				return $result;
 			} else {
 				// Check only is true but there's not an attachment yet.
@@ -1580,38 +1580,38 @@ 
 			} // End if().
 		} else {
 			// There is no method by which to check the post. we can check other ways here.
-			$params[ $key ] = array(
+			$params[$key] = array(
 				'value'         => $value,
 				'method_modify' => $methods['method_modify'],
 				'method_read'   => $methods['method_read'],
 			);
 
 			// If we have a title, use it to check for existing post.
-			if ( isset( $params['post_title']['value'] ) ) {
+			if (isset($params['post_title']['value'])) {
 				$title = $params['post_title']['value'];
 			}
 
 			// If we have content, use it to check for existing post.
-			if ( isset( $params['post_content']['value'] ) ) {
+			if (isset($params['post_content']['value'])) {
 				$content = $params['post_content']['value'];
 			} else {
 				$content = '';
 			}
 
 			// If we have a date, use it to check for existing post.
-			if ( isset( $params['post_date']['value'] ) ) {
+			if (isset($params['post_date']['value'])) {
 				$date = $params['post_date']['value'];
 			} else {
 				$date = '';
 			}
 
-			$existing_id = post_exists( $title, $content, $date ); // Returns an id if there is a result. Returns 0 if not.
+			$existing_id = post_exists($title, $content, $date); // Returns an id if there is a result. Returns 0 if not.
 
 			// Attachment does not exist after more checking. maybe we want to create it.
-			if ( 0 === $existing_id && false === $check_only ) {
-				$result = $this->attachment_create( $params );
+			if (0 === $existing_id && false === $check_only) {
+				$result = $this->attachment_create($params);
 				return $result;
-			} elseif ( true === $check_only ) {
+			} elseif (true === $check_only) {
 				// We are just checking to see if there is a match.
 				return $existing_id;
 			} else {
@@ -1623,22 +1623,22 @@ 
 
 		} // End if().
 
-		if ( isset( $attachment_id ) ) {
-			foreach ( $params as $key => $value ) {
-				$params[ $key ]['method_modify'] = $methods['method_update'];
+		if (isset($attachment_id)) {
+			foreach ($params as $key => $value) {
+				$params[$key]['method_modify'] = $methods['method_update'];
 			}
-			$result = $this->attachment_update( $attachment_id, $params );
+			$result = $this->attachment_update($attachment_id, $params);
 			return $result;
 		}
 
 		// Create log entry for lack of an attachment 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);
 		}
 		$logging->setup(
-			esc_html__( 'Error: Attachment: Tried to run attachment_upsert, and ended up without an attachment id', 'object-sync-for-salesforce' ),
+			esc_html__('Error: Attachment: Tried to run attachment_upsert, and ended up without an attachment id', 'object-sync-for-salesforce'),
 			'',
 			0,
 			0,
@@ -1663,60 +1663,60 @@ 
 	 * it does use wp_update_attachment_metadata for the meta fields, though.
 	 * Developers should use hooks to change this, if it does not meet their needs.
 	 */
-	private function attachment_update( $attachment_id, $params, $id_field = 'ID' ) {
+	private function attachment_update($attachment_id, $params, $id_field = 'ID') {
 		$content              = array();
-		$content[ $id_field ] = $attachment_id;
-		foreach ( $params as $key => $value ) {
-			if ( 'wp_insert_attachment' === $value['method_modify'] ) { // Should also be insert attachment maybe.
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		$content[$id_field] = $attachment_id;
+		foreach ($params as $key => $value) {
+			if ('wp_insert_attachment' === $value['method_modify']) { // Should also be insert attachment maybe.
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
-		if ( isset( $params['filename']['value'] ) ) {
+		if (isset($params['filename']['value'])) {
 			$filename = $params['filename']['value'];
 		} else {
 			$filename = false;
 		}
 
-		if ( isset( $params['parent']['value'] ) ) {
+		if (isset($params['parent']['value'])) {
 			$parent = $params['parent']['value'];
 		} else {
 			$parent = 0;
 		}
 
-		$attachment_id = wp_insert_attachment( $content, $filename, $parent );
+		$attachment_id = wp_insert_attachment($content, $filename, $parent);
 
-		if ( is_wp_error( $attachment_id ) ) {
+		if (is_wp_error($attachment_id)) {
 			$success = false;
 			$errors  = $attachment_id;
 		} else {
 			$success = true;
 			$errors  = array();
 
-			if ( false !== $filename ) {
+			if (false !== $filename) {
 				// According to https://codex.wordpress.org/Function_Reference/wp_insert_attachment we need this file.
-				require_once( ABSPATH . 'wp-admin/includes/image.php' );
+				require_once(ABSPATH . 'wp-admin/includes/image.php');
 				// Generate metadata for the attachment.
-				$attach_data = wp_generate_attachment_metadata( $attachment_id, $filename );
+				$attach_data = wp_generate_attachment_metadata($attachment_id, $filename);
 			}
 
 			// Put the data from salesforce into the meta array.
 			$attach_new_data = array();
-			foreach ( $params as $key => $value ) {
+			foreach ($params as $key => $value) {
 				$method                  = $value['method_modify'];
-				$attach_new_data[ $key ] = $value['value'];
+				$attach_new_data[$key] = $value['value'];
 			}
 
-			if ( isset( $attach_data ) ) {
-				$attach_data = array_merge( $attach_data, $attach_new_data );
+			if (isset($attach_data)) {
+				$attach_data = array_merge($attach_data, $attach_new_data);
 			} else {
 				$attach_data = $attach_new_data;
 			}
 
-			$meta_updated = wp_update_attachment_metadata( $attachment_id, $attach_data );
+			$meta_updated = wp_update_attachment_metadata($attachment_id, $attach_data);
 
-			if ( false === $meta_updated ) {
+			if (false === $meta_updated) {
 				$success  = false;
 				$errors[] = array(
 					'key'   => $key,
@@ -1724,12 +1724,12 @@ 
 				);
 			}
 
-			if ( 0 !== $parent ) {
-				set_post_thumbnail( $parent_post_id, $attachment_id );
+			if (0 !== $parent) {
+				set_post_thumbnail($parent_post_id, $attachment_id);
 			}
 
 			// Developers can use this hook to set any other attachment data.
-			do_action( $this->option_prefix . 'set_more_attachment_data', $attachment_id, $params, 'update' );
+			do_action($this->option_prefix . 'set_more_attachment_data', $attachment_id, $params, 'update');
 
 		} // End if().
 
@@ -1752,8 +1752,8 @@ 
 	 * @return mixed
 	 *   attachment object if successful, false if failed
 	 */
-	private function attachment_delete( $id, $force_delete = false ) {
-		$result = wp_delete_attachment( $id, $force_delete );
+	private function attachment_delete($id, $force_delete = false) {
+		$result = wp_delete_attachment($id, $force_delete);
 		return $result;
 	}
 
@@ -1770,45 +1770,45 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function term_create( $params, $taxonomy, $id_field = 'ID' ) {
-		if ( 'tag' === $taxonomy ) {
+	private function term_create($params, $taxonomy, $id_field = 'ID') {
+		if ('tag' === $taxonomy) {
 			$taxonomy = 'post_tag';
 		}
 		// Load all params with a method_modify of the object structure's content_method into $content
 		$content   = array();
-		$structure = $this->get_wordpress_table_structure( $taxonomy );
+		$structure = $this->get_wordpress_table_structure($taxonomy);
 		$args      = array();
-		foreach ( $params as $key => $value ) {
-			if ( 'name' === $key ) {
+		foreach ($params as $key => $value) {
+			if ('name' === $key) {
 				$name = $value['value'];
-				unset( $params[ $key ] );
+				unset($params[$key]);
 			}
-			if ( in_array( $value['method_modify'], $structure['content_methods'] ) && 'name' !== $key ) {
-				$args[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+			if (in_array($value['method_modify'], $structure['content_methods']) && 'name' !== $key) {
+				$args[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
-		if ( isset( $name ) ) {
-			$term = wp_insert_term( $name, $taxonomy, $args );
+		if (isset($name)) {
+			$term = wp_insert_term($name, $taxonomy, $args);
 		}
 
-		if ( is_wp_error( $term ) ) {
+		if (is_wp_error($term)) {
 			$success = false;
 			$errors  = $term;
 		} else {
-			$term_id = $term[ "$id_field" ];
+			$term_id = $term["$id_field"];
 			$success = true;
 			$errors  = array();
-			foreach ( $params as $key => $value ) {
+			foreach ($params as $key => $value) {
 				$method  = $value['method_modify'];
-				$meta_id = $method( $term_id, $key, $value['value'] );
-				if ( false === $meta_id ) {
+				$meta_id = $method($term_id, $key, $value['value']);
+				if (false === $meta_id) {
 					$success  = false;
 					$errors[] = array(
 						'message' => sprintf(
 							// translators: %1$s is a method name.
-							esc_html__( 'Tried to upsert meta with method %1$s.', 'object-sync-for-salesforce' ),
-							esc_html( $method )
+							esc_html__('Tried to upsert meta with method %1$s.', 'object-sync-for-salesforce'),
+							esc_html($method)
 						),
 						'key'     => $key,
 						'value'   => $value,
@@ -1817,11 +1817,11 @@ 
 			}
 
 			// Developers can use this hook to set any other term data.
-			do_action( $this->option_prefix . 'set_more_term_data', $term_id, $params, 'create' );
+			do_action($this->option_prefix . 'set_more_term_data', $term_id, $params, 'create');
 
 		}
 
-		if ( is_wp_error( $term ) ) {
+		if (is_wp_error($term)) {
 			$success = false;
 			$errors  = $term;
 		} else {
@@ -1859,48 +1859,48 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function term_upsert( $key, $value, $methods = array(), $params, $taxonomy, $id_field = 'ID', $push_drafts = false, $check_only = false ) {
-		if ( 'tag' === $taxonomy ) {
+	private function term_upsert($key, $value, $methods = array(), $params, $taxonomy, $id_field = 'ID', $push_drafts = false, $check_only = false) {
+		if ('tag' === $taxonomy) {
 			$taxonomy = 'post_tag';
 		}
 		$method = $methods['method_match'];
-		if ( '' !== $method ) {
+		if ('' !== $method) {
 			// This should give us the term object.
-			$term = $method( $key, $value, $taxonomy ); // We need to put the taxonomy in there probably.
-			if ( isset( $term->{$id_field} ) ) {
+			$term = $method($key, $value, $taxonomy); // We need to put the taxonomy in there probably.
+			if (isset($term->{$id_field} )) {
 				// Term does exist after checking the matching value. we want its id.
 				$term_id = $term->{$id_field};
 
-				if ( true === $check_only ) {
+				if (true === $check_only) {
 					// We are just checking to see if there is a match.
 					return $term_id;
 				}
 
 				// On the prematch fields, we specify the method_update param.
-				if ( isset( $methods['method_update'] ) ) {
+				if (isset($methods['method_update'])) {
 					$method = $methods['method_update'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-			} elseif ( false === $check_only ) {
+			} elseif (false === $check_only) {
 				// Term does not exist after checking the matching value. Create it.
 				// On the prematch fields, we specify the method_create param.
-				if ( isset( $methods['method_create'] ) ) {
+				if (isset($methods['method_create'])) {
 					$method = $methods['method_create'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$result         = $this->term_create( $params, $taxonomy, $id_field );
+				$result = $this->term_create($params, $taxonomy, $id_field);
 				return $result;
 			} else {
 				// Check only is true but there's not a term yet.
@@ -1908,17 +1908,17 @@ 
 			} // End if().
 		} else {
 			// There is no method by which to check the term. we can check other ways here.
-			$params[ $key ] = array(
+			$params[$key] = array(
 				'value'         => $value,
 				'method_modify' => $methods['method_modify'],
 				'method_read'   => $methods['method_read'],
 			);
 
-			if ( isset( $params['name']['value'] ) ) {
+			if (isset($params['name']['value'])) {
 				$term = $params['name']['value'];
 			}
 
-			if ( isset( $params['parent']['value'] ) ) {
+			if (isset($params['parent']['value'])) {
 				$parent = $params['parent']['value'];
 			} else {
 				$parent = 0;
@@ -1926,17 +1926,17 @@ 
 
 			// Returns an id if there is a result. Returns null if it does not exist.
 			// wpcom_vip_term_exists is cached, and therefore preferred.
-			if ( function_exists( 'wpcom_vip_term_exists' ) ) {
-				$existing_id = wpcom_vip_term_exists( $term, $taxonomy, $parent );
+			if (function_exists('wpcom_vip_term_exists')) {
+				$existing_id = wpcom_vip_term_exists($term, $taxonomy, $parent);
 			} else {
-				$existing_id = term_exists( $term, $taxonomy, $parent );
+				$existing_id = term_exists($term, $taxonomy, $parent);
 			}
 
 			// Term does not exist after more checking. maybe we want to create it.
-			if ( null === $existing_id && false === $check_only ) {
-				$result = $this->term_create( $params, $taxonomy, $id_field );
+			if (null === $existing_id && false === $check_only) {
+				$result = $this->term_create($params, $taxonomy, $id_field);
 				return $result;
-			} elseif ( true === $check_only ) {
+			} elseif (true === $check_only) {
 				// We are just checking to see if there is a match.
 				return $existing_id;
 			} else {
@@ -1945,21 +1945,21 @@ 
 			}
 		} // End if().
 
-		if ( isset( $term_id ) ) {
-			foreach ( $params as $key => $value ) {
-				$params[ $key ]['method_modify'] = $methods['method_update'];
+		if (isset($term_id)) {
+			foreach ($params as $key => $value) {
+				$params[$key]['method_modify'] = $methods['method_update'];
 			}
-			$result = $this->term_update( $term_id, $params, $taxonomy, $id_field );
+			$result = $this->term_update($term_id, $params, $taxonomy, $id_field);
 			return $result;
 		}
 		// Create log entry for lack of a term 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);
 		}
 		$logging->setup(
-			esc_html__( 'Error: Terms: Tried to run term_upsert, and ended up without a term id', 'object-sync-for-salesforce' ),
+			esc_html__('Error: Terms: Tried to run term_upsert, and ended up without a term id', 'object-sync-for-salesforce'),
 			'',
 			0,
 			0,
@@ -1981,36 +1981,36 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function term_update( $term_id, $params, $taxonomy, $id_field = 'ID' ) {
-		if ( 'tag' === $taxonomy ) {
+	private function term_update($term_id, $params, $taxonomy, $id_field = 'ID') {
+		if ('tag' === $taxonomy) {
 			$taxonomy = 'post_tag';
 		}
 		$args = array();
-		foreach ( $params as $key => $value ) {
-			if ( 'wp_update_term' === $value['method_modify'] ) {
-				$args[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		foreach ($params as $key => $value) {
+			if ('wp_update_term' === $value['method_modify']) {
+				$args[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
-		$term = wp_update_term( $term_id, $taxonomy, $args );
+		$term = wp_update_term($term_id, $taxonomy, $args);
 
-		if ( is_wp_error( $term ) ) {
+		if (is_wp_error($term)) {
 			$success = false;
 			$errors  = $term;
 		} else {
-			$term_id = $term[ "$id_field" ];
+			$term_id = $term["$id_field"];
 			$success = true;
 			$errors  = array();
-			foreach ( $params as $key => $value ) {
+			foreach ($params as $key => $value) {
 				$method  = $value['method_modify'];
-				$meta_id = $method( $term_id, $key, $value['value'] );
-				if ( false === $meta_id ) {
+				$meta_id = $method($term_id, $key, $value['value']);
+				if (false === $meta_id) {
 					$success  = false;
 					$errors[] = array(
 						'message' => sprintf(
 							// translators: %1$s is a method name.
-							esc_html__( 'Tried to update meta with method %1$s.', 'object-sync-for-salesforce' ),
-							esc_html( $method )
+							esc_html__('Tried to update meta with method %1$s.', 'object-sync-for-salesforce'),
+							esc_html($method)
 						),
 						'key'     => $key,
 						'value'   => $value,
@@ -2019,11 +2019,11 @@ 
 			}
 
 			// Developers can use this hook to set any other term data.
-			do_action( $this->option_prefix . 'set_more_term_data', $term_id, $params, 'update' );
+			do_action($this->option_prefix . 'set_more_term_data', $term_id, $params, 'update');
 
 		}
 
-		if ( is_wp_error( $term ) ) {
+		if (is_wp_error($term)) {
 			$success = false;
 			$errors  = $term;
 		} else {
@@ -2051,11 +2051,11 @@ 
 	 *
 	 * @return bool True if successful, false if failed.
 	 */
-	private function term_delete( $term_id, $taxonomy ) {
-		if ( 'tag' === $taxonomy ) {
+	private function term_delete($term_id, $taxonomy) {
+		if ('tag' === $taxonomy) {
 			$taxonomy = 'post_tag';
 		}
-		$result = wp_delete_term( $term_id, $taxonomy );
+		$result = wp_delete_term($term_id, $taxonomy);
 		return $result;
 	}
 
@@ -2071,52 +2071,52 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function comment_create( $params, $id_field = 'comment_ID' ) {
+	private function comment_create($params, $id_field = 'comment_ID') {
 		// Load all params with a method_modify of the object structure's content_method into $content
 		$content   = array();
-		$structure = $this->get_wordpress_table_structure( 'comment' );
-		foreach ( $params as $key => $value ) {
-			if ( in_array( $value['method_modify'], $structure['content_methods'] ) ) {
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		$structure = $this->get_wordpress_table_structure('comment');
+		foreach ($params as $key => $value) {
+			if (in_array($value['method_modify'], $structure['content_methods'])) {
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
 		// Fields that are required for comments, even if they are empty values.
-		if ( ! isset( $content['comment_author'] ) ) {
+		if ( ! isset($content['comment_author'])) {
 			$content['comment_author'] = '';
 		}
-		if ( ! isset( $content['comment_author_IP'] ) ) {
+		if ( ! isset($content['comment_author_IP'])) {
 			$content['comment_author_IP'] = '';
 		}
-		if ( ! isset( $content['comment_author_email'] ) ) {
+		if ( ! isset($content['comment_author_email'])) {
 			$content['comment_author_email'] = '';
 		}
-		if ( ! isset( $content['comment_author_url'] ) ) {
+		if ( ! isset($content['comment_author_url'])) {
 			$content['comment_author_url'] = '';
 		}
-		if ( ! isset( $content['comment_type'] ) ) {
+		if ( ! isset($content['comment_type'])) {
 			$content['comment_type'] = '';
 		}
 
-		$comment_id = wp_new_comment( $content );
+		$comment_id = wp_new_comment($content);
 
-		if ( is_wp_error( $comment_id ) ) {
+		if (is_wp_error($comment_id)) {
 			$success = false;
 			$errors  = $comment_id;
 		} else {
 			$success = true;
 			$errors  = array();
-			foreach ( $params as $key => $value ) {
+			foreach ($params as $key => $value) {
 				$method  = $value['method_modify'];
-				$meta_id = $method( $comment_id, $key, $value['value'] );
-				if ( false === $meta_id ) {
+				$meta_id = $method($comment_id, $key, $value['value']);
+				if (false === $meta_id) {
 					$success  = false;
 					$errors[] = array(
 						'message' => sprintf(
 							// translators: %1$s is a method name.
-							esc_html__( 'Tried to add meta with method %1$s.', 'object-sync-for-salesforce' ),
-							esc_html( $method )
+							esc_html__('Tried to add meta with method %1$s.', 'object-sync-for-salesforce'),
+							esc_html($method)
 						),
 						'key'     => $key,
 						'value'   => $value,
@@ -2125,11 +2125,11 @@ 
 			}
 
 			// Developers can use this hook to set any other comment data.
-			do_action( $this->option_prefix . 'set_more_comment_data', $comment_id, $params, 'create' );
+			do_action($this->option_prefix . 'set_more_comment_data', $comment_id, $params, 'create');
 
 		}
 
-		if ( is_wp_error( $comment_id ) ) {
+		if (is_wp_error($comment_id)) {
 			$success = false;
 			$errors  = $comment_id;
 		} else {
@@ -2166,79 +2166,79 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function comment_upsert( $key, $value, $methods, $params, $id_field = 'comment_ID', $push_drafts = false, $check_only = false ) {
+	private function comment_upsert($key, $value, $methods, $params, $id_field = 'comment_ID', $push_drafts = false, $check_only = false) {
 		$method = $methods['method_match'];
-		if ( 'get_comment' === $method ) {
+		if ('get_comment' === $method) {
 			$method = 'get_comments';
 		}
-		if ( '' !== $method ) {
+		if ('' !== $method) {
 			// This should give us the comment object.
 			$match = array();
-			if ( 'comment_author' === $key ) {
-				$match['author__in'] = array( $value );
+			if ('comment_author' === $key) {
+				$match['author__in'] = array($value);
 			} else {
-				$key           = str_replace( 'comment_', '', $key );
-				$match[ $key ] = $value;
+				$key           = str_replace('comment_', '', $key);
+				$match[$key] = $value;
 			}
-			$comments = $method( $match );
+			$comments = $method($match);
 
-			if ( 1 === count( $comments ) ) {
+			if (1 === count($comments)) {
 				$comment = $comments[0];
 				// Comment does exist after checking the matching value. we want its id.
 				$comment_id = $comment->{$id_field};
 
-				if ( true === $check_only ) {
+				if (true === $check_only) {
 					// We are just checking to see if there is a match.
 					return $comment_id;
 				}
 
 				// On the prematch fields, we specify the method_update param.
-				if ( isset( $methods['method_update'] ) ) {
+				if (isset($methods['method_update'])) {
 					$method = $methods['method_update'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-			} elseif ( count( $comments ) > 1 ) {
+			} elseif (count($comments) > 1) {
 				$status = 'error';
 				// Create log entry for multiple matches.
-				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(
 					sprintf(
 						// translators: %1$s is a number. %2$s is a key. %3$s is the value of that key. %4$s is a var_export'd array of comments.
-						esc_html__( 'Error: Comments: there are %1$s comment matches for the Salesforce key %2$s with the value of %3$s. Here they are: %4$s', 'object-sync-for-salesforce' ),
-						absint( count( $comments ) ),
-						esc_html( $key ),
-						esc_html( $value ),
-						esc_html( var_export( $comments ) ) // Debugging code in production because having useful error messages is good.
+						esc_html__('Error: Comments: there are %1$s comment matches for the Salesforce key %2$s with the value of %3$s. Here they are: %4$s', 'object-sync-for-salesforce'),
+						absint(count($comments)),
+						esc_html($key),
+						esc_html($value),
+						esc_html(var_export($comments)) // Debugging code in production because having useful error messages is good.
 					),
 					'',
 					0,
 					0,
 					$status
 				);
-			} elseif ( false === $check_only ) {
+			} elseif (false === $check_only) {
 				// Comment does not exist after checking the matching value. Create it.
 				// On the prematch fields, we specify the method_create param.
-				if ( isset( $methods['method_create'] ) ) {
+				if (isset($methods['method_create'])) {
 					$method = $methods['method_create'];
 				} else {
 					$method = $methods['method_modify'];
 				}
-				$params[ $key ] = array(
+				$params[$key] = array(
 					'value'         => $value,
 					'method_modify' => $method,
 					'method_read'   => $methods['method_read'],
 				);
-				$result         = $this->comment_create( $params, $id_field );
+				$result = $this->comment_create($params, $id_field);
 				return $result;
 			} else {
 				// Check only is true but there's not a comment yet.
@@ -2246,33 +2246,33 @@ 
 			} // End if().
 		} else {
 			// There is no method by which to check the comment. We can check other ways here.
-			$params[ $key ] = array(
+			$params[$key] = array(
 				'value'         => $value,
 				'method_modify' => $methods['method_modify'],
 				'method_read'   => $methods['method_read'],
 			);
 
-			if ( isset( $params['comment_author']['value'] ) ) {
+			if (isset($params['comment_author']['value'])) {
 				$comment_author = $params['comment_author']['value'];
 			}
 
-			if ( isset( $params['comment_date']['value'] ) ) {
+			if (isset($params['comment_date']['value'])) {
 				$comment_date = $params['comment_date']['value'];
 			}
 
-			if ( isset( $params['timezone']['value'] ) ) {
+			if (isset($params['timezone']['value'])) {
 				$timezone = $params['timezone']['value'];
 			} else {
 				$timezone = 'blog';
 			}
 
-			$existing_id = comment_exists( $comment_author, $comment_date, $timezone ); // Returns an id if there is a result. Uses $wpdb->get_var, so it returns null if there is no value
+			$existing_id = comment_exists($comment_author, $comment_date, $timezone); // Returns an id if there is a result. Uses $wpdb->get_var, so it returns null if there is no value
 
 			// Comment does not exist after more checking. We want to create it.
-			if ( null === $existing_id && false === $check_only ) {
-				$result = $this->comment_create( $params, $id_field );
+			if (null === $existing_id && false === $check_only) {
+				$result = $this->comment_create($params, $id_field);
 				return $result;
-			} elseif ( true === $check_only ) {
+			} elseif (true === $check_only) {
 				// We are just checking to see if there is a match.
 				return $existing_id;
 			} else {
@@ -2281,22 +2281,22 @@ 
 			}
 		} // End if() that sets up the parameters in the $params array.
 
-		if ( isset( $comment_id ) ) {
-			foreach ( $params as $key => $value ) {
-				$params[ $key ]['method_modify'] = $methods['method_update'];
+		if (isset($comment_id)) {
+			foreach ($params as $key => $value) {
+				$params[$key]['method_modify'] = $methods['method_update'];
 			}
-			$result = $this->comment_update( $comment_id, $params, $id_field );
+			$result = $this->comment_update($comment_id, $params, $id_field);
 			return $result;
 		}
 
 		// Create log entry for lack of a comment 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);
 		}
 		$logging->setup(
-			esc_html__( 'Error: Comments: Tried to run comment_upsert, and ended up without a comment id', 'object-sync-for-salesforce' ),
+			esc_html__('Error: Comments: Tried to run comment_upsert, and ended up without a comment id', 'object-sync-for-salesforce'),
 			'',
 			0,
 			0,
@@ -2317,34 +2317,34 @@ 
 	 *     success: 1
 	 *   "errors" : [ ],
 	 */
-	private function comment_update( $comment_id, $params, $id_field = 'comment_ID' ) {
+	private function comment_update($comment_id, $params, $id_field = 'comment_ID') {
 		$content              = array();
-		$content[ $id_field ] = $comment_id;
-		foreach ( $params as $key => $value ) {
-			if ( 'wp_update_comment' === $value['method_modify'] ) {
-				$content[ $key ] = $value['value'];
-				unset( $params[ $key ] );
+		$content[$id_field] = $comment_id;
+		foreach ($params as $key => $value) {
+			if ('wp_update_comment' === $value['method_modify']) {
+				$content[$key] = $value['value'];
+				unset($params[$key]);
 			}
 		}
 
-		$updated = wp_update_comment( $content );
+		$updated = wp_update_comment($content);
 
-		if ( 0 === $updated ) {
+		if (0 === $updated) {
 			$success = false;
 			$errors  = $updated;
 		} else {
 			$success = true;
 			$errors  = array();
-			foreach ( $params as $key => $value ) {
+			foreach ($params as $key => $value) {
 				$method  = $value['method_modify'];
-				$meta_id = $method( $comment_id, $key, $value['value'] );
-				if ( false === $meta_id ) {
+				$meta_id = $method($comment_id, $key, $value['value']);
+				if (false === $meta_id) {
 					$success  = false;
 					$errors[] = array(
 						'message' => sprintf(
 							// Translators: %1$s is a method name.
-							esc_html__( 'Tried to update meta with method %1$s.', 'object-sync-for-salesforce' ),
-							esc_html( $method )
+							esc_html__('Tried to update meta with method %1$s.', 'object-sync-for-salesforce'),
+							esc_html($method)
 						),
 						'key'     => $key,
 						'value'   => $value,
@@ -2353,11 +2353,11 @@ 
 			}
 
 			// Developers can use this hook to set any other comment data.
-			do_action( $this->option_prefix . 'set_more_comment_data', $comment_id, $params, 'update' );
+			do_action($this->option_prefix . 'set_more_comment_data', $comment_id, $params, 'update');
 
 		}
 
-		if ( is_wp_error( $updated ) ) {
+		if (is_wp_error($updated)) {
 			$success = false;
 			$errors  = $updated;
 		} else {
@@ -2385,8 +2385,8 @@ 
 	 *
 	 * @return boolean true if successful, false if failed.
 	 */
-	private function comment_delete( $id, $force_delete = false ) {
-		$result = wp_delete_comment( $id, $force_delete );
+	private function comment_delete($id, $force_delete = false) {
+		$result = wp_delete_comment($id, $force_delete);
 		return $result;
 	}
 
@@ -2410,9 +2410,9 @@ 
 	 *
 	 * @param string $name The name of the field that lists all cache keys.
 	 */
-	public function __construct( $name ) {
+	public function __construct($name) {
 		$this->name         = $name;
-		$this->cache_prefix = esc_sql( 'sfwp_' );
+		$this->cache_prefix = esc_sql('sfwp_');
 	}
 
 	/**
@@ -2421,7 +2421,7 @@ 
 	 * @return mixed value of transient. False of empty, otherwise array.
 	 */
 	public function all_keys() {
-		return get_transient( $this->name );
+		return get_transient($this->name);
 	}
 
 	/**
@@ -2432,16 +2432,16 @@ 
 	 * @param int $cache_expiration. How long the plugin key cache, and this individual item cache, should last before expiring.
 	 * @return mixed value of transient. False of empty, otherwise array.
 	 */
-	public function set( $cachekey, $value, $cache_expiration = 0 ) {
+	public function set($cachekey, $value, $cache_expiration = 0) {
 
 		$prefix   = $this->cache_prefix;
 		$cachekey = $prefix . $cachekey;
 
 		$keys   = $this->all_keys();
 		$keys[] = $cachekey;
-		set_transient( $this->name, $keys, $cache_expiration );
+		set_transient($this->name, $keys, $cache_expiration);
 
-		return set_transient( $cachekey, $value, $cache_expiration );
+		return set_transient($cachekey, $value, $cache_expiration);
 	}
 
 	/**
@@ -2450,10 +2450,10 @@ 
 	 * @param string $cachekey the key for this cache item
 	 * @return mixed value of transient. False of empty, otherwise array.
 	 */
-	public function get( $cachekey ) {
+	public function get($cachekey) {
 		$prefix   = $this->cache_prefix;
 		$cachekey = $prefix . $cachekey;
-		return get_transient( $cachekey );
+		return get_transient($cachekey);
 	}
 
 	/**
@@ -2462,10 +2462,10 @@ 
 	 * @param string $cachekey the key for this cache item
 	 * @return bool True if successful, false otherwise.
 	 */
-	public function delete( $cachekey ) {
+	public function delete($cachekey) {
 		$prefix   = $this->cache_prefix;
 		$cachekey = $prefix . $cachekey;
-		return delete_transient( $cachekey );
+		return delete_transient($cachekey);
 	}
 
 	/**
@@ -2476,10 +2476,10 @@ 
 	public function flush() {
 		$keys   = $this->all_keys();
 		$result = true;
-		foreach ( $keys as $key ) {
-			$result = delete_transient( $key );
+		foreach ($keys as $key) {
+			$result = delete_transient($key);
 		}
-		$result = delete_transient( $this->name );
+		$result = delete_transient($this->name);
 		return $result;
 	}
 

classes/admin.php

Indentation +250 added lines, -250 removed lines

@@ -28,76 +28,76 @@ 
 	protected $queue;
 
 	/**
-	* @var string
-	* Default path for the Salesforce authorize URL
-	*/
+	 * @var string
+	 * Default path for the Salesforce authorize URL
+	 */
 	public $default_authorize_url_path;
 
 	/**
-	* @var string
-	* Default path for the Salesforce token URL
-	*/
+	 * @var string
+	 * Default path for the Salesforce token URL
+	 */
 	public $default_token_url_path;
 
 	/**
-	* @var string
-	* What version of the Salesforce API should be the default on the settings screen.
-	* Users can edit this, but they won't see a correct list of all their available versions until WordPress has
-	* been authenticated with Salesforce.
-	*/
+	 * @var string
+	 * What version of the Salesforce API should be the default on the settings screen.
+	 * Users can edit this, but they won't see a correct list of all their available versions until WordPress has
+	 * been authenticated with Salesforce.
+	 */
 	public $default_api_version;
 
 	/**
-	* @var int
-	* Default max number of pull records
-	* Users can edit this
-	*/
+	 * @var int
+	 * Default max number of pull records
+	 * Users can edit this
+	 */
 	public $default_pull_limit;
 
 	/**
-	* @var int
-	* Default pull throttle for how often Salesforce can pull
-	* Users can edit this
-	*/
+	 * @var int
+	 * Default pull throttle for how often Salesforce can pull
+	 * Users can edit this
+	 */
 	public $default_pull_throttle;
 
 	/**
-	* @var bool
-	* Default for whether to limit to triggerable items
-	* Users can edit this
-	*/
+	 * @var bool
+	 * Default for whether to limit to triggerable items
+	 * Users can edit this
+	 */
 	public $default_triggerable;
 
 	/**
-	* @var bool
-	* Default for whether to limit to updateable items
-	* Users can edit this
-	*/
+	 * @var bool
+	 * Default for whether to limit to updateable items
+	 * Users can edit this
+	 */
 	public $default_updateable;
 
 	/**
-	* @var string
-	* Suffix for action group name
-	*/
+	 * @var string
+	 * Suffix for action group name
+	 */
 	public $action_group_suffix;
 
 	/**
-	* Constructor which sets up admin pages
-	*
-	* @param object $wpdb
-	* @param string $version
-	* @param array $login_credentials
-	* @param string $slug
-	* @param object $wordpress
-	* @param object $salesforce
-	* @param object $mappings
-	* @param object $push
-	* @param object $pull
-	* @param object $logging
-	* @param array $schedulable_classes
-	* @param object $queue
-	* @throws \Exception
-	*/
+	 * Constructor which sets up admin pages
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param array $login_credentials
+	 * @param string $slug
+	 * @param object $wordpress
+	 * @param object $salesforce
+	 * @param object $mappings
+	 * @param object $push
+	 * @param object $pull
+	 * @param object $logging
+	 * @param array $schedulable_classes
+	 * @param object $queue
+	 * @throws \Exception
+	 */
 	public function __construct( $wpdb, $version, $login_credentials, $slug, $option_prefix, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes, $queue ) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
@@ -137,9 +137,9 @@ 
 	}
 
 	/**
-	* Create the action hooks to create the admin page(s)
-	*
-	*/
+	 * Create the action hooks to create the admin page(s)
+	 *
+	 */
 	public function add_actions() {
 		add_action( 'admin_init', array( $this, 'salesforce_settings_forms' ) );
 		add_action( 'admin_init', array( $this, 'notices' ) );
@@ -174,9 +174,9 @@ 
 	}
 
 	/**
-	* Recurring task to check Salesforce for data
-	*
-	*/
+	 * Recurring task to check Salesforce for data
+	 *
+	 */
 	public function change_action_schedule( $old_schedule, $new_schedule, $option_name ) {
 
 		// exit if nothing changed
@@ -212,21 +212,21 @@ 
 	}
 
 	/**
-	* Create WordPress admin options page
-	*
-	*/
+	 * Create WordPress admin options page
+	 *
+	 */
 	public function create_admin_menu() {
 		$title = __( 'Salesforce', 'object-sync-for-salesforce' );
 		add_options_page( $title, $title, 'configure_salesforce', 'object-sync-salesforce-admin', array( $this, 'show_admin_page' ) );
 	}
 
 	/**
-	* Render full admin pages in WordPress
-	* This allows other plugins to add tabs to the Salesforce settings screen
-	*
-	* todo: better front end: html, organization of html into templates, css, js
-	*
-	*/
+	 * Render full admin pages in WordPress
+	 * This allows other plugins to add tabs to the Salesforce settings screen
+	 *
+	 * todo: better front end: html, organization of html into templates, css, js
+	 *
+	 */
 	public function show_admin_page() {
 		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
 		echo '<div class="wrap">';
@@ -436,10 +436,10 @@ 
 	}
 
 	/**
-	* Create default WordPress admin settings form for salesforce
-	* This is for the Settings page/tab
-	*
-	*/
+	 * Create default WordPress admin settings form for salesforce
+	 * This is for the Settings page/tab
+	 *
+	 */
 	public function salesforce_settings_forms() {
 		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
 		$page     = isset( $get_data['tab'] ) ? sanitize_key( $get_data['tab'] ) : 'settings';
@@ -464,13 +464,13 @@ 
 	}
 
 	/**
-	* Fields for the Settings tab
-	* This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
-	*
-	* @param string $page
-	* @param string $section
-	* @param string $input_callback
-	*/
+	 * Fields for the Settings tab
+	 * This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
+	 *
+	 * @param string $page
+	 * @param string $section
+	 * @param string $input_callback
+	 */
 	private function fields_settings( $page, $section, $callbacks ) {
 		add_settings_section( $page, ucwords( $page ), null, $page );
 		$salesforce_settings = array(
@@ -717,25 +717,25 @@ 
 	}
 
 	/**
-	* Fields for the Fieldmaps tab
-	* This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
-	*
-	* @param string $page
-	* @param string $section
-	* @param string $input_callback
-	*/
+	 * Fields for the Fieldmaps tab
+	 * This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
+	 *
+	 * @param string $page
+	 * @param string $section
+	 * @param string $input_callback
+	 */
 	private function fields_fieldmaps( $page, $section, $input_callback = '' ) {
 		add_settings_section( $page, ucwords( $page ), null, $page );
 	}
 
 	/**
-	* Fields for the Scheduling tab
-	* This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
-	*
-	* @param string $page
-	* @param string $section
-	* @param string $input_callback
-	*/
+	 * Fields for the Scheduling tab
+	 * This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
+	 *
+	 * @param string $page
+	 * @param string $section
+	 * @param string $input_callback
+	 */
 	private function fields_scheduling( $page, $section, $callbacks ) {
 
 		add_settings_section( $page, ucwords( $page ), null, $page );
@@ -844,13 +844,13 @@ 
 	}
 
 	/**
-	* Fields for the Log Settings tab
-	* This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
-	*
-	* @param string $page
-	* @param string $section
-	* @param array $callbacks
-	*/
+	 * Fields for the Log Settings tab
+	 * This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
+	 *
+	 * @param string $page
+	 * @param string $section
+	 * @param array $callbacks
+	 */
 	private function fields_log_settings( $page, $section, $callbacks ) {
 		add_settings_section( $page, ucwords( str_replace( '_', ' ', $page ) ), null, $page );
 		$log_settings = array(
@@ -1028,9 +1028,9 @@ 
 	}
 
 	/**
-	* Create the notices, settings, and conditions by which admin notices should appear
-	*
-	*/
+	 * Create the notices, settings, and conditions by which admin notices should appear
+	 *
+	 */
 	public function notices() {
 
 		// before a notice is displayed, we should make sure we are on a page related to this plugin
@@ -1103,14 +1103,14 @@ 
 	}
 
 	/**
-	* Get all the Salesforce object settings for fieldmapping
-	* This takes either the $_POST array via ajax, or can be directly called with a $data array
-	*
-	* @param array $data
-	* data must contain a salesforce_object
-	* can optionally contain a type
-	* @return array $object_settings
-	*/
+	 * Get all the Salesforce object settings for fieldmapping
+	 * This takes either the $_POST array via ajax, or can be directly called with a $data array
+	 *
+	 * @param array $data
+	 * data must contain a salesforce_object
+	 * can optionally contain a type
+	 * @return array $object_settings
+	 */
 	public function get_salesforce_object_description( $data = array() ) {
 		$ajax = false;
 		if ( empty( $data ) ) {
@@ -1158,13 +1158,13 @@ 
 	}
 
 	/**
-	* Get Salesforce object fields for fieldmapping
-	*
-	* @param array $data
-	* data must contain a salesforce_object
-	* can optionally contain a type for the field
-	* @return array $object_fields
-	*/
+	 * Get Salesforce object fields for fieldmapping
+	 *
+	 * @param array $data
+	 * data must contain a salesforce_object
+	 * can optionally contain a type for the field
+	 * @return array $object_fields
+	 */
 	public function get_salesforce_object_fields( $data = array() ) {
 
 		if ( ! empty( $data['salesforce_object'] ) ) {
@@ -1192,12 +1192,12 @@ 
 	}
 
 	/**
-	* Get WordPress object fields for fieldmapping
-	* This takes either the $_POST array via ajax, or can be directly called with a $wordpress_object field
-	*
-	* @param string $wordpress_object
-	* @return array $object_fields
-	*/
+	 * Get WordPress object fields for fieldmapping
+	 * This takes either the $_POST array via ajax, or can be directly called with a $wordpress_object field
+	 *
+	 * @param string $wordpress_object
+	 * @return array $object_fields
+	 */
 	public function get_wordpress_object_fields( $wordpress_object = '' ) {
 		$ajax      = false;
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
@@ -1216,13 +1216,13 @@ 
 	}
 
 	/**
-	* Get WordPress and Salesforce object fields together for fieldmapping
-	* This takes either the $_POST array via ajax, or can be directly called with $wordpress_object and $salesforce_object fields
-	*
-	* @param string $wordpress_object
-	* @param string $salesforce_object
-	* @return array $object_fields
-	*/
+	 * Get WordPress and Salesforce object fields together for fieldmapping
+	 * This takes either the $_POST array via ajax, or can be directly called with $wordpress_object and $salesforce_object fields
+	 *
+	 * @param string $wordpress_object
+	 * @param string $salesforce_object
+	 * @return array $object_fields
+	 */
 	public function get_wp_sf_object_fields( $wordpress_object = '', $salesforce = '' ) {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( empty( $wordpress_object ) ) {
@@ -1247,12 +1247,12 @@ 
 	}
 
 	/**
-	* Manually push the WordPress object to Salesforce
-	* This takes either the $_POST array via ajax, or can be directly called with $wordpress_object and $wordpress_id fields
-	*
-	* @param string $wordpress_object
-	* @param int $wordpress_id
-	*/
+	 * Manually push the WordPress object to Salesforce
+	 * This takes either the $_POST array via ajax, or can be directly called with $wordpress_object and $wordpress_id fields
+	 *
+	 * @param string $wordpress_object
+	 * @param int $wordpress_id
+	 */
 	public function push_to_salesforce( $wordpress_object = '', $wordpress_id = '' ) {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( empty( $wordpress_object ) && empty( $wordpress_id ) ) {
@@ -1271,12 +1271,12 @@ 
 	}
 
 	/**
-	* Manually pull the Salesforce object into WordPress
-	* This takes either the $_POST array via ajax, or can be directly called with $salesforce_id fields
-	*
-	* @param string $salesforce_id
-	* @param string $wordpress_object
-	*/
+	 * Manually pull the Salesforce object into WordPress
+	 * This takes either the $_POST array via ajax, or can be directly called with $salesforce_id fields
+	 *
+	 * @param string $salesforce_id
+	 * @param string $wordpress_object
+	 */
 	public function pull_from_salesforce( $salesforce_id = '', $wordpress_object = '' ) {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( empty( $wordpress_object ) && empty( $salesforce_id ) ) {
@@ -1293,11 +1293,11 @@ 
 	}
 
 	/**
-	* Manually pull the Salesforce object into WordPress
-	* This takes an id for a mapping object row
-	*
-	* @param int $mapping_id
-	*/
+	 * Manually pull the Salesforce object into WordPress
+	 * This takes an id for a mapping object row
+	 *
+	 * @param int $mapping_id
+	 */
 	public function refresh_mapped_data( $mapping_id = '' ) {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( empty( $mapping_id ) ) {
@@ -1316,13 +1316,13 @@ 
 	}
 
 	/**
-	* Prepare fieldmap data and redirect after processing
-	* This runs when the create or update forms are submitted
-	* It is public because it depends on an admin hook
-	* It then calls the Object_Sync_Sf_Mapping class and sends prepared data over to it, then redirects to the correct page
-	* This method does include error handling, by loading the submission in a transient if there is an error, and then deleting it upon success
-	*
-	*/
+	 * Prepare fieldmap data and redirect after processing
+	 * This runs when the create or update forms are submitted
+	 * It is public because it depends on an admin hook
+	 * It then calls the Object_Sync_Sf_Mapping class and sends prepared data over to it, then redirects to the correct page
+	 * This method does include error handling, by loading the submission in a transient if there is an error, and then deleting it upon success
+	 *
+	 */
 	public function prepare_fieldmap_data() {
 		$error     = false;
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
@@ -1370,12 +1370,12 @@ 
 	}
 
 	/**
-	* Delete fieldmap data and redirect after processing
-	* This runs when the delete link is clicked, after the user confirms
-	* It is public because it depends on an admin hook
-	* It then calls the Object_Sync_Sf_Mapping class and the delete method
-	*
-	*/
+	 * Delete fieldmap data and redirect after processing
+	 * This runs when the delete link is clicked, after the user confirms
+	 * It is public because it depends on an admin hook
+	 * It then calls the Object_Sync_Sf_Mapping class and the delete method
+	 *
+	 */
 	public function delete_fieldmap() {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( $post_data['id'] ) {
@@ -1391,13 +1391,13 @@ 
 	}
 
 	/**
-	* Prepare object data and redirect after processing
-	* This runs when the update form is submitted
-	* It is public because it depends on an admin hook
-	* It then calls the Object_Sync_Sf_Mapping class and sends prepared data over to it, then redirects to the correct page
-	* This method does include error handling, by loading the submission in a transient if there is an error, and then deleting it upon success
-	*
-	*/
+	 * Prepare object data and redirect after processing
+	 * This runs when the update form is submitted
+	 * It is public because it depends on an admin hook
+	 * It then calls the Object_Sync_Sf_Mapping class and sends prepared data over to it, then redirects to the correct page
+	 * This method does include error handling, by loading the submission in a transient if there is an error, and then deleting it upon success
+	 *
+	 */
 	public function prepare_object_map_data() {
 		$error     = false;
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
@@ -1436,12 +1436,12 @@ 
 	}
 
 	/**
-	* Delete object map data and redirect after processing
-	* This runs when the delete link is clicked on an error row, after the user confirms
-	* It is public because it depends on an admin hook
-	* It then calls the Object_Sync_Sf_Mapping class and the delete method
-	*
-	*/
+	 * Delete object map data and redirect after processing
+	 * This runs when the delete link is clicked on an error row, after the user confirms
+	 * It is public because it depends on an admin hook
+	 * It then calls the Object_Sync_Sf_Mapping class and the delete method
+	 *
+	 */
 	public function delete_object_map() {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( $post_data['id'] ) {
@@ -1457,9 +1457,9 @@ 
 	}
 
 	/**
-	* Import a json file and use it for plugin data
-	*
-	*/
+	 * Import a json file and use it for plugin data
+	 *
+	 */
 	public function import_json_file() {
 
 		if ( ! wp_verify_nonce( $_POST['object_sync_for_salesforce_nonce_import'], 'object_sync_for_salesforce_nonce_import' ) ) {
@@ -1557,9 +1557,9 @@ 
 	}
 
 	/**
-	* Create a json file for exporting
-	*
-	*/
+	 * Create a json file for exporting
+	 *
+	 */
 	public function export_json_file() {
 
 		if ( ! wp_verify_nonce( $_POST['object_sync_for_salesforce_nonce_export'], 'object_sync_for_salesforce_nonce_export' ) ) {
@@ -1588,10 +1588,10 @@ 
 	}
 
 	/**
-	* Default display for <input> fields
-	*
-	* @param array $args
-	*/
+	 * Default display for <input> fields
+	 *
+	 * @param array $args
+	 */
 	public function display_input_field( $args ) {
 		$type    = $args['type'];
 		$id      = $args['label_for'];
@@ -1638,11 +1638,11 @@ 
 	}
 
 	/**
-	* Display for multiple checkboxes
-	* Above method can handle a single checkbox as it is
-	*
-	* @param array $args
-	*/
+	 * Display for multiple checkboxes
+	 * Above method can handle a single checkbox as it is
+	 *
+	 * @param array $args
+	 */
 	public function display_checkboxes( $args ) {
 		$type    = 'checkbox';
 		$name    = $args['name'];
@@ -1676,10 +1676,10 @@ 
 	}
 
 	/**
-	* Display for a dropdown
-	*
-	* @param array $args
-	*/
+	 * Display for a dropdown
+	 *
+	 * @param array $args
+	 */
 	public function display_select( $args ) {
 		$type = $args['type'];
 		$id   = $args['label_for'];
@@ -1723,10 +1723,10 @@ 
 	}
 
 	/**
-	* Dropdown formatted list of Salesforce API versions
-	*
-	* @return array $args
-	*/
+	 * Dropdown formatted list of Salesforce API versions
+	 *
+	 * @return array $args
+	 */
 	private function version_options() {
 		$versions = $this->salesforce['sfapi']->get_api_versions();
 		$args     = array();
@@ -1740,10 +1740,10 @@ 
 	}
 
 	/**
-	* Default display for <a href> links
-	*
-	* @param array $args
-	*/
+	 * Default display for <a href> links
+	 *
+	 * @param array $args
+	 */
 	public function display_link( $args ) {
 		$label = $args['label'];
 		$desc  = $args['desc'];
@@ -1770,11 +1770,11 @@ 
 	}
 
 	/**
-	* Allow for a standard sanitize/validate method. We could use more specific ones if need be, but this one provides a baseline.
-	*
-	* @param string $option
-	* @return string $option
-	*/
+	 * Allow for a standard sanitize/validate method. We could use more specific ones if need be, but this one provides a baseline.
+	 *
+	 * @param string $option
+	 * @return string $option
+	 */
 	public function sanitize_validate_text( $option ) {
 		if ( is_array( $option ) ) {
 			$options = array();
@@ -1788,10 +1788,10 @@ 
 	}
 
 	/**
-	* Run a demo of Salesforce API call on the authenticate tab after WordPress has authenticated with it
-	*
-	* @param object $sfapi
-	*/
+	 * Run a demo of Salesforce API call on the authenticate tab after WordPress has authenticated with it
+	 *
+	 * @param object $sfapi
+	 */
 	private function status( $sfapi ) {
 
 		$versions = $sfapi->get_api_versions();
@@ -1850,10 +1850,10 @@ 
 	}
 
 	/**
-	* Deauthorize WordPress from Salesforce.
-	* This deletes the tokens from the database; it does not currently do anything in Salesforce
-	* For this plugin at this time, that is the decision we are making: don't do any kind of authorization stuff inside Salesforce
-	*/
+	 * Deauthorize WordPress from Salesforce.
+	 * This deletes the tokens from the database; it does not currently do anything in Salesforce
+	 * For this plugin at this time, that is the decision we are making: don't do any kind of authorization stuff inside Salesforce
+	 */
 	private function logout() {
 		$this->access_token  = delete_option( $this->option_prefix . 'access_token' );
 		$this->instance_url  = delete_option( $this->option_prefix . 'instance_url' );
@@ -1865,8 +1865,8 @@ 
 	}
 
 	/**
-	* Ajax call to clear the plugin cache.
-	*/
+	 * Ajax call to clear the plugin cache.
+	 */
 	public function clear_sfwp_cache() {
 		$result   = $this->clear_cache( true );
 		$response = array(
@@ -1877,9 +1877,9 @@ 
 	}
 
 	/**
-	* Clear the plugin's cache.
-	* This uses the flush method contained in the WordPress cache to clear all of this plugin's cached data.
-	*/
+	 * Clear the plugin's cache.
+	 * This uses the flush method contained in the WordPress cache to clear all of this plugin's cached data.
+	 */
 	private function clear_cache( $ajax = false ) {
 		$result = (bool) $this->wordpress->sfwp_transients->flush();
 		if ( true === $result ) {
@@ -1899,9 +1899,9 @@ 
 	}
 
 	/**
-	* Check WordPress Admin permissions
-	* Check if the current user is allowed to access the Salesforce plugin options
-	*/
+	 * Check WordPress Admin permissions
+	 * Check if the current user is allowed to access the Salesforce plugin options
+	 */
 	private function check_wordpress_admin_permissions() {
 
 		// one programmatic way to give this capability to additional user roles is the
@@ -1921,10 +1921,10 @@ 
 	}
 
 	/**
-	* Show what we know about this user's relationship to a Salesforce object, if any
-	* @param object $user
-	*
-	*/
+	 * Show what we know about this user's relationship to a Salesforce object, if any
+	 * @param object $user
+	 *
+	 */
 	public function show_salesforce_user_fields( $user ) {
 		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
 		if ( true === $this->check_wordpress_admin_permissions() ) {
@@ -1948,10 +1948,10 @@ 
 	}
 
 	/**
-	* If the user profile has been mapped to Salesforce, do it
-	* @param int $user_id
-	*
-	*/
+	 * If the user profile has been mapped to Salesforce, do it
+	 * @param int $user_id
+	 *
+	 */
 	public function save_salesforce_user_fields( $user_id ) {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( isset( $post_data['salesforce_update_mapped_user'] ) && '1' === rawurlencode( $post_data['salesforce_update_mapped_user'] ) ) {
@@ -1976,10 +1976,10 @@ 
 	}
 
 	/**
-	* Render tabs for settings pages in admin
-	* @param array $tabs
-	* @param string $tab
-	*/
+	 * Render tabs for settings pages in admin
+	 * @param array $tabs
+	 * @param string $tab
+	 */
 	private function tabs( $tabs, $tab = '' ) {
 
 		$get_data        = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
@@ -2009,10 +2009,10 @@ 
 	}
 
 	/**
-	* Clear schedule
-	* This clears the schedule if the user clicks the button
-	* @param string $schedule_name
-	*/
+	 * Clear schedule
+	 * This clears the schedule if the user clicks the button
+	 * @param string $schedule_name
+	 */
 	private function clear_schedule( $schedule_name = '' ) {
 		if ( '' !== $schedule_name ) {
 			$this->queue->cancel( $schedule_name );
@@ -2024,10 +2024,10 @@ 
 	}
 
 	/**
-	* Get count of schedule items
-	* @param string $schedule_name
-	* @return int $count
-	*/
+	 * Get count of schedule items
+	 * @param string $schedule_name
+	 * @return int $count
+	 */
 	private function get_schedule_count( $schedule_name = '' ) {
 		if ( '' !== $schedule_name ) {
 			$count       = count( $this->queue->search(
@@ -2051,21 +2051,21 @@ 
 	}
 
 	/**
-	* Create an object map between a WordPress object and a Salesforce object
-	*
-	* @param int $wordpress_id
-	*   Unique identifier for the WordPress object
-	* @param string $wordpress_object
-	*   What kind of object is it?
-	* @param string $salesforce_id
-	*   Unique identifier for the Salesforce object
-	* @param string $action
-	*   Did we push or pull?
-	*
-	* @return int $wpdb->insert_id
-	*   This is the database row for the map object
-	*
-	*/
+	 * Create an object map between a WordPress object and a Salesforce object
+	 *
+	 * @param int $wordpress_id
+	 *   Unique identifier for the WordPress object
+	 * @param string $wordpress_object
+	 *   What kind of object is it?
+	 * @param string $salesforce_id
+	 *   Unique identifier for the Salesforce object
+	 * @param string $action
+	 *   Did we push or pull?
+	 *
+	 * @return int $wpdb->insert_id
+	 *   This is the database row for the map object
+	 *
+	 */
 	private function create_object_map( $wordpress_id, $wordpress_object, $salesforce_id, $action = '' ) {
 		// Create object map and save it
 		$mapping_object = $this->mappings->create_object_map(

Spacing +574 added lines, -574 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -98,7 +98,7 @@ 
 	* @param object $queue
 	* @throws \Exception
 	*/
-	public function __construct( $wpdb, $version, $login_credentials, $slug, $option_prefix, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes, $queue ) {
+	public function __construct($wpdb, $version, $login_credentials, $slug, $option_prefix, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes, $queue) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
 		$this->login_credentials   = $login_credentials;
@@ -141,35 +141,35 @@ 
 	*
 	*/
 	public function add_actions() {
-		add_action( 'admin_init', array( $this, 'salesforce_settings_forms' ) );
-		add_action( 'admin_init', array( $this, 'notices' ) );
-		add_action( 'admin_post_post_fieldmap', array( $this, 'prepare_fieldmap_data' ) );
-
-		add_action( 'admin_post_delete_fieldmap', array( $this, 'delete_fieldmap' ) );
-		add_action( 'wp_ajax_get_salesforce_object_description', array( $this, 'get_salesforce_object_description' ) );
-		add_action( 'wp_ajax_get_wordpress_object_description', array( $this, 'get_wordpress_object_fields' ) );
-		add_action( 'wp_ajax_get_wp_sf_object_fields', array( $this, 'get_wp_sf_object_fields' ) );
-		add_action( 'wp_ajax_push_to_salesforce', array( $this, 'push_to_salesforce' ) );
-		add_action( 'wp_ajax_pull_from_salesforce', array( $this, 'pull_from_salesforce' ) );
-		add_action( 'wp_ajax_refresh_mapped_data', array( $this, 'refresh_mapped_data' ) );
-		add_action( 'wp_ajax_clear_sfwp_cache', array( $this, 'clear_sfwp_cache' ) );
-
-		add_action( 'edit_user_profile', array( $this, 'show_salesforce_user_fields' ) );
-		add_action( 'personal_options_update', array( $this, 'save_salesforce_user_fields' ) );
-		add_action( 'edit_user_profile_update', array( $this, 'save_salesforce_user_fields' ) );
+		add_action('admin_init', array($this, 'salesforce_settings_forms'));
+		add_action('admin_init', array($this, 'notices'));
+		add_action('admin_post_post_fieldmap', array($this, 'prepare_fieldmap_data'));
+
+		add_action('admin_post_delete_fieldmap', array($this, 'delete_fieldmap'));
+		add_action('wp_ajax_get_salesforce_object_description', array($this, 'get_salesforce_object_description'));
+		add_action('wp_ajax_get_wordpress_object_description', array($this, 'get_wordpress_object_fields'));
+		add_action('wp_ajax_get_wp_sf_object_fields', array($this, 'get_wp_sf_object_fields'));
+		add_action('wp_ajax_push_to_salesforce', array($this, 'push_to_salesforce'));
+		add_action('wp_ajax_pull_from_salesforce', array($this, 'pull_from_salesforce'));
+		add_action('wp_ajax_refresh_mapped_data', array($this, 'refresh_mapped_data'));
+		add_action('wp_ajax_clear_sfwp_cache', array($this, 'clear_sfwp_cache'));
+
+		add_action('edit_user_profile', array($this, 'show_salesforce_user_fields'));
+		add_action('personal_options_update', array($this, 'save_salesforce_user_fields'));
+		add_action('edit_user_profile_update', array($this, 'save_salesforce_user_fields'));
 
 		// when either field for schedule settings changes
-		foreach ( $this->schedulable_classes as $key => $value ) {
-			add_filter( 'update_option_' . $this->option_prefix . $key . '_schedule_number', array( $this, 'change_action_schedule' ), 10, 3 );
-			add_filter( 'update_option_' . $this->option_prefix . $key . '_schedule_unit', array( $this, 'change_action_schedule' ), 10, 3 );
+		foreach ($this->schedulable_classes as $key => $value) {
+			add_filter('update_option_' . $this->option_prefix . $key . '_schedule_number', array($this, 'change_action_schedule'), 10, 3);
+			add_filter('update_option_' . $this->option_prefix . $key . '_schedule_unit', array($this, 'change_action_schedule'), 10, 3);
 		}
 
-		add_action( 'admin_post_delete_object_map', array( $this, 'delete_object_map' ) );
-		add_action( 'admin_post_post_object_map', array( $this, 'prepare_object_map_data' ) );
+		add_action('admin_post_delete_object_map', array($this, 'delete_object_map'));
+		add_action('admin_post_post_object_map', array($this, 'prepare_object_map_data'));
 
 		// import and export plugin data
-		add_action( 'admin_post_object_sync_for_salesforce_import', array( $this, 'import_json_file' ) );
-		add_action( 'admin_post_object_sync_for_salesforce_export', array( $this, 'export_json_file' ) );
+		add_action('admin_post_object_sync_for_salesforce_import', array($this, 'import_json_file'));
+		add_action('admin_post_object_sync_for_salesforce_export', array($this, 'export_json_file'));
 
 	}
 
@@ -177,35 +177,35 @@ 
 	* Recurring task to check Salesforce for data
 	*
 	*/
-	public function change_action_schedule( $old_schedule, $new_schedule, $option_name ) {
+	public function change_action_schedule($old_schedule, $new_schedule, $option_name) {
 
 		// exit if nothing changed
-		if ( $old_schedule === $new_schedule ) {
+		if ($old_schedule === $new_schedule) {
 			return;
 		}
 
 		// get the current schedule name from the task, based on pattern in the foreach
-		preg_match( '/' . $this->option_prefix . '(.*)_schedule/', $option_name, $matches );
+		preg_match('/' . $this->option_prefix . '(.*)_schedule/', $option_name, $matches);
 		$schedule_name     = $matches[1];
 		$action_group_name = $schedule_name . $this->action_group_suffix;
 
 		// exit if there is no initializer property on this schedule
-		if ( ! isset( $this->schedulable_classes[ $schedule_name ]['initializer'] ) ) {
+		if ( ! isset($this->schedulable_classes[$schedule_name]['initializer'])) {
 			return;
 		}
 
 		// cancel previous task
 		$this->queue->cancel(
-			$this->schedulable_classes[ $schedule_name ]['initializer'],
+			$this->schedulable_classes[$schedule_name]['initializer'],
 			array(),
 			$action_group_name
 		);
 
 		// create new recurring task for action-scheduler to check for data to pull from salesforce
 		$this->queue->schedule_recurring(
-			current_time( 'timestamp', true ), // plugin seems to expect UTC
-			$this->queue->get_frequency( $schedule_name, 'seconds' ),
-			$this->schedulable_classes[ $schedule_name ]['initializer'],
+			current_time('timestamp', true), // plugin seems to expect UTC
+			$this->queue->get_frequency($schedule_name, 'seconds'),
+			$this->schedulable_classes[$schedule_name]['initializer'],
 			array(),
 			$action_group_name
 		);
@@ -216,8 +216,8 @@ 
 	*
 	*/
 	public function create_admin_menu() {
-		$title = __( 'Salesforce', 'object-sync-for-salesforce' );
-		add_options_page( $title, $title, 'configure_salesforce', 'object-sync-salesforce-admin', array( $this, 'show_admin_page' ) );
+		$title = __('Salesforce', 'object-sync-for-salesforce');
+		add_options_page($title, $title, 'configure_salesforce', 'object-sync-salesforce-admin', array($this, 'show_admin_page'));
 	}
 
 	/**
@@ -228,114 +228,114 @@ 
 	*
 	*/
 	public function show_admin_page() {
-		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
+		$get_data = filter_input_array(INPUT_GET, FILTER_SANITIZE_STRING);
 		echo '<div class="wrap">';
-		echo '<h1>' . esc_html( get_admin_page_title() ) . '</h1>';
+		echo '<h1>' . esc_html(get_admin_page_title()) . '</h1>';
 		$allowed = $this->check_wordpress_admin_permissions();
-		if ( false === $allowed ) {
+		if (false === $allowed) {
 			return;
 		}
 		$tabs = array(
-			'settings'      => __( 'Settings', 'object-sync-for-salesforce' ),
-			'authorize'     => __( 'Authorize', 'object-sync-for-salesforce' ),
-			'fieldmaps'     => __( 'Fieldmaps', 'object-sync-for-salesforce' ),
-			'schedule'      => __( 'Scheduling', 'object-sync-for-salesforce' ),
-			'import-export' => __( 'Import &amp; Export', 'object-sync-for-salesforce' ),
+			'settings'      => __('Settings', 'object-sync-for-salesforce'),
+			'authorize'     => __('Authorize', 'object-sync-for-salesforce'),
+			'fieldmaps'     => __('Fieldmaps', 'object-sync-for-salesforce'),
+			'schedule'      => __('Scheduling', 'object-sync-for-salesforce'),
+			'import-export' => __('Import &amp; Export', 'object-sync-for-salesforce'),
 		); // this creates the tabs for the admin
 
 		// optionally make tab(s) for logging and log settings
-		$logging_enabled      = get_option( $this->option_prefix . 'enable_logging', false );
-		$tabs['log_settings'] = __( 'Log Settings', 'object-sync-for-salesforce' );
+		$logging_enabled      = get_option($this->option_prefix . 'enable_logging', false);
+		$tabs['log_settings'] = __('Log Settings', 'object-sync-for-salesforce');
 
 		$mapping_errors = $this->mappings->get_failed_object_maps();
-		if ( ! empty( $mapping_errors ) ) {
-			$tabs['mapping_errors'] = __( 'Mapping Errors', 'object-sync-for-salesforce' );
+		if ( ! empty($mapping_errors)) {
+			$tabs['mapping_errors'] = __('Mapping Errors', 'object-sync-for-salesforce');
 		}
 
 		// filter for extending the tabs available on the page
 		// currently it will go into the default switch case for $tab
-		$tabs = apply_filters( 'object_sync_for_salesforce_settings_tabs', $tabs );
+		$tabs = apply_filters('object_sync_for_salesforce_settings_tabs', $tabs);
 
-		$tab = isset( $get_data['tab'] ) ? sanitize_key( $get_data['tab'] ) : 'settings';
-		$this->tabs( $tabs, $tab );
+		$tab = isset($get_data['tab']) ? sanitize_key($get_data['tab']) : 'settings';
+		$this->tabs($tabs, $tab);
 
 		$consumer_key    = $this->login_credentials['consumer_key'];
 		$consumer_secret = $this->login_credentials['consumer_secret'];
 		$callback_url    = $this->login_credentials['callback_url'];
 
-		if ( true !== $this->salesforce['is_authorized'] ) {
-			$url     = esc_url( $callback_url );
-			$anchor  = esc_html__( 'Authorize tab', 'object-sync-for-salesforce' );
-			$message = sprintf( 'Salesforce needs to be authorized to connect to this website. Use the <a href="%s">%s</a> to connect.', $url, $anchor );
-			require( plugin_dir_path( __FILE__ ) . '/../templates/admin/error.php' );
+		if (true !== $this->salesforce['is_authorized']) {
+			$url     = esc_url($callback_url);
+			$anchor  = esc_html__('Authorize tab', 'object-sync-for-salesforce');
+			$message = sprintf('Salesforce needs to be authorized to connect to this website. Use the <a href="%s">%s</a> to connect.', $url, $anchor);
+			require(plugin_dir_path(__FILE__) . '/../templates/admin/error.php');
 		}
 
-		if ( 0 === count( $this->mappings->get_fieldmaps() ) ) {
-			$url     = esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps' ) );
-			$anchor  = esc_html__( 'Fieldmaps tab', 'object-sync-for-salesforce' );
-			$message = sprintf( 'No fieldmaps exist yet. Use the <a href="%s">%s</a> to map WordPress and Salesforce objects to each other.', $url, $anchor );
-			require( plugin_dir_path( __FILE__ ) . '/../templates/admin/error.php' );
+		if (0 === count($this->mappings->get_fieldmaps())) {
+			$url     = esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps'));
+			$anchor  = esc_html__('Fieldmaps tab', 'object-sync-for-salesforce');
+			$message = sprintf('No fieldmaps exist yet. Use the <a href="%s">%s</a> to map WordPress and Salesforce objects to each other.', $url, $anchor);
+			require(plugin_dir_path(__FILE__) . '/../templates/admin/error.php');
 		}
 
-		$push_schedule_number = get_option( $this->option_prefix . 'salesforce_push_schedule_number', '' );
-		$push_schedule_unit   = get_option( $this->option_prefix . 'salesforce_push_schedule_unit', '' );
-		$pull_schedule_number = get_option( $this->option_prefix . 'salesforce_pull_schedule_number', '' );
-		$pull_schedule_unit   = get_option( $this->option_prefix . 'salesforce_pull_schedule_unit', '' );
+		$push_schedule_number = get_option($this->option_prefix . 'salesforce_push_schedule_number', '');
+		$push_schedule_unit   = get_option($this->option_prefix . 'salesforce_push_schedule_unit', '');
+		$pull_schedule_number = get_option($this->option_prefix . 'salesforce_pull_schedule_number', '');
+		$pull_schedule_unit   = get_option($this->option_prefix . 'salesforce_pull_schedule_unit', '');
 
-		if ( '' === $push_schedule_number && '' === $push_schedule_unit && '' === $pull_schedule_number && '' === $pull_schedule_unit ) {
-			$url     = esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=schedule' ) );
-			$anchor  = esc_html__( 'Scheduling tab', 'object-sync-for-salesforce' );
-			$message = sprintf( 'Because the plugin schedule has not been saved, the plugin cannot run automatic operations. Use the <a href="%s">%s</a> to create schedules to run.', $url, $anchor );
-			require( plugin_dir_path( __FILE__ ) . '/../templates/admin/error.php' );
+		if ('' === $push_schedule_number && '' === $push_schedule_unit && '' === $pull_schedule_number && '' === $pull_schedule_unit) {
+			$url     = esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=schedule'));
+			$anchor  = esc_html__('Scheduling tab', 'object-sync-for-salesforce');
+			$message = sprintf('Because the plugin schedule has not been saved, the plugin cannot run automatic operations. Use the <a href="%s">%s</a> to create schedules to run.', $url, $anchor);
+			require(plugin_dir_path(__FILE__) . '/../templates/admin/error.php');
 		}
 
 		try {
-			switch ( $tab ) {
+			switch ($tab) {
 				case 'authorize':
-					if ( isset( $get_data['code'] ) ) {
+					if (isset($get_data['code'])) {
 						// this string is an oauth token
-						$data          = esc_html( wp_unslash( $get_data['code'] ) );
-						$is_authorized = $this->salesforce['sfapi']->request_token( $data );
+						$data          = esc_html(wp_unslash($get_data['code']));
+						$is_authorized = $this->salesforce['sfapi']->request_token($data);
 						?>
-						<script>window.location = '<?php echo esc_url_raw( $callback_url ); ?>'</script>
+						<script>window.location = '<?php echo esc_url_raw($callback_url); ?>'</script>
 						<?php
-					} elseif ( true === $this->salesforce['is_authorized'] ) {
-							require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/authorized.php' );
-							$this->status( $this->salesforce['sfapi'] );
-					} elseif ( true === is_object( $this->salesforce['sfapi'] ) && isset( $consumer_key ) && isset( $consumer_secret ) ) {
+					} elseif (true === $this->salesforce['is_authorized']) {
+							require_once(plugin_dir_path(__FILE__) . '/../templates/admin/authorized.php');
+							$this->status($this->salesforce['sfapi']);
+					} elseif (true === is_object($this->salesforce['sfapi']) && isset($consumer_key) && isset($consumer_secret)) {
 						?>
-						<p><a class="button button-primary" href="<?php echo esc_url( $this->salesforce['sfapi']->get_authorization_code() ); ?>"><?php echo esc_html__( 'Connect to Salesforce', 'object-sync-for-salesforce' ); ?></a></p>
+						<p><a class="button button-primary" href="<?php echo esc_url($this->salesforce['sfapi']->get_authorization_code()); ?>"><?php echo esc_html__('Connect to Salesforce', 'object-sync-for-salesforce'); ?></a></p>
 						<?php
 					} else {
-						$url    = esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=settings' ) );
-						$anchor = esc_html__( 'Settings', 'object-sync-for-salesforce' );
+						$url    = esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=settings'));
+						$anchor = esc_html__('Settings', 'object-sync-for-salesforce');
 						// translators: placeholders are for the settings tab link: 1) the url, and 2) the anchor text
-						$message = sprintf( esc_html__( 'Salesforce needs to be authorized to connect to this website but the credentials are missing. Use the <a href="%1$s">%2$s</a> tab to add them.', 'object-sync-salesforce' ), $url, $anchor );
-						require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/error.php' );
+						$message = sprintf(esc_html__('Salesforce needs to be authorized to connect to this website but the credentials are missing. Use the <a href="%1$s">%2$s</a> tab to add them.', 'object-sync-salesforce'), $url, $anchor);
+						require_once(plugin_dir_path(__FILE__) . '/../templates/admin/error.php');
 					}
 					break;
 				case 'fieldmaps':
-					if ( isset( $get_data['method'] ) ) {
+					if (isset($get_data['method'])) {
 
-						$method      = sanitize_key( $get_data['method'] );
-						$error_url   = get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=' . $method );
-						$success_url = get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps' );
+						$method      = sanitize_key($get_data['method']);
+						$error_url   = get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=' . $method);
+						$success_url = get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps');
 
-						if ( isset( $get_data['transient'] ) ) {
-							$transient = sanitize_key( $get_data['transient'] );
-							$posted    = $this->sfwp_transients->get( $transient );
+						if (isset($get_data['transient'])) {
+							$transient = sanitize_key($get_data['transient']);
+							$posted    = $this->sfwp_transients->get($transient);
 						}
 
-						if ( isset( $posted ) && is_array( $posted ) ) {
+						if (isset($posted) && is_array($posted)) {
 							$map = $posted;
-						} elseif ( 'edit' === $method || 'clone' === $method || 'delete' === $method ) {
-							$map = $this->mappings->get_fieldmaps( isset( $get_data['id'] ) ? sanitize_key( $get_data['id'] ) : '' );
+						} elseif ('edit' === $method || 'clone' === $method || 'delete' === $method) {
+							$map = $this->mappings->get_fieldmaps(isset($get_data['id']) ? sanitize_key($get_data['id']) : '');
 						}
 
-						if ( isset( $map ) && is_array( $map ) ) {
+						if (isset($map) && is_array($map)) {
 							$label                           = $map['label'];
 							$salesforce_object               = $map['salesforce_object'];
-							$salesforce_record_types_allowed = maybe_unserialize( $map['salesforce_record_types_allowed'] );
+							$salesforce_record_types_allowed = maybe_unserialize($map['salesforce_record_types_allowed']);
 							$salesforce_record_type_default  = $map['salesforce_record_type_default'];
 							$wordpress_object                = $map['wordpress_object'];
 							$pull_trigger_field              = $map['pull_trigger_field'];
@@ -346,14 +346,14 @@ 
 							$weight                          = $map['weight'];
 						}
 
-						if ( 'add' === $method || 'edit' === $method || 'clone' === $method ) {
-							require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/fieldmaps-add-edit-clone.php' );
-						} elseif ( 'delete' === $method ) {
-							require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/fieldmaps-delete.php' );
+						if ('add' === $method || 'edit' === $method || 'clone' === $method) {
+							require_once(plugin_dir_path(__FILE__) . '/../templates/admin/fieldmaps-add-edit-clone.php');
+						} elseif ('delete' === $method) {
+							require_once(plugin_dir_path(__FILE__) . '/../templates/admin/fieldmaps-delete.php');
 						}
 					} else {
 						$fieldmaps = $this->mappings->get_fieldmaps();
-						require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/fieldmaps-list.php' );
+						require_once(plugin_dir_path(__FILE__) . '/../templates/admin/fieldmaps-list.php');
 					} // End if().
 					break;
 				case 'logout':
@@ -363,73 +363,73 @@ 
 					$this->clear_cache();
 					break;
 				case 'clear_schedule':
-					if ( isset( $get_data['schedule_name'] ) ) {
-						$schedule_name = sanitize_key( $get_data['schedule_name'] );
+					if (isset($get_data['schedule_name'])) {
+						$schedule_name = sanitize_key($get_data['schedule_name']);
 					}
-					$this->clear_schedule( $schedule_name );
+					$this->clear_schedule($schedule_name);
 					break;
 				case 'settings':
-					require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/settings.php' );
+					require_once(plugin_dir_path(__FILE__) . '/../templates/admin/settings.php');
 					break;
 				case 'mapping_errors':
-					if ( isset( $get_data['method'] ) ) {
+					if (isset($get_data['method'])) {
 
-						$method      = sanitize_key( $get_data['method'] );
-						$error_url   = get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors&method=' . $method );
-						$success_url = get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors' );
+						$method      = sanitize_key($get_data['method']);
+						$error_url   = get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors&method=' . $method);
+						$success_url = get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors');
 
-						if ( isset( $get_data['map_transient'] ) ) {
-							$transient = sanitize_key( $get_data['map_transient'] );
-							$posted    = $this->sfwp_transients->get( $transient );
+						if (isset($get_data['map_transient'])) {
+							$transient = sanitize_key($get_data['map_transient']);
+							$posted    = $this->sfwp_transients->get($transient);
 						}
 
-						if ( isset( $posted ) && is_array( $posted ) ) {
+						if (isset($posted) && is_array($posted)) {
 							$map_row = $posted;
-						} elseif ( 'edit' === $method || 'delete' === $method ) {
-							$map_row = $this->mappings->get_failed_object_map( isset( $get_data['id'] ) ? sanitize_key( $get_data['id'] ) : '' );
+						} elseif ('edit' === $method || 'delete' === $method) {
+							$map_row = $this->mappings->get_failed_object_map(isset($get_data['id']) ? sanitize_key($get_data['id']) : '');
 						}
 
-						if ( isset( $map_row ) && is_array( $map_row ) ) {
+						if (isset($map_row) && is_array($map_row)) {
 							$salesforce_id = $map_row['salesforce_id'];
 							$wordpress_id  = $map_row['wordpress_id'];
 						}
 
-						if ( 'edit' === $method ) {
-							require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/mapping-errors-edit.php' );
-						} elseif ( 'delete' === $method ) {
-							require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/mapping-errors-delete.php' );
+						if ('edit' === $method) {
+							require_once(plugin_dir_path(__FILE__) . '/../templates/admin/mapping-errors-edit.php');
+						} elseif ('delete' === $method) {
+							require_once(plugin_dir_path(__FILE__) . '/../templates/admin/mapping-errors-delete.php');
 						}
 					} else {
-						require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/mapping-errors.php' );
+						require_once(plugin_dir_path(__FILE__) . '/../templates/admin/mapping-errors.php');
 					}
 					break;
 				case 'import-export':
-					require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/import-export.php' );
+					require_once(plugin_dir_path(__FILE__) . '/../templates/admin/import-export.php');
 					break;
 				default:
-					$include_settings = apply_filters( 'object_sync_for_salesforce_settings_tab_include_settings', true, $tab );
-					$content_before   = apply_filters( 'object_sync_for_salesforce_settings_tab_content_before', null, $tab );
-					$content_after    = apply_filters( 'object_sync_for_salesforce_settings_tab_content_after', null, $tab );
-					if ( null !== $content_before ) {
-						echo esc_html( $content_before );
+					$include_settings = apply_filters('object_sync_for_salesforce_settings_tab_include_settings', true, $tab);
+					$content_before   = apply_filters('object_sync_for_salesforce_settings_tab_content_before', null, $tab);
+					$content_after    = apply_filters('object_sync_for_salesforce_settings_tab_content_after', null, $tab);
+					if (null !== $content_before) {
+						echo esc_html($content_before);
 					}
-					if ( true === $include_settings ) {
-						require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/settings.php' );
+					if (true === $include_settings) {
+						require_once(plugin_dir_path(__FILE__) . '/../templates/admin/settings.php');
 					}
-					if ( null !== $content_after ) {
-						echo esc_html( $content_after );
+					if (null !== $content_after) {
+						echo esc_html($content_after);
 					}
 					break;
 			} // End switch().
-		} catch ( SalesforceApiException $ex ) {
-			echo sprintf( '<p>Error <strong>%1$s</strong>: %2$s</p>',
-				absint( $ex->getCode() ),
-				esc_html( $ex->getMessage() )
+		} catch (SalesforceApiException $ex) {
+			echo sprintf('<p>Error <strong>%1$s</strong>: %2$s</p>',
+				absint($ex->getCode()),
+				esc_html($ex->getMessage())
 			);
-		} catch ( Exception $ex ) {
-			echo sprintf( '<p>Error <strong>%1$s</strong>: %2$s</p>',
-				absint( $ex->getCode() ),
-				esc_html( $ex->getMessage() )
+		} catch (Exception $ex) {
+			echo sprintf('<p>Error <strong>%1$s</strong>: %2$s</p>',
+				absint($ex->getCode()),
+				esc_html($ex->getMessage())
 			);
 		} // End try().
 		echo '</div>';
@@ -441,14 +441,14 @@ 
 	*
 	*/
 	public function salesforce_settings_forms() {
-		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
-		$page     = isset( $get_data['tab'] ) ? sanitize_key( $get_data['tab'] ) : 'settings';
-		$section  = isset( $get_data['tab'] ) ? sanitize_key( $get_data['tab'] ) : 'settings';
+		$get_data = filter_input_array(INPUT_GET, FILTER_SANITIZE_STRING);
+		$page     = isset($get_data['tab']) ? sanitize_key($get_data['tab']) : 'settings';
+		$section  = isset($get_data['tab']) ? sanitize_key($get_data['tab']) : 'settings';
 
-		$input_callback_default   = array( $this, 'display_input_field' );
-		$input_checkboxes_default = array( $this, 'display_checkboxes' );
-		$input_select_default     = array( $this, 'display_select' );
-		$link_default             = array( $this, 'display_link' );
+		$input_callback_default   = array($this, 'display_input_field');
+		$input_checkboxes_default = array($this, 'display_checkboxes');
+		$input_select_default     = array($this, 'display_select');
+		$link_default             = array($this, 'display_link');
 
 		$all_field_callbacks = array(
 			'text'       => $input_callback_default,
@@ -457,10 +457,10 @@ 
 			'link'       => $link_default,
 		);
 
-		$this->fields_settings( 'settings', 'settings', $all_field_callbacks );
-		$this->fields_fieldmaps( 'fieldmaps', 'objects' );
-		$this->fields_scheduling( 'schedule', 'schedule', $all_field_callbacks );
-		$this->fields_log_settings( 'log_settings', 'log_settings', $all_field_callbacks );
+		$this->fields_settings('settings', 'settings', $all_field_callbacks);
+		$this->fields_fieldmaps('fieldmaps', 'objects');
+		$this->fields_scheduling('schedule', 'schedule', $all_field_callbacks);
+		$this->fields_log_settings('log_settings', 'log_settings', $all_field_callbacks);
 	}
 
 	/**
@@ -471,11 +471,11 @@ 
 	* @param string $section
 	* @param string $input_callback
 	*/
-	private function fields_settings( $page, $section, $callbacks ) {
-		add_settings_section( $page, ucwords( $page ), null, $page );
+	private function fields_settings($page, $section, $callbacks) {
+		add_settings_section($page, ucwords($page), null, $page);
 		$salesforce_settings = array(
 			'consumer_key'                   => array(
-				'title'    => __( 'Consumer Key', 'object-sync-for-salesforce' ),
+				'title'    => __('Consumer Key', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -488,7 +488,7 @@ 
 
 			),
 			'consumer_secret'                => array(
-				'title'    => __( 'Consumer Secret', 'object-sync-for-salesforce' ),
+				'title'    => __('Consumer Secret', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -500,7 +500,7 @@ 
 				),
 			),
 			'callback_url'                   => array(
-				'title'    => __( 'Callback URL', 'object-sync-for-salesforce' ),
+				'title'    => __('Callback URL', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -508,14 +508,14 @@ 
 					'type'     => 'url',
 					'validate' => 'sanitize_validate_text',
 					// translators: %1$s is the admin URL for the Authorize tab
-					'desc'     => sprintf( __( 'In most cases, you will want to use %1$s for this value.', 'object-sync-for-salesforce' ),
-						get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=authorize' )
+					'desc'     => sprintf(__('In most cases, you will want to use %1$s for this value.', 'object-sync-for-salesforce'),
+						get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=authorize')
 					),
 					'constant' => 'OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL',
 				),
 			),
 			'login_base_url'                 => array(
-				'title'    => __( 'Login Base URL', 'object-sync-for-salesforce' ),
+				'title'    => __('Login Base URL', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -523,22 +523,22 @@ 
 					'type'     => 'url',
 					'validate' => 'sanitize_validate_text',
 					// translators: 1) production salesforce login, 2) sandbox salesforce login
-					'desc'     => sprintf( __( 'For most Salesforce setups, you should use %1$s for production and %2$s for sandbox.', 'object-sync-for-salesforce' ),
-						esc_url( 'https://login.salesforce.com' ),
-						esc_url( 'https://test.salesforce.com' )
+					'desc'     => sprintf(__('For most Salesforce setups, you should use %1$s for production and %2$s for sandbox.', 'object-sync-for-salesforce'),
+						esc_url('https://login.salesforce.com'),
+						esc_url('https://test.salesforce.com')
 					),
 					'constant' => 'OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL',
 				),
 			),
 			'authorize_url_path'             => array(
-				'title'    => __( 'Authorize URL Path', 'object-sync-for-salesforce' ),
+				'title'    => __('Authorize URL Path', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
 				'args'     => array(
 					'type'     => 'text',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'For most Salesforce installs, this should not be changed.', 'object-sync-for-salesforce' ),
+					'desc'     => __('For most Salesforce installs, this should not be changed.', 'object-sync-for-salesforce'),
 					'constant' => 'OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH',
 					'default'  => $this->default_authorize_url_path,
 				),
@@ -551,7 +551,7 @@ 
 				'args'     => array(
 					'type'     => 'text',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'For most Salesforce installs, this should not be changed.', 'object-sync-for-salesforce' ),
+					'desc'     => __('For most Salesforce installs, this should not be changed.', 'object-sync-for-salesforce'),
 					'constant' => 'OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH',
 					'default'  => $this->default_token_url_path,
 				),
@@ -577,7 +577,7 @@ 
 				'args'     => array(
 					'type'     => 'checkboxes',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'Allows you to limit which Salesforce objects can be mapped', 'object-sync-for-salesforce' ),
+					'desc'     => __('Allows you to limit which Salesforce objects can be mapped', 'object-sync-for-salesforce'),
 					'items'    => array(
 						'triggerable' => array(
 							'text'    => 'Only Triggerable objects',
@@ -606,7 +606,7 @@ 
 					'constant' => '',
 					'items'    => array(
 						'field_label' => array(
-							'text'  => __( 'Field Label', 'object-sync-for-salesforce' ),
+							'text'  => __('Field Label', 'object-sync-for-salesforce'),
 							'value' => 'field_label',
 						),
 						/*'field_name'  => array(
@@ -614,7 +614,7 @@ 
 							'value' => 'field_name',
 						),*/
 						'api_name'    => array(
-							'text'  => __( 'API Name', 'object-sync-for-salesforce' ),
+							'text'  => __('API Name', 'object-sync-for-salesforce'),
 							'value' => 'api_name',
 						),
 					),
@@ -628,7 +628,7 @@ 
 				'args'     => array(
 					'type'     => 'number',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'Limit the number of records that can be pulled from Salesforce in a single query.', 'object-sync-for-salesforce' ),
+					'desc'     => __('Limit the number of records that can be pulled from Salesforce in a single query.', 'object-sync-for-salesforce'),
 					'constant' => '',
 					'default'  => $this->default_pull_limit,
 				),
@@ -641,7 +641,7 @@ 
 				'args'     => array(
 					'type'     => 'number',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'Number of seconds to wait between repeated salesforce pulls. Prevents the webserver from becoming overloaded in case of too many cron runs, or webhook usage.', 'object-sync-for-salesforce' ),
+					'desc'     => __('Number of seconds to wait between repeated salesforce pulls. Prevents the webserver from becoming overloaded in case of too many cron runs, or webhook usage.', 'object-sync-for-salesforce'),
 					'constant' => '',
 					'default'  => $this->default_pull_throttle,
 				),
@@ -654,7 +654,7 @@ 
 				'args'     => array(
 					'type'     => 'checkbox',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'Debug mode can, combined with the Log Settings, log things like Salesforce API requests. It can create a lot of entries if enabled; it is not recommended to use it in a production environment.', 'object-sync-for-salesforce' ),
+					'desc'     => __('Debug mode can, combined with the Log Settings, log things like Salesforce API requests. It can create a lot of entries if enabled; it is not recommended to use it in a production environment.', 'object-sync-for-salesforce'),
 					'constant' => '',
 				),
 			),
@@ -666,13 +666,13 @@ 
 				'args'     => array(
 					'type'     => 'checkbox',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'If checked, the plugin will delete the tables and other data it creates when you uninstall it. Unchecking this field can be useful if you need to reactivate the plugin for any reason without losing data.', 'object-sync-for-salesforce' ),
+					'desc'     => __('If checked, the plugin will delete the tables and other data it creates when you uninstall it. Unchecking this field can be useful if you need to reactivate the plugin for any reason without losing data.', 'object-sync-for-salesforce'),
 					'constant' => '',
 				),
 			),
 		);
 
-		if ( true === is_object( $this->salesforce['sfapi'] ) && true === $this->salesforce['sfapi']->is_authorized() ) {
+		if (true === is_object($this->salesforce['sfapi']) && true === $this->salesforce['sfapi']->is_authorized()) {
 			$salesforce_settings['api_version'] = array(
 				'title'    => 'Salesforce API Version',
 				'callback' => $callbacks['select'],
@@ -688,7 +688,7 @@ 
 			);
 		}
 
-		foreach ( $salesforce_settings as $key => $attributes ) {
+		foreach ($salesforce_settings as $key => $attributes) {
 			$id       = $this->option_prefix . $key;
 			$name     = $this->option_prefix . $key;
 			$title    = $attributes['title'];
@@ -707,12 +707,12 @@ 
 			);
 
 			// if there is a constant and it is defined, don't run a validate function
-			if ( isset( $attributes['args']['constant'] ) && defined( $attributes['args']['constant'] ) ) {
+			if (isset($attributes['args']['constant']) && defined($attributes['args']['constant'])) {
 				$validate = '';
 			}
 
-			add_settings_field( $id, $title, $callback, $page, $section, $args );
-			register_setting( $page, $id, array( $this, $validate ) );
+			add_settings_field($id, $title, $callback, $page, $section, $args);
+			register_setting($page, $id, array($this, $validate));
 		}
 	}
 
@@ -724,8 +724,8 @@ 
 	* @param string $section
 	* @param string $input_callback
 	*/
-	private function fields_fieldmaps( $page, $section, $input_callback = '' ) {
-		add_settings_section( $page, ucwords( $page ), null, $page );
+	private function fields_fieldmaps($page, $section, $input_callback = '') {
+		add_settings_section($page, ucwords($page), null, $page);
 	}
 
 	/**
@@ -736,12 +736,12 @@ 
 	* @param string $section
 	* @param string $input_callback
 	*/
-	private function fields_scheduling( $page, $section, $callbacks ) {
+	private function fields_scheduling($page, $section, $callbacks) {
 
-		add_settings_section( $page, ucwords( $page ), null, $page );
+		add_settings_section($page, ucwords($page), null, $page);
 		$schedule_settings = array(
 			'action_scheduler_batch_size'         => array(
-				'title'    => __( 'Batch size', 'object-sync-for-salesforce' ),
+				'title'    => __('Batch size', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -754,7 +754,7 @@ 
 
 			),
 			'action_scheduler_concurrent_batches' => array(
-				'title'    => __( 'Concurrent batches', 'object-sync-for-salesforce' ),
+				'title'    => __('Concurrent batches', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -767,11 +767,11 @@ 
 			),
 		);
 
-		foreach ( $this->schedulable_classes as $key => $value ) {
-			add_settings_section( $key, $value['label'], null, $page );
-			if ( isset( $value['initializer'] ) ) {
-				$schedule_settings[ $key . '_schedule_number' ] = array(
-					'title'    => __( 'Run schedule every', 'object-sync-for-salesforce' ),
+		foreach ($this->schedulable_classes as $key => $value) {
+			add_settings_section($key, $value['label'], null, $page);
+			if (isset($value['initializer'])) {
+				$schedule_settings[$key . '_schedule_number'] = array(
+					'title'    => __('Run schedule every', 'object-sync-for-salesforce'),
 					'callback' => $callbacks['text'],
 					'page'     => $page,
 					'section'  => $key,
@@ -782,8 +782,8 @@ 
 						'constant' => '',
 					),
 				);
-				$schedule_settings[ $key . '_schedule_unit' ]   = array(
-					'title'    => __( 'Time unit', 'object-sync-for-salesforce' ),
+				$schedule_settings[$key . '_schedule_unit'] = array(
+					'title'    => __('Time unit', 'object-sync-for-salesforce'),
 					'callback' => $callbacks['select'],
 					'page'     => $page,
 					'section'  => $key,
@@ -793,35 +793,35 @@ 
 						'desc'     => '',
 						'items'    => array(
 							'minutes' => array(
-								'text'  => __( 'Minutes', 'object-sync-for-salesforce' ),
+								'text'  => __('Minutes', 'object-sync-for-salesforce'),
 								'value' => 'minutes',
 							),
 							'hours'   => array(
-								'text'  => __( 'Hours', 'object-sync-for-salesforce' ),
+								'text'  => __('Hours', 'object-sync-for-salesforce'),
 								'value' => 'hours',
 							),
 							'days'    => array(
-								'text'  => __( 'Days', 'object-sync-for-salesforce' ),
+								'text'  => __('Days', 'object-sync-for-salesforce'),
 								'value' => 'days',
 							),
 						),
 					),
 				);
 			}
-			$schedule_settings[ $key . '_clear_button' ] = array(
+			$schedule_settings[$key . '_clear_button'] = array(
 				// translators: $this->get_schedule_count is an integer showing how many items are in the current queue
-				'title'    => sprintf( 'This queue has ' . _n( '%s item', '%s items', $this->get_schedule_count( $key ), 'object-sync-for-salesforce' ), $this->get_schedule_count( $key ) ),
+				'title'    => sprintf('This queue has ' . _n('%s item', '%s items', $this->get_schedule_count($key), 'object-sync-for-salesforce'), $this->get_schedule_count($key)),
 				'callback' => $callbacks['link'],
 				'page'     => $page,
 				'section'  => $key,
 				'args'     => array(
-					'label'      => __( 'Clear this queue', 'object-sync-for-salesforce' ),
+					'label'      => __('Clear this queue', 'object-sync-for-salesforce'),
 					'desc'       => '',
-					'url'        => esc_url( '?page=object-sync-salesforce-admin&amp;tab=clear_schedule&amp;schedule_name=' . $key ),
+					'url'        => esc_url('?page=object-sync-salesforce-admin&amp;tab=clear_schedule&amp;schedule_name=' . $key),
 					'link_class' => 'button button-secondary',
 				),
 			);
-			foreach ( $schedule_settings as $key => $attributes ) {
+			foreach ($schedule_settings as $key => $attributes) {
 				$id       = $this->option_prefix . $key;
 				$name     = $this->option_prefix . $key;
 				$title    = $attributes['title'];
@@ -837,8 +837,8 @@ 
 						'name'      => $name,
 					)
 				);
-				add_settings_field( $id, $title, $callback, $page, $section, $args );
-				register_setting( $page, $id );
+				add_settings_field($id, $title, $callback, $page, $section, $args);
+				register_setting($page, $id);
 			}
 		} // End foreach().
 	}
@@ -851,11 +851,11 @@ 
 	* @param string $section
 	* @param array $callbacks
 	*/
-	private function fields_log_settings( $page, $section, $callbacks ) {
-		add_settings_section( $page, ucwords( str_replace( '_', ' ', $page ) ), null, $page );
+	private function fields_log_settings($page, $section, $callbacks) {
+		add_settings_section($page, ucwords(str_replace('_', ' ', $page)), null, $page);
 		$log_settings = array(
 			'enable_logging'        => array(
-				'title'    => __( 'Enable Logging?', 'object-sync-for-salesforce' ),
+				'title'    => __('Enable Logging?', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -867,32 +867,32 @@ 
 				),
 			),
 			'statuses_to_log'       => array(
-				'title'    => __( 'Statuses to log', 'object-sync-for-salesforce' ),
+				'title'    => __('Statuses to log', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['checkboxes'],
 				'page'     => $page,
 				'section'  => $section,
 				'args'     => array(
 					'type'     => 'checkboxes',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'these are the statuses to log', 'object-sync-for-salesforce' ),
+					'desc'     => __('these are the statuses to log', 'object-sync-for-salesforce'),
 					'items'    => array(
 						'error'   => array(
-							'text' => __( 'Error', 'object-sync-for-salesforce' ),
+							'text' => __('Error', 'object-sync-for-salesforce'),
 							'id'   => 'error',
 							'desc' => '',
 						),
 						'success' => array(
-							'text' => __( 'Success', 'object-sync-for-salesforce' ),
+							'text' => __('Success', 'object-sync-for-salesforce'),
 							'id'   => 'success',
 							'desc' => '',
 						),
 						'notice'  => array(
-							'text' => __( 'Notice', 'object-sync-for-salesforce' ),
+							'text' => __('Notice', 'object-sync-for-salesforce'),
 							'id'   => 'notice',
 							'desc' => '',
 						),
 						'debug'   => array(
-							'text' => __( 'Debug', 'object-sync-for-salesforce' ),
+							'text' => __('Debug', 'object-sync-for-salesforce'),
 							'id'   => 'debug',
 							'desc' => '',
 						),
@@ -900,7 +900,7 @@ 
 				),
 			),
 			'prune_logs'            => array(
-				'title'    => __( 'Automatically delete old log entries?', 'object-sync-for-salesforce' ),
+				'title'    => __('Automatically delete old log entries?', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -912,20 +912,20 @@ 
 				),
 			),
 			'logs_how_old'          => array(
-				'title'    => __( 'Age to delete log entries', 'object-sync-for-salesforce' ),
+				'title'    => __('Age to delete log entries', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
 				'args'     => array(
 					'type'     => 'text',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'If automatic deleting is enabled, it will affect logs this old.', 'object-sync-for-salesforce' ),
+					'desc'     => __('If automatic deleting is enabled, it will affect logs this old.', 'object-sync-for-salesforce'),
 					'default'  => '2 weeks',
 					'constant' => '',
 				),
 			),
 			'logs_how_often_number' => array(
-				'title'    => __( 'Check for old logs every', 'object-sync-for-salesforce' ),
+				'title'    => __('Check for old logs every', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -938,67 +938,67 @@ 
 				),
 			),
 			'logs_how_often_unit'   => array(
-				'title'    => __( 'Time unit', 'object-sync-for-salesforce' ),
+				'title'    => __('Time unit', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['select'],
 				'page'     => $page,
 				'section'  => $section,
 				'args'     => array(
 					'type'     => 'select',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'These two fields are how often the site will check for logs to delete.', 'object-sync-for-salesforce' ),
+					'desc'     => __('These two fields are how often the site will check for logs to delete.', 'object-sync-for-salesforce'),
 					'items'    => array(
 						'minutes' => array(
-							'text'  => __( 'Minutes', 'object-sync-for-salesforce' ),
+							'text'  => __('Minutes', 'object-sync-for-salesforce'),
 							'value' => 'minutes',
 						),
 						'hours'   => array(
-							'text'  => __( 'Hours', 'object-sync-for-salesforce' ),
+							'text'  => __('Hours', 'object-sync-for-salesforce'),
 							'value' => 'hours',
 						),
 						'days'    => array(
-							'text'  => __( 'Days', 'object-sync-for-salesforce' ),
+							'text'  => __('Days', 'object-sync-for-salesforce'),
 							'value' => 'days',
 						),
 					),
 				),
 			),
 			'triggers_to_log'       => array(
-				'title'    => __( 'Triggers to log', 'object-sync-for-salesforce' ),
+				'title'    => __('Triggers to log', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['checkboxes'],
 				'page'     => $page,
 				'section'  => $section,
 				'args'     => array(
 					'type'     => 'checkboxes',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'these are the triggers to log', 'object-sync-for-salesforce' ),
+					'desc'     => __('these are the triggers to log', 'object-sync-for-salesforce'),
 					'items'    => array(
 						$this->mappings->sync_wordpress_create => array(
-							'text' => __( 'WordPress create', 'object-sync-for-salesforce' ),
+							'text' => __('WordPress create', 'object-sync-for-salesforce'),
 							'id'   => 'wordpress_create',
 							'desc' => '',
 						),
 						$this->mappings->sync_wordpress_update => array(
-							'text' => __( 'WordPress update', 'object-sync-for-salesforce' ),
+							'text' => __('WordPress update', 'object-sync-for-salesforce'),
 							'id'   => 'wordpress_update',
 							'desc' => '',
 						),
 						$this->mappings->sync_wordpress_delete => array(
-							'text' => __( 'WordPress delete', 'object-sync-for-salesforce' ),
+							'text' => __('WordPress delete', 'object-sync-for-salesforce'),
 							'id'   => 'wordpress_delete',
 							'desc' => '',
 						),
 						$this->mappings->sync_sf_create => array(
-							'text' => __( 'Salesforce create', 'object-sync-for-salesforce' ),
+							'text' => __('Salesforce create', 'object-sync-for-salesforce'),
 							'id'   => 'sf_create',
 							'desc' => '',
 						),
 						$this->mappings->sync_sf_update => array(
-							'text' => __( 'Salesforce update', 'object-sync-for-salesforce' ),
+							'text' => __('Salesforce update', 'object-sync-for-salesforce'),
 							'id'   => 'sf_update',
 							'desc' => '',
 						),
 						$this->mappings->sync_sf_delete => array(
-							'text' => __( 'Salesforce delete', 'object-sync-for-salesforce' ),
+							'text' => __('Salesforce delete', 'object-sync-for-salesforce'),
 							'id'   => 'sf_delete',
 							'desc' => '',
 						),
@@ -1006,7 +1006,7 @@ 
 				),
 			),
 		);
-		foreach ( $log_settings as $key => $attributes ) {
+		foreach ($log_settings as $key => $attributes) {
 			$id       = $this->option_prefix . $key;
 			$name     = $this->option_prefix . $key;
 			$title    = $attributes['title'];
@@ -1022,8 +1022,8 @@ 
 					'name'      => $name,
 				)
 			);
-			add_settings_field( $id, $title, $callback, $page, $section, $args );
-			register_setting( $page, $id );
+			add_settings_field($id, $title, $callback, $page, $section, $args);
+			register_setting($page, $id);
 		}
 	}
 
@@ -1034,69 +1034,69 @@ 
 	public function notices() {
 
 		// before a notice is displayed, we should make sure we are on a page related to this plugin
-		if ( ! isset( $_GET['page'] ) || 'object-sync-salesforce-admin' !== $_GET['page'] ) {
+		if ( ! isset($_GET['page']) || 'object-sync-salesforce-admin' !== $_GET['page']) {
 			return;
 		}
 
-		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
-		require_once plugin_dir_path( __FILE__ ) . '../classes/admin-notice.php';
+		$get_data = filter_input_array(INPUT_GET, FILTER_SANITIZE_STRING);
+		require_once plugin_dir_path(__FILE__) . '../classes/admin-notice.php';
 
 		$notices = array(
 			'permission'      => array(
 				'condition'   => false === $this->check_wordpress_admin_permissions(),
-				'message'     => __( "Your account does not have permission to edit the Salesforce REST API plugin's settings.", 'object-sync-for-salesforce' ),
+				'message'     => __("Your account does not have permission to edit the Salesforce REST API plugin's settings.", 'object-sync-for-salesforce'),
 				'type'        => 'error',
 				'dismissible' => false,
 			),
 			'fieldmap'        => array(
-				'condition'   => isset( $get_data['transient'] ),
-				'message'     => __( 'Errors kept this fieldmap from being saved.', 'object-sync-for-salesforce' ),
+				'condition'   => isset($get_data['transient']),
+				'message'     => __('Errors kept this fieldmap from being saved.', 'object-sync-for-salesforce'),
 				'type'        => 'error',
 				'dismissible' => true,
 			),
 			'object_map'      => array(
-				'condition'   => isset( $get_data['map_transient'] ),
-				'message'     => __( 'Errors kept this object map from being saved.', 'object-sync-for-salesforce' ),
+				'condition'   => isset($get_data['map_transient']),
+				'message'     => __('Errors kept this object map from being saved.', 'object-sync-for-salesforce'),
 				'type'        => 'error',
 				'dismissible' => true,
 			),
 			'data_saved'      => array(
-				'condition'   => isset( $get_data['data_saved'] ) && 'true' === $get_data['data_saved'],
-				'message'     => __( 'This data was successfully saved.', 'object-sync-for-salesforce' ),
+				'condition'   => isset($get_data['data_saved']) && 'true' === $get_data['data_saved'],
+				'message'     => __('This data was successfully saved.', 'object-sync-for-salesforce'),
 				'type'        => 'success',
 				'dismissible' => true,
 			),
 			'data_save_error' => array(
-				'condition'   => isset( $get_data['data_saved'] ) && 'false' === $get_data['data_saved'],
-				'message'     => __( 'This data was not successfully saved. Try again.', 'object-sync-for-salesforce' ),
+				'condition'   => isset($get_data['data_saved']) && 'false' === $get_data['data_saved'],
+				'message'     => __('This data was not successfully saved. Try again.', 'object-sync-for-salesforce'),
 				'type'        => 'error',
 				'dismissible' => true,
 			),
 		);
 
-		foreach ( $notices as $key => $value ) {
+		foreach ($notices as $key => $value) {
 
 			$condition = $value['condition'];
 			$message   = $value['message'];
 
-			if ( isset( $value['dismissible'] ) ) {
+			if (isset($value['dismissible'])) {
 				$dismissible = $value['dismissible'];
 			} else {
 				$dismissible = false;
 			}
 
-			if ( isset( $value['type'] ) ) {
+			if (isset($value['type'])) {
 				$type = $value['type'];
 			} else {
 				$type = '';
 			}
 
-			if ( ! isset( $value['template'] ) ) {
+			if ( ! isset($value['template'])) {
 				$template = '';
 			}
 
-			if ( $condition ) {
-				new Object_Sync_Sf_Admin_Notice( $condition, $message, $dismissible, $type, $template );
+			if ($condition) {
+				new Object_Sync_Sf_Admin_Notice($condition, $message, $dismissible, $type, $template);
 			}
 		}
 
@@ -1111,47 +1111,47 @@ 
 	* can optionally contain a type
 	* @return array $object_settings
 	*/
-	public function get_salesforce_object_description( $data = array() ) {
+	public function get_salesforce_object_description($data = array()) {
 		$ajax = false;
-		if ( empty( $data ) ) {
-			$data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
+		if (empty($data)) {
+			$data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
 			$ajax = true;
 		}
 
 		$object_description = array();
 
-		if ( ! empty( $data['salesforce_object'] ) ) {
-			$object = $this->salesforce['sfapi']->object_describe( esc_attr( $data['salesforce_object'] ) );
+		if ( ! empty($data['salesforce_object'])) {
+			$object = $this->salesforce['sfapi']->object_describe(esc_attr($data['salesforce_object']));
 
 			$object_fields        = array();
 			$include_record_types = array();
 
 			// these can come from ajax
-			$include = isset( $data['include'] ) ? (array) $data['include'] : array();
-			$include = array_map( 'esc_attr', $include );
-
-			if ( in_array( 'fields', $include, true ) || empty( $include ) ) {
-				$type = isset( $data['field_type'] ) ? esc_attr( $data['field_type'] ) : ''; // can come from ajax
-				foreach ( $object['data']['fields'] as $key => $value ) {
-					if ( '' === $type || $type === $value['type'] ) {
-						$object_fields[ $key ] = $value;
+			$include = isset($data['include']) ? (array) $data['include'] : array();
+			$include = array_map('esc_attr', $include);
+
+			if (in_array('fields', $include, true) || empty($include)) {
+				$type = isset($data['field_type']) ? esc_attr($data['field_type']) : ''; // can come from ajax
+				foreach ($object['data']['fields'] as $key => $value) {
+					if ('' === $type || $type === $value['type']) {
+						$object_fields[$key] = $value;
 					}
 				}
 				$object_description['fields'] = $object_fields;
 			}
 
-			if ( in_array( 'recordTypeInfos', $include, true ) ) {
-				if ( isset( $object['data']['recordTypeInfos'] ) && count( $object['data']['recordTypeInfos'] ) > 1 ) {
-					foreach ( $object['data']['recordTypeInfos'] as $type ) {
-						$object_record_types[ $type['recordTypeId'] ] = $type['name'];
+			if (in_array('recordTypeInfos', $include, true)) {
+				if (isset($object['data']['recordTypeInfos']) && count($object['data']['recordTypeInfos']) > 1) {
+					foreach ($object['data']['recordTypeInfos'] as $type) {
+						$object_record_types[$type['recordTypeId']] = $type['name'];
 					}
 					$object_description['recordTypeInfos'] = $object_record_types;
 				}
 			}
 		}
 
-		if ( true === $ajax ) {
-			wp_send_json_success( $object_description );
+		if (true === $ajax) {
+			wp_send_json_success($object_description);
 		} else {
 			return $object_description;
 		}
@@ -1165,23 +1165,23 @@ 
 	* can optionally contain a type for the field
 	* @return array $object_fields
 	*/
-	public function get_salesforce_object_fields( $data = array() ) {
+	public function get_salesforce_object_fields($data = array()) {
 
-		if ( ! empty( $data['salesforce_object'] ) ) {
-			$object               = $this->salesforce['sfapi']->object_describe( esc_attr( $data['salesforce_object'] ) );
+		if ( ! empty($data['salesforce_object'])) {
+			$object               = $this->salesforce['sfapi']->object_describe(esc_attr($data['salesforce_object']));
 			$object_fields        = array();
-			$type                 = isset( $data['type'] ) ? esc_attr( $data['type'] ) : '';
-			$include_record_types = isset( $data['include_record_types'] ) ? esc_attr( $data['include_record_types'] ) : false;
-			foreach ( $object['data']['fields'] as $key => $value ) {
-				if ( '' === $type || $type === $value['type'] ) {
-					$object_fields[ $key ] = $value;
+			$type                 = isset($data['type']) ? esc_attr($data['type']) : '';
+			$include_record_types = isset($data['include_record_types']) ? esc_attr($data['include_record_types']) : false;
+			foreach ($object['data']['fields'] as $key => $value) {
+				if ('' === $type || $type === $value['type']) {
+					$object_fields[$key] = $value;
 				}
 			}
-			if ( true === $include_record_types ) {
+			if (true === $include_record_types) {
 				$object_record_types = array();
-				if ( isset( $object['data']['recordTypeInfos'] ) && count( $object['data']['recordTypeInfos'] ) > 1 ) {
-					foreach ( $object['data']['recordTypeInfos'] as $type ) {
-						$object_record_types[ $type['recordTypeId'] ] = $type['name'];
+				if (isset($object['data']['recordTypeInfos']) && count($object['data']['recordTypeInfos']) > 1) {
+					foreach ($object['data']['recordTypeInfos'] as $type) {
+						$object_record_types[$type['recordTypeId']] = $type['name'];
 					}
 				}
 			}
@@ -1198,18 +1198,18 @@ 
 	* @param string $wordpress_object
 	* @return array $object_fields
 	*/
-	public function get_wordpress_object_fields( $wordpress_object = '' ) {
+	public function get_wordpress_object_fields($wordpress_object = '') {
 		$ajax      = false;
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( empty( $wordpress_object ) ) {
-			$wordpress_object = isset( $post_data['wordpress_object'] ) ? sanitize_text_field( wp_unslash( $post_data['wordpress_object'] ) ) : '';
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if (empty($wordpress_object)) {
+			$wordpress_object = isset($post_data['wordpress_object']) ? sanitize_text_field(wp_unslash($post_data['wordpress_object'])) : '';
 			$ajax             = true;
 		}
 
-		$object_fields = $this->wordpress->get_wordpress_object_fields( $wordpress_object );
+		$object_fields = $this->wordpress->get_wordpress_object_fields($wordpress_object);
 
-		if ( true === $ajax ) {
-			wp_send_json_success( $object_fields );
+		if (true === $ajax) {
+			wp_send_json_success($object_fields);
 		} else {
 			return $object_fields;
 		}
@@ -1223,24 +1223,24 @@ 
 	* @param string $salesforce_object
 	* @return array $object_fields
 	*/
-	public function get_wp_sf_object_fields( $wordpress_object = '', $salesforce = '' ) {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( empty( $wordpress_object ) ) {
-			$wordpress_object = isset( $post_data['wordpress_object'] ) ? sanitize_text_field( wp_unslash( $post_data['wordpress_object'] ) ) : '';
+	public function get_wp_sf_object_fields($wordpress_object = '', $salesforce = '') {
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if (empty($wordpress_object)) {
+			$wordpress_object = isset($post_data['wordpress_object']) ? sanitize_text_field(wp_unslash($post_data['wordpress_object'])) : '';
 		}
-		if ( empty( $salesforce_object ) ) {
-			$salesforce_object = isset( $post_data['salesforce_object'] ) ? sanitize_text_field( wp_unslash( $post_data['salesforce_object'] ) ) : '';
+		if (empty($salesforce_object)) {
+			$salesforce_object = isset($post_data['salesforce_object']) ? sanitize_text_field(wp_unslash($post_data['salesforce_object'])) : '';
 		}
 
-		$object_fields['wordpress']  = $this->get_wordpress_object_fields( $wordpress_object );
+		$object_fields['wordpress']  = $this->get_wordpress_object_fields($wordpress_object);
 		$object_fields['salesforce'] = $this->get_salesforce_object_fields(
 			array(
 				'salesforce_object' => $salesforce_object,
 			)
 		);
 
-		if ( ! empty( $post_data ) ) {
-			wp_send_json_success( $object_fields );
+		if ( ! empty($post_data)) {
+			wp_send_json_success($object_fields);
 		} else {
 			return $object_fields;
 		}
@@ -1253,17 +1253,17 @@ 
 	* @param string $wordpress_object
 	* @param int $wordpress_id
 	*/
-	public function push_to_salesforce( $wordpress_object = '', $wordpress_id = '' ) {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( empty( $wordpress_object ) && empty( $wordpress_id ) ) {
-			$wordpress_object = isset( $post_data['wordpress_object'] ) ? sanitize_text_field( wp_unslash( $post_data['wordpress_object'] ) ) : '';
-			$wordpress_id     = isset( $post_data['wordpress_id'] ) ? absint( $post_data['wordpress_id'] ) : '';
+	public function push_to_salesforce($wordpress_object = '', $wordpress_id = '') {
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if (empty($wordpress_object) && empty($wordpress_id)) {
+			$wordpress_object = isset($post_data['wordpress_object']) ? sanitize_text_field(wp_unslash($post_data['wordpress_object'])) : '';
+			$wordpress_id     = isset($post_data['wordpress_id']) ? absint($post_data['wordpress_id']) : '';
 		}
-		$data   = $this->wordpress->get_wordpress_object_data( $wordpress_object, $wordpress_id );
-		$result = $this->push->manual_object_update( $data, $wordpress_object );
+		$data   = $this->wordpress->get_wordpress_object_data($wordpress_object, $wordpress_id);
+		$result = $this->push->manual_object_update($data, $wordpress_object);
 
-		if ( ! empty( $post_data['wordpress_object'] ) && ! empty( $post_data['wordpress_id'] ) ) {
-			wp_send_json_success( $result );
+		if ( ! empty($post_data['wordpress_object']) && ! empty($post_data['wordpress_id'])) {
+			wp_send_json_success($result);
 		} else {
 			return $result;
 		}
@@ -1277,16 +1277,16 @@ 
 	* @param string $salesforce_id
 	* @param string $wordpress_object
 	*/
-	public function pull_from_salesforce( $salesforce_id = '', $wordpress_object = '' ) {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( empty( $wordpress_object ) && empty( $salesforce_id ) ) {
-			$wordpress_object = isset( $post_data['wordpress_object'] ) ? sanitize_text_field( wp_unslash( $post_data['wordpress_object'] ) ) : '';
-			$salesforce_id    = isset( $post_data['salesforce_id'] ) ? sanitize_text_field( wp_unslash( $post_data['salesforce_id'] ) ) : '';
-		}
-		$type   = $this->salesforce['sfapi']->get_sobject_type( $salesforce_id );
-		$result = $this->pull->manual_pull( $type, $salesforce_id, $wordpress_object ); // we want the wp object to make sure we get the right fieldmap
-		if ( ! empty( $post_data ) ) {
-			wp_send_json_success( $result );
+	public function pull_from_salesforce($salesforce_id = '', $wordpress_object = '') {
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if (empty($wordpress_object) && empty($salesforce_id)) {
+			$wordpress_object = isset($post_data['wordpress_object']) ? sanitize_text_field(wp_unslash($post_data['wordpress_object'])) : '';
+			$salesforce_id    = isset($post_data['salesforce_id']) ? sanitize_text_field(wp_unslash($post_data['salesforce_id'])) : '';
+		}
+		$type   = $this->salesforce['sfapi']->get_sobject_type($salesforce_id);
+		$result = $this->pull->manual_pull($type, $salesforce_id, $wordpress_object); // we want the wp object to make sure we get the right fieldmap
+		if ( ! empty($post_data)) {
+			wp_send_json_success($result);
 		} else {
 			return $result;
 		}
@@ -1298,18 +1298,18 @@ 
 	*
 	* @param int $mapping_id
 	*/
-	public function refresh_mapped_data( $mapping_id = '' ) {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( empty( $mapping_id ) ) {
-			$mapping_id = isset( $post_data['mapping_id'] ) ? absint( $post_data['mapping_id'] ) : '';
+	public function refresh_mapped_data($mapping_id = '') {
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if (empty($mapping_id)) {
+			$mapping_id = isset($post_data['mapping_id']) ? absint($post_data['mapping_id']) : '';
 		}
 		$result = $this->mappings->get_object_maps(
 			array(
 				'id' => $mapping_id,
 			)
 		);
-		if ( ! empty( $post_data ) ) {
-			wp_send_json_success( $result );
+		if ( ! empty($post_data)) {
+			wp_send_json_success($result);
 		} else {
 			return $result;
 		}
@@ -1325,47 +1325,47 @@ 
 	*/
 	public function prepare_fieldmap_data() {
 		$error     = false;
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		$cachekey  = md5( wp_json_encode( $post_data ) );
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		$cachekey  = md5(wp_json_encode($post_data));
 
-		if ( ! isset( $post_data['label'] ) || ! isset( $post_data['salesforce_object'] ) || ! isset( $post_data['wordpress_object'] ) ) {
+		if ( ! isset($post_data['label']) || ! isset($post_data['salesforce_object']) || ! isset($post_data['wordpress_object'])) {
 			$error = true;
 		}
-		if ( true === $error ) {
-			$this->sfwp_transients->set( $cachekey, $post_data, $this->wordpress->options['cache_expiration'] );
-			if ( '' !== $cachekey ) {
-				$url = esc_url_raw( $post_data['redirect_url_error'] ) . '&transient=' . $cachekey;
+		if (true === $error) {
+			$this->sfwp_transients->set($cachekey, $post_data, $this->wordpress->options['cache_expiration']);
+			if ('' !== $cachekey) {
+				$url = esc_url_raw($post_data['redirect_url_error']) . '&transient=' . $cachekey;
 			}
 		} else { // there are no errors
 			// send the row to the fieldmap class
 			// if it is add or clone, use the create method
-			$method            = esc_attr( $post_data['method'] );
+			$method            = esc_attr($post_data['method']);
 			$salesforce_fields = $this->get_salesforce_object_fields(
 				array(
 					'salesforce_object' => $post_data['salesforce_object'],
 				)
 			);
-			$wordpress_fields  = $this->get_wordpress_object_fields( $post_data['wordpress_object'] );
-			if ( 'add' === $method || 'clone' === $method ) {
-				$result = $this->mappings->create_fieldmap( $post_data, $wordpress_fields, $salesforce_fields );
-			} elseif ( 'edit' === $method ) { // if it is edit, use the update method
-				$id     = esc_attr( $post_data['id'] );
-				$result = $this->mappings->update_fieldmap( $post_data, $wordpress_fields, $salesforce_fields, $id );
+			$wordpress_fields = $this->get_wordpress_object_fields($post_data['wordpress_object']);
+			if ('add' === $method || 'clone' === $method) {
+				$result = $this->mappings->create_fieldmap($post_data, $wordpress_fields, $salesforce_fields);
+			} elseif ('edit' === $method) { // if it is edit, use the update method
+				$id     = esc_attr($post_data['id']);
+				$result = $this->mappings->update_fieldmap($post_data, $wordpress_fields, $salesforce_fields, $id);
 			}
-			if ( false === $result ) { // if the database didn't save, it's still an error
-				$this->sfwp_transients->set( $cachekey, $post_data, $this->wordpress->options['cache_expiration'] );
-				if ( '' !== $cachekey ) {
-					$url = esc_url_raw( $post_data['redirect_url_error'] ) . '&transient=' . $cachekey;
+			if (false === $result) { // if the database didn't save, it's still an error
+				$this->sfwp_transients->set($cachekey, $post_data, $this->wordpress->options['cache_expiration']);
+				if ('' !== $cachekey) {
+					$url = esc_url_raw($post_data['redirect_url_error']) . '&transient=' . $cachekey;
 				}
 			} else {
-				if ( isset( $post_data['transient'] ) ) { // there was previously an error saved. can delete it now.
-					$this->sfwp_transients->delete( esc_attr( $post_data['map_transient'] ) );
+				if (isset($post_data['transient'])) { // there was previously an error saved. can delete it now.
+					$this->sfwp_transients->delete(esc_attr($post_data['map_transient']));
 				}
 				// then send the user to the list of fieldmaps
-				$url = esc_url_raw( $post_data['redirect_url_success'] );
+				$url = esc_url_raw($post_data['redirect_url_success']);
 			}
 		}
-		wp_safe_redirect( $url );
+		wp_safe_redirect($url);
 		exit();
 	}
 
@@ -1377,15 +1377,15 @@ 
 	*
 	*/
 	public function delete_fieldmap() {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( $post_data['id'] ) {
-			$result = $this->mappings->delete_fieldmap( $post_data['id'] );
-			if ( true === $result ) {
-				$url = esc_url_raw( $post_data['redirect_url_success'] );
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if ($post_data['id']) {
+			$result = $this->mappings->delete_fieldmap($post_data['id']);
+			if (true === $result) {
+				$url = esc_url_raw($post_data['redirect_url_success']);
 			} else {
-				$url = esc_url_raw( $post_data['redirect_url_error'] . '&id=' . $post_data['id'] );
+				$url = esc_url_raw($post_data['redirect_url_error'] . '&id=' . $post_data['id']);
 			}
-			wp_safe_redirect( $url );
+			wp_safe_redirect($url);
 			exit();
 		}
 	}
@@ -1400,38 +1400,38 @@ 
 	*/
 	public function prepare_object_map_data() {
 		$error     = false;
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		$cachekey  = md5( wp_json_encode( $post_data ) );
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		$cachekey  = md5(wp_json_encode($post_data));
 
-		if ( ! isset( $post_data['wordpress_id'] ) || ! isset( $post_data['salesforce_id'] ) ) {
+		if ( ! isset($post_data['wordpress_id']) || ! isset($post_data['salesforce_id'])) {
 			$error = true;
 		}
-		if ( true === $error ) {
-			$this->sfwp_transients->set( $cachekey, $post_data, $this->wordpress->options['cache_expiration'] );
-			if ( '' !== $cachekey ) {
-				$url = esc_url_raw( $post_data['redirect_url_error'] ) . '&map_transient=' . $cachekey;
+		if (true === $error) {
+			$this->sfwp_transients->set($cachekey, $post_data, $this->wordpress->options['cache_expiration']);
+			if ('' !== $cachekey) {
+				$url = esc_url_raw($post_data['redirect_url_error']) . '&map_transient=' . $cachekey;
 			}
 		} else { // there are no errors
 			// send the row to the object map class
-			$method = esc_attr( $post_data['method'] );
-			if ( 'edit' === $method ) { // if it is edit, use the update method
-				$id     = esc_attr( $post_data['id'] );
-				$result = $this->mappings->update_object_map( $post_data, $id );
+			$method = esc_attr($post_data['method']);
+			if ('edit' === $method) { // if it is edit, use the update method
+				$id     = esc_attr($post_data['id']);
+				$result = $this->mappings->update_object_map($post_data, $id);
 			}
-			if ( false === $result ) { // if the database didn't save, it's still an error
-				$this->sfwp_transients->set( $cachekey, $post_data, $this->wordpress->options['cache_expiration'] );
-				if ( '' !== $cachekey ) {
-					$url = esc_url_raw( $post_data['redirect_url_error'] ) . '&map_transient=' . $cachekey;
+			if (false === $result) { // if the database didn't save, it's still an error
+				$this->sfwp_transients->set($cachekey, $post_data, $this->wordpress->options['cache_expiration']);
+				if ('' !== $cachekey) {
+					$url = esc_url_raw($post_data['redirect_url_error']) . '&map_transient=' . $cachekey;
 				}
 			} else {
-				if ( isset( $post_data['map_transient'] ) ) { // there was previously an error saved. can delete it now.
-					$this->sfwp_transients->delete( esc_attr( $post_data['map_transient'] ) );
+				if (isset($post_data['map_transient'])) { // there was previously an error saved. can delete it now.
+					$this->sfwp_transients->delete(esc_attr($post_data['map_transient']));
 				}
 				// then send the user to the success redirect url
-				$url = esc_url_raw( $post_data['redirect_url_success'] );
+				$url = esc_url_raw($post_data['redirect_url_success']);
 			}
 		}
-		wp_safe_redirect( $url );
+		wp_safe_redirect($url);
 		exit();
 	}
 
@@ -1443,15 +1443,15 @@ 
 	*
 	*/
 	public function delete_object_map() {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( $post_data['id'] ) {
-			$result = $this->mappings->delete_object_map( $post_data['id'] );
-			if ( true === $result ) {
-				$url = esc_url_raw( $post_data['redirect_url_success'] );
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if ($post_data['id']) {
+			$result = $this->mappings->delete_object_map($post_data['id']);
+			if (true === $result) {
+				$url = esc_url_raw($post_data['redirect_url_success']);
 			} else {
-				$url = esc_url_raw( $post_data['redirect_url_error'] . '&id=' . $post_data['id'] );
+				$url = esc_url_raw($post_data['redirect_url_error'] . '&id=' . $post_data['id']);
 			}
-			wp_safe_redirect( $url );
+			wp_safe_redirect($url);
 			exit();
 		}
 	}
@@ -1462,95 +1462,95 @@ 
 	*/
 	public function import_json_file() {
 
-		if ( ! wp_verify_nonce( $_POST['object_sync_for_salesforce_nonce_import'], 'object_sync_for_salesforce_nonce_import' ) ) {
+		if ( ! wp_verify_nonce($_POST['object_sync_for_salesforce_nonce_import'], 'object_sync_for_salesforce_nonce_import')) {
 			return;
 		}
-		if ( ! current_user_can( 'manage_options' ) ) {
+		if ( ! current_user_can('manage_options')) {
 			return;
 		}
 		$path      = $_FILES['import_file']['name'];
-		$extension = pathinfo( $path, PATHINFO_EXTENSION );
-		if ( 'json' !== $extension ) {
-			wp_die( __( 'Please upload a valid .json file' ) );
+		$extension = pathinfo($path, PATHINFO_EXTENSION);
+		if ('json' !== $extension) {
+			wp_die(__('Please upload a valid .json file'));
 		}
 
 		$import_file = $_FILES['import_file']['tmp_name'];
-		if ( empty( $import_file ) ) {
-			wp_die( __( 'Please upload a file to import' ) );
+		if (empty($import_file)) {
+			wp_die(__('Please upload a file to import'));
 		}
 
 		// Retrieve the data from the file and convert the json object to an array.
-		$data = (array) json_decode( file_get_contents( $import_file ), true );
+		$data = (array) json_decode(file_get_contents($import_file), true);
 
 		// if there is only one object map, fix the array
-		if ( isset( $data['object_maps'] ) ) {
-			if ( count( $data['object_maps'] ) === count( $data['object_maps'], COUNT_RECURSIVE ) ) {
-				$data['object_maps'] = array( 0 => $data['object_maps'] );
+		if (isset($data['object_maps'])) {
+			if (count($data['object_maps']) === count($data['object_maps'], COUNT_RECURSIVE)) {
+				$data['object_maps'] = array(0 => $data['object_maps']);
 			}
 		}
 
-		$overwrite = isset( $_POST['overwrite'] ) ? esc_attr( $_POST['overwrite'] ) : '';
-		if ( '1' === $overwrite ) {
-			if ( isset( $data['fieldmaps'] ) ) {
+		$overwrite = isset($_POST['overwrite']) ? esc_attr($_POST['overwrite']) : '';
+		if ('1' === $overwrite) {
+			if (isset($data['fieldmaps'])) {
 				$fieldmaps = $this->mappings->get_fieldmaps();
-				foreach ( $fieldmaps as $fieldmap ) {
+				foreach ($fieldmaps as $fieldmap) {
 					$id     = $fieldmap['id'];
-					$delete = $this->mappings->delete_fieldmap( $id );
+					$delete = $this->mappings->delete_fieldmap($id);
 				}
 			}
-			if ( isset( $data['object_maps'] ) ) {
+			if (isset($data['object_maps'])) {
 				$object_maps = $this->mappings->get_object_maps();
 
 				// if there is only one existing object map, fix the array
-				if ( count( $object_maps ) === count( $object_maps, COUNT_RECURSIVE ) ) {
-					$object_maps = array( 0 => $object_maps );
+				if (count($object_maps) === count($object_maps, COUNT_RECURSIVE)) {
+					$object_maps = array(0 => $object_maps);
 				}
 
-				foreach ( $object_maps as $object_map ) {
+				foreach ($object_maps as $object_map) {
 					$id     = $object_map['id'];
-					$delete = $this->mappings->delete_object_map( $id );
+					$delete = $this->mappings->delete_object_map($id);
 				}
 			}
-			if ( isset( $data['plugin_settings'] ) ) {
-				foreach ( $data['plugin_settings'] as $key => $value ) {
-					delete_option( $value['option_name'] );
+			if (isset($data['plugin_settings'])) {
+				foreach ($data['plugin_settings'] as $key => $value) {
+					delete_option($value['option_name']);
 				}
 			}
 		}
 
 		$success = true;
 
-		if ( isset( $data['fieldmaps'] ) ) {
-			foreach ( $data['fieldmaps'] as $fieldmap ) {
-				unset( $fieldmap['id'] );
-				$create = $this->mappings->create_fieldmap( $fieldmap );
-				if ( false === $create ) {
+		if (isset($data['fieldmaps'])) {
+			foreach ($data['fieldmaps'] as $fieldmap) {
+				unset($fieldmap['id']);
+				$create = $this->mappings->create_fieldmap($fieldmap);
+				if (false === $create) {
 					$success = false;
 				}
 			}
 		}
 
-		if ( isset( $data['object_maps'] ) ) {
-			foreach ( $data['object_maps'] as $object_map ) {
-				unset( $object_map['id'] );
-				$create = $this->mappings->create_object_map( $object_map );
-				if ( false === $create ) {
+		if (isset($data['object_maps'])) {
+			foreach ($data['object_maps'] as $object_map) {
+				unset($object_map['id']);
+				$create = $this->mappings->create_object_map($object_map);
+				if (false === $create) {
 					$success = false;
 				}
 			}
 		}
 
-		if ( isset( $data['plugin_settings'] ) ) {
-			foreach ( $data['plugin_settings'] as $key => $value ) {
-				update_option( $value['option_name'], maybe_unserialize( $value['option_value'] ), $value['autoload'] );
+		if (isset($data['plugin_settings'])) {
+			foreach ($data['plugin_settings'] as $key => $value) {
+				update_option($value['option_name'], maybe_unserialize($value['option_value']), $value['autoload']);
 			}
 		}
 
-		if ( true === $success ) {
-			wp_safe_redirect( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=import-export&data_saved=true' ) );
+		if (true === $success) {
+			wp_safe_redirect(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=import-export&data_saved=true'));
 			exit;
 		} else {
-			wp_safe_redirect( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=import-export&data_saved=false' ) );
+			wp_safe_redirect(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=import-export&data_saved=false'));
 			exit;
 		}
 
@@ -1562,28 +1562,28 @@ 
 	*/
 	public function export_json_file() {
 
-		if ( ! wp_verify_nonce( $_POST['object_sync_for_salesforce_nonce_export'], 'object_sync_for_salesforce_nonce_export' ) ) {
+		if ( ! wp_verify_nonce($_POST['object_sync_for_salesforce_nonce_export'], 'object_sync_for_salesforce_nonce_export')) {
 			return;
 		}
-		if ( ! current_user_can( 'manage_options' ) ) {
+		if ( ! current_user_can('manage_options')) {
 			return;
 		}
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
 		$export    = array();
-		if ( in_array( 'fieldmaps', $post_data['export'] ) ) {
+		if (in_array('fieldmaps', $post_data['export'])) {
 			$export['fieldmaps'] = $this->mappings->get_fieldmaps();
 		}
-		if ( in_array( 'object_maps', $post_data['export'] ) ) {
+		if (in_array('object_maps', $post_data['export'])) {
 			$export['object_maps'] = $this->mappings->get_object_maps();
 		}
-		if ( in_array( 'plugin_settings', $post_data['export'] ) ) {
-			$export['plugin_settings'] = $this->wpdb->get_results( 'SELECT * FROM ' . $this->wpdb->prefix . 'options' . ' WHERE option_name like "' . $this->option_prefix . '%"', ARRAY_A );
+		if (in_array('plugin_settings', $post_data['export'])) {
+			$export['plugin_settings'] = $this->wpdb->get_results('SELECT * FROM ' . $this->wpdb->prefix . 'options' . ' WHERE option_name like "' . $this->option_prefix . '%"', ARRAY_A);
 		}
 		nocache_headers();
-		header( 'Content-Type: application/json; charset=utf-8' );
-		header( 'Content-Disposition: attachment; filename=object-sync-for-salesforce-data-export-' . date( 'm-d-Y' ) . '.json' );
-		header( 'Expires: 0' );
-		echo wp_json_encode( $export );
+		header('Content-Type: application/json; charset=utf-8');
+		header('Content-Disposition: attachment; filename=object-sync-for-salesforce-data-export-' . date('m-d-Y') . '.json');
+		header('Expires: 0');
+		echo wp_json_encode($export);
 		exit;
 	}
 
@@ -1592,7 +1592,7 @@ 
 	*
 	* @param array $args
 	*/
-	public function display_input_field( $args ) {
+	public function display_input_field($args) {
 		$type    = $args['type'];
 		$id      = $args['label_for'];
 		$name    = $args['name'];
@@ -1601,38 +1601,38 @@ 
 
 		$class = 'regular-text';
 
-		if ( 'checkbox' === $type ) {
+		if ('checkbox' === $type) {
 			$class = 'checkbox';
 		}
 
-		if ( ! isset( $args['constant'] ) || ! defined( $args['constant'] ) ) {
-			$value = esc_attr( get_option( $id, '' ) );
-			if ( 'checkbox' === $type ) {
-				if ( '1' === $value ) {
+		if ( ! isset($args['constant']) || ! defined($args['constant'])) {
+			$value = esc_attr(get_option($id, ''));
+			if ('checkbox' === $type) {
+				if ('1' === $value) {
 					$checked = 'checked ';
 				}
 				$value = 1;
 			}
-			if ( '' === $value && isset( $args['default'] ) && '' !== $args['default'] ) {
+			if ('' === $value && isset($args['default']) && '' !== $args['default']) {
 				$value = $args['default'];
 			}
 
-			echo sprintf( '<input type="%1$s" value="%2$s" name="%3$s" id="%4$s" class="%5$s"%6$s>',
-				esc_attr( $type ),
-				esc_attr( $value ),
-				esc_attr( $name ),
-				esc_attr( $id ),
-				sanitize_html_class( $class . esc_html( ' code' ) ),
-				esc_html( $checked )
+			echo sprintf('<input type="%1$s" value="%2$s" name="%3$s" id="%4$s" class="%5$s"%6$s>',
+				esc_attr($type),
+				esc_attr($value),
+				esc_attr($name),
+				esc_attr($id),
+				sanitize_html_class($class . esc_html(' code')),
+				esc_html($checked)
 			);
-			if ( '' !== $desc ) {
-				echo sprintf( '<p class="description">%1$s</p>',
-					esc_html( $desc )
+			if ('' !== $desc) {
+				echo sprintf('<p class="description">%1$s</p>',
+					esc_html($desc)
 				);
 			}
 		} else {
-			echo sprintf( '<p><code>%1$s</code></p>',
-				esc_html__( 'Defined in wp-config.php', 'object-sync-for-salesforce' )
+			echo sprintf('<p><code>%1$s</code></p>',
+				esc_html__('Defined in wp-config.php', 'object-sync-for-salesforce')
 			);
 		}
 	}
@@ -1643,33 +1643,33 @@ 
 	*
 	* @param array $args
 	*/
-	public function display_checkboxes( $args ) {
+	public function display_checkboxes($args) {
 		$type    = 'checkbox';
 		$name    = $args['name'];
-		$options = get_option( $name, array() );
-		foreach ( $args['items'] as $key => $value ) {
+		$options = get_option($name, array());
+		foreach ($args['items'] as $key => $value) {
 			$text    = $value['text'];
 			$id      = $value['id'];
 			$desc    = $value['desc'];
 			$checked = '';
-			if ( is_array( $options ) && in_array( (string) $key, $options, true ) ) {
+			if (is_array($options) && in_array((string) $key, $options, true)) {
 				$checked = 'checked';
-			} elseif ( is_array( $options ) && empty( $options ) ) {
-				if ( isset( $value['default'] ) && true === $value['default'] ) {
+			} elseif (is_array($options) && empty($options)) {
+				if (isset($value['default']) && true === $value['default']) {
 					$checked = 'checked';
 				}
 			}
-			echo sprintf( '<div class="checkbox"><label><input type="%1$s" value="%2$s" name="%3$s[]" id="%4$s"%5$s>%6$s</label></div>',
-				esc_attr( $type ),
-				esc_attr( $key ),
-				esc_attr( $name ),
-				esc_attr( $id ),
-				esc_html( $checked ),
-				esc_html( $text )
+			echo sprintf('<div class="checkbox"><label><input type="%1$s" value="%2$s" name="%3$s[]" id="%4$s"%5$s>%6$s</label></div>',
+				esc_attr($type),
+				esc_attr($key),
+				esc_attr($name),
+				esc_attr($id),
+				esc_html($checked),
+				esc_html($text)
 			);
-			if ( '' !== $desc ) {
-				echo sprintf( '<p class="description">%1$s</p>',
-					esc_html( $desc )
+			if ('' !== $desc) {
+				echo sprintf('<p class="description">%1$s</p>',
+					esc_html($desc)
 				);
 			}
 		}
@@ -1680,44 +1680,44 @@ 
 	*
 	* @param array $args
 	*/
-	public function display_select( $args ) {
+	public function display_select($args) {
 		$type = $args['type'];
 		$id   = $args['label_for'];
 		$name = $args['name'];
 		$desc = $args['desc'];
-		if ( ! isset( $args['constant'] ) || ! defined( $args['constant'] ) ) {
-			$current_value = get_option( $name );
+		if ( ! isset($args['constant']) || ! defined($args['constant'])) {
+			$current_value = get_option($name);
 
-			echo sprintf( '<div class="select"><select id="%1$s" name="%2$s"><option value="">- ' . __( 'Select one', 'object-sync-for-salesforce' ) . ' -</option>',
-				esc_attr( $id ),
-				esc_attr( $name )
+			echo sprintf('<div class="select"><select id="%1$s" name="%2$s"><option value="">- ' . __('Select one', 'object-sync-for-salesforce') . ' -</option>',
+				esc_attr($id),
+				esc_attr($name)
 			);
 
-			foreach ( $args['items'] as $key => $value ) {
+			foreach ($args['items'] as $key => $value) {
 				$text     = $value['text'];
 				$value    = $value['value'];
 				$selected = '';
-				if ( $key === $current_value || $value === $current_value ) {
+				if ($key === $current_value || $value === $current_value) {
 					$selected = ' selected';
 				}
 
-				echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-					esc_attr( $value ),
-					esc_attr( $selected ),
-					esc_html( $text )
+				echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+					esc_attr($value),
+					esc_attr($selected),
+					esc_html($text)
 				);
 
 			}
 			echo '</select>';
-			if ( '' !== $desc ) {
-				echo sprintf( '<p class="description">%1$s</p>',
-					esc_html( $desc )
+			if ('' !== $desc) {
+				echo sprintf('<p class="description">%1$s</p>',
+					esc_html($desc)
 				);
 			}
 			echo '</div>';
 		} else {
-			echo sprintf( '<p><code>%1$s</code></p>',
-				esc_html__( 'Defined in wp-config.php', 'object-sync-for-salesforce' )
+			echo sprintf('<p><code>%1$s</code></p>',
+				esc_html__('Defined in wp-config.php', 'object-sync-for-salesforce')
 			);
 		}
 	}
@@ -1730,7 +1730,7 @@ 
 	private function version_options() {
 		$versions = $this->salesforce['sfapi']->get_api_versions();
 		$args     = array();
-		foreach ( $versions['data'] as $key => $value ) {
+		foreach ($versions['data'] as $key => $value) {
 			$args[] = array(
 				'value' => $value['version'],
 				'text'  => $value['label'] . ' (' . $value['version'] . ')',
@@ -1744,26 +1744,26 @@ 
 	*
 	* @param array $args
 	*/
-	public function display_link( $args ) {
+	public function display_link($args) {
 		$label = $args['label'];
 		$desc  = $args['desc'];
 		$url   = $args['url'];
-		if ( isset( $args['link_class'] ) ) {
-			echo sprintf( '<p><a class="%1$s" href="%2$s">%3$s</a></p>',
-				esc_attr( $args['link_class'] ),
-				esc_url( $url ),
-				esc_html( $label )
+		if (isset($args['link_class'])) {
+			echo sprintf('<p><a class="%1$s" href="%2$s">%3$s</a></p>',
+				esc_attr($args['link_class']),
+				esc_url($url),
+				esc_html($label)
 			);
 		} else {
-			echo sprintf( '<p><a href="%1$s">%2$s</a></p>',
-				esc_url( $url ),
-				esc_html( $label )
+			echo sprintf('<p><a href="%1$s">%2$s</a></p>',
+				esc_url($url),
+				esc_html($label)
 			);
 		}
 
-		if ( '' !== $desc ) {
-			echo sprintf( '<p class="description">%1$s</p>',
-				esc_html( $desc )
+		if ('' !== $desc) {
+			echo sprintf('<p class="description">%1$s</p>',
+				esc_html($desc)
 			);
 		}
 
@@ -1775,15 +1775,15 @@ 
 	* @param string $option
 	* @return string $option
 	*/
-	public function sanitize_validate_text( $option ) {
-		if ( is_array( $option ) ) {
+	public function sanitize_validate_text($option) {
+		if (is_array($option)) {
 			$options = array();
-			foreach ( $option as $key => $value ) {
-				$options[ $key ] = sanitize_text_field( $value );
+			foreach ($option as $key => $value) {
+				$options[$key] = sanitize_text_field($value);
 			}
 			return $options;
 		}
-		$option = sanitize_text_field( $option );
+		$option = sanitize_text_field($option);
 		return $option;
 	}
 
@@ -1792,60 +1792,60 @@ 
 	*
 	* @param object $sfapi
 	*/
-	private function status( $sfapi ) {
+	private function status($sfapi) {
 
 		$versions = $sfapi->get_api_versions();
 
 		// format this array into text so users can see the versions
-		if ( true === $versions['cached'] ) {
-			$versions_is_cached = esc_html__( 'This list is cached, and', 'object-sync-salesforce' );
+		if (true === $versions['cached']) {
+			$versions_is_cached = esc_html__('This list is cached, and', 'object-sync-salesforce');
 		} else {
-			$versions_is_cached = esc_html__( 'This list is not cached, but', 'object-sync-salesforce' );
+			$versions_is_cached = esc_html__('This list is not cached, but', 'object-sync-salesforce');
 		}
 
-		if ( true === $versions['from_cache'] ) {
-			$versions_from_cache = esc_html__( 'items were loaded from the cache', 'object-sync-salesforce' );
+		if (true === $versions['from_cache']) {
+			$versions_from_cache = esc_html__('items were loaded from the cache', 'object-sync-salesforce');
 		} else {
-			$versions_from_cache = esc_html__( 'items were not loaded from the cache', 'object-sync-salesforce' );
+			$versions_from_cache = esc_html__('items were not loaded from the cache', 'object-sync-salesforce');
 		}
 
 		// translators: 1) $versions_is_cached is the "This list is/is not cached, and/but" line, 2) $versions_from_cache is the "items were/were not loaded from the cache" line
-		$versions_apicall_summary = sprintf( esc_html__( 'Available Salesforce API versions. %1$s %2$s. This is not an authenticated request, so it does not touch the Salesforce token.', 'object-sync-for-salesforce' ),
+		$versions_apicall_summary = sprintf(esc_html__('Available Salesforce API versions. %1$s %2$s. This is not an authenticated request, so it does not touch the Salesforce token.', 'object-sync-for-salesforce'),
 			$versions_is_cached,
 			$versions_from_cache
 		);
 
-		$contacts = $sfapi->query( 'SELECT Name, Id from Contact LIMIT 100' );
+		$contacts = $sfapi->query('SELECT Name, Id from Contact LIMIT 100');
 
 		// format this array into html so users can see the contacts
-		if ( true === $contacts['cached'] ) {
-			$contacts_is_cached = esc_html__( 'They are cached, and', 'object-sync-salesforce' );
+		if (true === $contacts['cached']) {
+			$contacts_is_cached = esc_html__('They are cached, and', 'object-sync-salesforce');
 		} else {
-			$contacts_is_cached = esc_html__( 'They are not cached, but', 'object-sync-salesforce' );
+			$contacts_is_cached = esc_html__('They are not cached, but', 'object-sync-salesforce');
 		}
 
-		if ( true === $contacts['from_cache'] ) {
-			$contacts_from_cache = esc_html__( 'they were loaded from the cache', 'object-sync-salesforce' );
+		if (true === $contacts['from_cache']) {
+			$contacts_from_cache = esc_html__('they were loaded from the cache', 'object-sync-salesforce');
 		} else {
-			$contacts_from_cache = esc_html__( 'they were not loaded from the cache', 'object-sync-salesforce' );
+			$contacts_from_cache = esc_html__('they were not loaded from the cache', 'object-sync-salesforce');
 		}
 
-		if ( true === $contacts['is_redo'] ) {
-			$contacts_refreshed_token = esc_html__( 'This request did require refreshing the Salesforce token', 'object-sync-salesforce' );
+		if (true === $contacts['is_redo']) {
+			$contacts_refreshed_token = esc_html__('This request did require refreshing the Salesforce token', 'object-sync-salesforce');
 		} else {
-			$contacts_refreshed_token = esc_html__( 'This request did not require refreshing the Salesforce token', 'object-sync-salesforce' );
+			$contacts_refreshed_token = esc_html__('This request did not require refreshing the Salesforce token', 'object-sync-salesforce');
 		}
 
 		// translators: 1) $contacts['data']['totalSize'] is the number of items loaded, 2) $contacts['data']['records'][0]['attributes']['type'] is the name of the Salesforce object, 3) $contacts_is_cached is the "They are/are not cached, and/but" line, 4) $contacts_from_cache is the "they were/were not loaded from the cache" line, 5) is the "this request did/did not require refreshing the Salesforce token" line
-		$contacts_apicall_summary = sprintf( esc_html__( 'Salesforce successfully returned %1$s %2$s records. %3$s %4$s. %5$s.', 'object-sync-for-salesforce' ),
-			absint( $contacts['data']['totalSize'] ),
-			esc_html( $contacts['data']['records'][0]['attributes']['type'] ),
+		$contacts_apicall_summary = sprintf(esc_html__('Salesforce successfully returned %1$s %2$s records. %3$s %4$s. %5$s.', 'object-sync-for-salesforce'),
+			absint($contacts['data']['totalSize']),
+			esc_html($contacts['data']['records'][0]['attributes']['type']),
 			$contacts_is_cached,
 			$contacts_from_cache,
 			$contacts_refreshed_token
 		);
 
-		require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/status.php' );
+		require_once(plugin_dir_path(__FILE__) . '/../templates/admin/status.php');
 
 	}
 
@@ -1855,12 +1855,12 @@ 
 	* For this plugin at this time, that is the decision we are making: don't do any kind of authorization stuff inside Salesforce
 	*/
 	private function logout() {
-		$this->access_token  = delete_option( $this->option_prefix . 'access_token' );
-		$this->instance_url  = delete_option( $this->option_prefix . 'instance_url' );
-		$this->refresh_token = delete_option( $this->option_prefix . 'refresh_token' );
-		echo sprintf( '<p>You have been logged out. You can use the <a href="%1$s">%2$s</a> tab to log in again.</p>',
-			esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=authorize' ) ),
-			esc_html__( 'Authorize', 'object-sync-for-salesforce' )
+		$this->access_token  = delete_option($this->option_prefix . 'access_token');
+		$this->instance_url  = delete_option($this->option_prefix . 'instance_url');
+		$this->refresh_token = delete_option($this->option_prefix . 'refresh_token');
+		echo sprintf('<p>You have been logged out. You can use the <a href="%1$s">%2$s</a> tab to log in again.</p>',
+			esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=authorize')),
+			esc_html__('Authorize', 'object-sync-for-salesforce')
 		);
 	}
 
@@ -1868,28 +1868,28 @@ 
 	* Ajax call to clear the plugin cache.
 	*/
 	public function clear_sfwp_cache() {
-		$result   = $this->clear_cache( true );
+		$result   = $this->clear_cache(true);
 		$response = array(
 			'message' => $result['message'],
 			'success' => $result['success'],
 		);
-		wp_send_json_success( $response );
+		wp_send_json_success($response);
 	}
 
 	/**
 	* Clear the plugin's cache.
 	* This uses the flush method contained in the WordPress cache to clear all of this plugin's cached data.
 	*/
-	private function clear_cache( $ajax = false ) {
+	private function clear_cache($ajax = false) {
 		$result = (bool) $this->wordpress->sfwp_transients->flush();
-		if ( true === $result ) {
-			$message = __( 'The plugin cache has been cleared.', 'object-sync-for-salesforce' );
+		if (true === $result) {
+			$message = __('The plugin cache has been cleared.', 'object-sync-for-salesforce');
 		} else {
-			$message = __( 'There was an error clearing the plugin cache. Try refreshing this page.', 'object-sync-for-salesforce' );
+			$message = __('There was an error clearing the plugin cache. Try refreshing this page.', 'object-sync-for-salesforce');
 		}
-		if ( false === $ajax ) {
+		if (false === $ajax) {
 			// translators: parameter 1 is the result message
-			echo sprintf( '<p>%1$s</p>', $message );
+			echo sprintf('<p>%1$s</p>', $message);
 		} else {
 			return array(
 				'message' => $message,
@@ -1912,7 +1912,7 @@ 
 		// alternatively, other roles can get this capability in whatever other way you like
 		// point is: to administer this plugin, you need this capability
 
-		if ( ! current_user_can( 'configure_salesforce' ) ) {
+		if ( ! current_user_can('configure_salesforce')) {
 			return false;
 		} else {
 			return true;
@@ -1925,23 +1925,23 @@ 
 	* @param object $user
 	*
 	*/
-	public function show_salesforce_user_fields( $user ) {
-		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
-		if ( true === $this->check_wordpress_admin_permissions() ) {
-			$mapping  = $this->mappings->load_by_wordpress( 'user', $user->ID );
+	public function show_salesforce_user_fields($user) {
+		$get_data = filter_input_array(INPUT_GET, FILTER_SANITIZE_STRING);
+		if (true === $this->check_wordpress_admin_permissions()) {
+			$mapping  = $this->mappings->load_by_wordpress('user', $user->ID);
 			$fieldmap = $this->mappings->get_fieldmaps(
 				null, // id field must be null for multiples
 				array(
 					'wordpress_object' => 'user',
 				)
 			);
-			if ( isset( $mapping['id'] ) && ! isset( $get_data['edit_salesforce_mapping'] ) ) {
-				require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/user-profile-salesforce.php' );
-			} elseif ( ! empty( $fieldmap ) ) { // is the user mapped to something already?
-				if ( isset( $get_data['edit_salesforce_mapping'] ) && 'true' === sanitize_key( $get_data['edit_salesforce_mapping'] ) ) {
-					require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/user-profile-salesforce-change.php' );
+			if (isset($mapping['id']) && ! isset($get_data['edit_salesforce_mapping'])) {
+				require_once(plugin_dir_path(__FILE__) . '/../templates/admin/user-profile-salesforce.php');
+			} elseif ( ! empty($fieldmap)) { // is the user mapped to something already?
+				if (isset($get_data['edit_salesforce_mapping']) && 'true' === sanitize_key($get_data['edit_salesforce_mapping'])) {
+					require_once(plugin_dir_path(__FILE__) . '/../templates/admin/user-profile-salesforce-change.php');
 				} else {
-					require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/user-profile-salesforce-map.php' );
+					require_once(plugin_dir_path(__FILE__) . '/../templates/admin/user-profile-salesforce-map.php');
 				}
 			}
 		}
@@ -1952,10 +1952,10 @@ 
 	* @param int $user_id
 	*
 	*/
-	public function save_salesforce_user_fields( $user_id ) {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( isset( $post_data['salesforce_update_mapped_user'] ) && '1' === rawurlencode( $post_data['salesforce_update_mapped_user'] ) ) {
-			$mapping_object                  = $this->mappings->get_object_maps(
+	public function save_salesforce_user_fields($user_id) {
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if (isset($post_data['salesforce_update_mapped_user']) && '1' === rawurlencode($post_data['salesforce_update_mapped_user'])) {
+			$mapping_object = $this->mappings->get_object_maps(
 				array(
 					'wordpress_id'     => $user_id,
 					'wordpress_object' => 'user',
@@ -1963,14 +1963,14 @@ 
 			);
 			$mapping_object['salesforce_id'] = $post_data['salesforce_id'];
 
-			$result = $this->mappings->update_object_map( $mapping_object, $mapping_object['id'] );
-		} elseif ( isset( $post_data['salesforce_create_mapped_user'] ) && '1' === rawurlencode( $post_data['salesforce_create_mapped_user'] ) ) {
+			$result = $this->mappings->update_object_map($mapping_object, $mapping_object['id']);
+		} elseif (isset($post_data['salesforce_create_mapped_user']) && '1' === rawurlencode($post_data['salesforce_create_mapped_user'])) {
 			// if a Salesforce ID was entered
-			if ( isset( $post_data['salesforce_id'] ) && ! empty( $post_data['salesforce_id'] ) ) {
-				$mapping_object = $this->create_object_map( $user_id, 'user', $post_data['salesforce_id'] );
-			} elseif ( isset( $post_data['push_new_user_to_salesforce'] ) ) {
+			if (isset($post_data['salesforce_id']) && ! empty($post_data['salesforce_id'])) {
+				$mapping_object = $this->create_object_map($user_id, 'user', $post_data['salesforce_id']);
+			} elseif (isset($post_data['push_new_user_to_salesforce'])) {
 				// otherwise, create a new record in Salesforce
-				$result = $this->push_to_salesforce( 'user', $user_id );
+				$result = $this->push_to_salesforce('user', $user_id);
 			}
 		}
 	}
@@ -1980,29 +1980,29 @@ 
 	* @param array $tabs
 	* @param string $tab
 	*/
-	private function tabs( $tabs, $tab = '' ) {
+	private function tabs($tabs, $tab = '') {
 
-		$get_data        = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
+		$get_data        = filter_input_array(INPUT_GET, FILTER_SANITIZE_STRING);
 		$consumer_key    = $this->login_credentials['consumer_key'];
 		$consumer_secret = $this->login_credentials['consumer_secret'];
 		$callback_url    = $this->login_credentials['callback_url'];
 
 		$current_tab = $tab;
 		echo '<h2 class="nav-tab-wrapper">';
-		foreach ( $tabs as $tab_key => $tab_caption ) {
+		foreach ($tabs as $tab_key => $tab_caption) {
 			$active = $current_tab === $tab_key ? ' nav-tab-active' : '';
-			if ( 'settings' === $tab_key || ( isset( $consumer_key ) && isset( $consumer_secret ) && ! empty( $consumer_key ) && ! empty( $consumer_secret ) ) ) {
-				echo sprintf( '<a class="nav-tab%1$s" href="%2$s">%3$s</a>',
-					esc_attr( $active ),
-					esc_url( '?page=object-sync-salesforce-admin&tab=' . $tab_key ),
-					esc_html( $tab_caption )
+			if ('settings' === $tab_key || (isset($consumer_key) && isset($consumer_secret) && ! empty($consumer_key) && ! empty($consumer_secret))) {
+				echo sprintf('<a class="nav-tab%1$s" href="%2$s">%3$s</a>',
+					esc_attr($active),
+					esc_url('?page=object-sync-salesforce-admin&tab=' . $tab_key),
+					esc_html($tab_caption)
 				);
 			}
 		}
 		echo '</h2>';
 
-		if ( isset( $get_data['tab'] ) ) {
-			$tab = sanitize_key( $get_data['tab'] );
+		if (isset($get_data['tab'])) {
+			$tab = sanitize_key($get_data['tab']);
 		} else {
 			$tab = '';
 		}
@@ -2013,13 +2013,13 @@ 
 	* This clears the schedule if the user clicks the button
 	* @param string $schedule_name
 	*/
-	private function clear_schedule( $schedule_name = '' ) {
-		if ( '' !== $schedule_name ) {
-			$this->queue->cancel( $schedule_name );
+	private function clear_schedule($schedule_name = '') {
+		if ('' !== $schedule_name) {
+			$this->queue->cancel($schedule_name);
 			// translators: $schedule_name is the name of the current queue. Defaults: salesforce_pull, salesforce_push, salesforce
-			echo sprintf( esc_html__( 'You have cleared the %s schedule.', 'object-sync-for-salesforce' ), esc_html( $schedule_name ) );
+			echo sprintf(esc_html__('You have cleared the %s schedule.', 'object-sync-for-salesforce'), esc_html($schedule_name));
 		} else {
-			echo esc_html__( 'You need to specify the name of the schedule you want to clear.', 'object-sync-for-salesforce' );
+			echo esc_html__('You need to specify the name of the schedule you want to clear.', 'object-sync-for-salesforce');
 		}
 	}
 
@@ -2028,22 +2028,22 @@ 
 	* @param string $schedule_name
 	* @return int $count
 	*/
-	private function get_schedule_count( $schedule_name = '' ) {
-		if ( '' !== $schedule_name ) {
-			$count       = count( $this->queue->search(
+	private function get_schedule_count($schedule_name = '') {
+		if ('' !== $schedule_name) {
+			$count = count($this->queue->search(
 				array(
 					'group'  => $schedule_name,
 					'status' => ActionScheduler_Store::STATUS_PENDING,
 				),
 				'ARRAY_A'
-			) );
-			$group_count = count( $this->queue->search(
+			));
+			$group_count = count($this->queue->search(
 				array(
 					'group'  => $schedule_name . $this->action_group_suffix,
 					'status' => ActionScheduler_Store::STATUS_PENDING,
 				),
 				'ARRAY_A'
-			) );
+			));
 			return $count + $group_count;
 		} else {
 			return 0;
@@ -2066,17 +2066,17 @@ 
 	*   This is the database row for the map object
 	*
 	*/
-	private function create_object_map( $wordpress_id, $wordpress_object, $salesforce_id, $action = '' ) {
+	private function create_object_map($wordpress_id, $wordpress_object, $salesforce_id, $action = '') {
 		// Create object map and save it
 		$mapping_object = $this->mappings->create_object_map(
 			array(
 				'wordpress_id'      => $wordpress_id, // 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'  => $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'  => $action,
 				'last_sync_status'  => $this->mappings->status_success,
-				'last_sync_message' => __( 'Mapping object updated via function: ', 'object-sync-for-salesforce' ) . __FUNCTION__,
+				'last_sync_message' => __('Mapping object updated via function: ', 'object-sync-for-salesforce') . __FUNCTION__,
 			)
 		);
 

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

Spacing +35 added lines, -35 removed lines

@@ -3,7 +3,7 @@ 
  * Object Sync for Salesforce Queue
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly.
 }
 
@@ -21,7 +21,7 @@ 
 	protected $option_prefix;
 	protected $schedulable_classes;
 
-	public function __construct( $wpdb, $version, $slug, $option_prefix, $schedulable_classes ) {
+	public function __construct($wpdb, $version, $slug, $option_prefix, $schedulable_classes) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
 		$this->slug                = $slug;
@@ -36,8 +36,8 @@ 
 	 *
 	 */
 	private function add_actions() {
-		add_filter( 'action_scheduler_queue_runner_batch_size', array( $this, 'action_scheduler_batch_size' ) );
-		add_filter( 'action_scheduler_queue_runner_concurrent_batches', array( $this, 'action_scheduler_concurrent_batches' ) );
+		add_filter('action_scheduler_queue_runner_batch_size', array($this, 'action_scheduler_batch_size'));
+		add_filter('action_scheduler_queue_runner_concurrent_batches', array($this, 'action_scheduler_concurrent_batches'));
 	}
 
 	/**
@@ -46,9 +46,9 @@ 
 	 * @param int  $batch_size
 	 * @return int  $batch_size
 	 */
-	public function action_scheduler_batch_size( $batch_size ) {
+	public function action_scheduler_batch_size($batch_size) {
 		// default for this library is 20 so that is where we start
-		$batch_size = filter_var( get_option( $this->option_prefix . 'action_scheduler_batch_size', 20 ), FILTER_VALIDATE_INT );
+		$batch_size = filter_var(get_option($this->option_prefix . 'action_scheduler_batch_size', 20), FILTER_VALIDATE_INT);
 		return $batch_size;
 	}
 
@@ -58,9 +58,9 @@ 
 	 * @param int  $concurrent_batches
 	 * @return int  $concurrent_batches
 	 */
-	public function action_scheduler_concurrent_batches( $concurrent_batches ) {
+	public function action_scheduler_concurrent_batches($concurrent_batches) {
 		// default for this library is 5 so that is where we start
-		$concurrent_batches = filter_var( get_option( $this->option_prefix . 'action_scheduler_concurrent_batches', 5 ), FILTER_VALIDATE_INT );
+		$concurrent_batches = filter_var(get_option($this->option_prefix . 'action_scheduler_concurrent_batches', 5), FILTER_VALIDATE_INT);
 		return $concurrent_batches;
 	}
 
@@ -71,25 +71,25 @@ 
 	 * @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) {
 				// we want zero values at the top of an ascending sort
-				if ( 0 === $a ) {
+				if (0 === $a) {
 					return 1;
 				}
-				if ( 0 === $b ) {
+				if (0 === $b) {
 					return -1;
 				}
 				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'];
 			});
 		}
@@ -105,11 +105,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 = filter_var( get_option( $this->option_prefix . $name . '_schedule_number', '' ), FILTER_VALIDATE_INT );
-		$schedule_unit   = get_option( $this->option_prefix . $name . '_schedule_unit', '' );
+	public function get_frequency($name, $unit) {
+		$schedule_number = filter_var(get_option($this->option_prefix . $name . '_schedule_number', ''), FILTER_VALIDATE_INT);
+		$schedule_unit   = get_option($this->option_prefix . $name . '_schedule_unit', '');
 
-		switch ( $schedule_unit ) {
+		switch ($schedule_unit) {
 			case 'minutes':
 				$seconds = 60;
 				$minutes = 1;
@@ -140,8 +140,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);
 	}
 
 	/**
@@ -153,8 +153,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);
 	}
 
 	/**
@@ -167,8 +167,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);
 	}
 
 	/**
@@ -191,8 +191,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);
 	}
 
 	/**
@@ -208,8 +208,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);
 	}
 
 	/**
@@ -221,11 +221,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;
 		}
 
@@ -253,7 +253,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_mapping.php

Spacing +230 added lines, -230 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -62,7 +62,7 @@ 
 	 * @param object $logging Object_Sync_Sf_Logging.
 	 * @throws \Exception
 	 */
-	public function __construct( $wpdb, $version, $slug, $option_prefix, $logging ) {
+	public function __construct($wpdb, $version, $slug, $option_prefix, $logging) {
 		$this->wpdb          = $wpdb;
 		$this->version       = $version;
 		$this->slug          = $slug;
@@ -86,16 +86,16 @@ 
 		$this->sync_sf_delete        = 0x0020;
 
 		// Define which events are initialized by which system.
-		$this->wordpress_events  = array( $this->sync_wordpress_create, $this->sync_wordpress_update, $this->sync_wordpress_delete );
-		$this->salesforce_events = array( $this->sync_sf_create, $this->sync_sf_update, $this->sync_sf_delete );
+		$this->wordpress_events  = array($this->sync_wordpress_create, $this->sync_wordpress_update, $this->sync_wordpress_delete);
+		$this->salesforce_events = array($this->sync_sf_create, $this->sync_sf_update, $this->sync_sf_delete);
 
 		// Constants for the directions to map things.
 		$this->direction_wordpress_sf = 'wp_sf';
 		$this->direction_sf_wordpress = 'sf_wp';
 		$this->direction_sync         = 'sync';
 
-		$this->direction_wordpress  = array( $this->direction_wordpress_sf, $this->direction_sync );
-		$this->direction_salesforce = array( $this->direction_sf_wordpress, $this->direction_sync );
+		$this->direction_wordpress  = array($this->direction_wordpress_sf, $this->direction_sync);
+		$this->direction_salesforce = array($this->direction_sf_wordpress, $this->direction_sync);
 
 		// This is used when we map a record with default or Master.
 		$this->salesforce_default_record_type = 'default';
@@ -103,11 +103,11 @@ 
 		// Salesforce has multipicklists and they have a delimiter.
 		$this->array_delimiter = ';';
 		// What data types in Salesforce should be an array?
-		$this->array_types_from_salesforce = array( 'multipicklist' );
+		$this->array_types_from_salesforce = array('multipicklist');
 		// What data types in Salesforce should be a date field?
-		$this->date_types_from_salesforce = array( 'date', 'datetime' );
+		$this->date_types_from_salesforce = array('date', 'datetime');
 		// What data types in Salesforce should be an integer?
-		$this->int_types_from_salesforce = array( 'integer', 'boolean' );
+		$this->int_types_from_salesforce = array('integer', 'boolean');
 
 		// Max length for a mapping field.
 		$this->name_length = 128;
@@ -126,13 +126,13 @@ 
 	 * @param array $salesforce_fields The fields for the Salesforce side of the mapping.
 	 * @throws \Exception
 	 */
-	public function create_fieldmap( $posted = array(), $wordpress_fields = array(), $salesforce_fields = array() ) {
-		$data = $this->setup_fieldmap_data( $posted, $wordpress_fields, $salesforce_fields );
-		if ( version_compare( $this->version, '1.2.5', '>=' ) ) {
+	public function create_fieldmap($posted = array(), $wordpress_fields = array(), $salesforce_fields = array()) {
+		$data = $this->setup_fieldmap_data($posted, $wordpress_fields, $salesforce_fields);
+		if (version_compare($this->version, '1.2.5', '>=')) {
 			$data['version'] = $this->version;
 		}
-		$insert = $this->wpdb->insert( $this->fieldmap_table, $data );
-		if ( 1 === $insert ) {
+		$insert = $this->wpdb->insert($this->fieldmap_table, $data);
+		if (1 === $insert) {
 			return $this->wpdb->insert_id;
 		} else {
 			return false;
@@ -148,29 +148,29 @@ 
 	 * @return Array $map a single mapping or $mappings, an array of mappings.
 	 * @throws \Exception
 	 */
-	public function get_fieldmaps( $id = null, $conditions = array(), $reset = false ) {
+	public function get_fieldmaps($id = null, $conditions = array(), $reset = false) {
 		$table = $this->fieldmap_table;
-		if ( null !== $id ) { // get one fieldmap.
-			$map                                    = $this->wpdb->get_row( 'SELECT * FROM ' . $table . ' WHERE id = ' . $id, ARRAY_A );
-			$map['salesforce_record_types_allowed'] = maybe_unserialize( $map['salesforce_record_types_allowed'] );
+		if (null !== $id) { // get one fieldmap.
+			$map                                    = $this->wpdb->get_row('SELECT * FROM ' . $table . ' WHERE id = ' . $id, ARRAY_A);
+			$map['salesforce_record_types_allowed'] = maybe_unserialize($map['salesforce_record_types_allowed']);
 
-			$map['fields']        = maybe_unserialize( $map['fields'] );
-			$map['sync_triggers'] = maybe_unserialize( $map['sync_triggers'] );
+			$map['fields']        = maybe_unserialize($map['fields']);
+			$map['sync_triggers'] = maybe_unserialize($map['sync_triggers']);
 			return $map;
-		} elseif ( ! empty( $conditions ) ) { // get multiple but with a limitation.
+		} elseif ( ! empty($conditions)) { // get multiple but with a limitation.
 			$mappings    = array();
 			$record_type = '';
 
 			// Assemble the SQL.
-			if ( ! empty( $conditions ) ) {
+			if ( ! empty($conditions)) {
 				$where = ' WHERE ';
 				$i     = 0;
-				foreach ( $conditions as $key => $value ) {
-					if ( 'salesforce_record_type' === $key ) {
-						$record_type = sanitize_text_field( $value );
+				foreach ($conditions as $key => $value) {
+					if ('salesforce_record_type' === $key) {
+						$record_type = sanitize_text_field($value);
 					} else {
 						$i++;
-						if ( $i > 1 ) {
+						if ($i > 1) {
 							$where .= ' AND ';
 						}
 						$where .= '`' . $key . '` = "' . $value . '"';
@@ -180,10 +180,10 @@ 
 				$where = '';
 			}
 
-			$mappings = $this->wpdb->get_results( 'SELECT * FROM ' . $table . $where . ' ORDER BY `weight`', ARRAY_A );
+			$mappings = $this->wpdb->get_results('SELECT * FROM ' . $table . $where . ' ORDER BY `weight`', ARRAY_A);
 
-			if ( ! empty( $mappings ) ) {
-				$mappings = $this->prepare_fieldmap_data( $mappings, $record_type );
+			if ( ! empty($mappings)) {
+				$mappings = $this->prepare_fieldmap_data($mappings, $record_type);
 			}
 
 			return $mappings;
@@ -191,14 +191,14 @@ 
 		} else { // get all of the mappings. ALL THE MAPPINGS.
 
 			// if the version is greater than or equal to 1.2.5, the fieldmap table has a version column
-			if ( version_compare( $this->version, '1.2.5', '>=' ) ) {
-				$mappings = $this->wpdb->get_results( "SELECT `id`, `label`, `wordpress_object`, `salesforce_object`, `salesforce_record_types_allowed`, `salesforce_record_type_default`, `fields`, `pull_trigger_field`, `sync_triggers`, `push_async`, `push_drafts`, `weight`, `version` FROM $table", ARRAY_A );
+			if (version_compare($this->version, '1.2.5', '>=')) {
+				$mappings = $this->wpdb->get_results("SELECT `id`, `label`, `wordpress_object`, `salesforce_object`, `salesforce_record_types_allowed`, `salesforce_record_type_default`, `fields`, `pull_trigger_field`, `sync_triggers`, `push_async`, `push_drafts`, `weight`, `version` FROM $table", ARRAY_A);
 			} else {
-				$mappings = $this->wpdb->get_results( "SELECT `id`, `label`, `wordpress_object`, `salesforce_object`, `salesforce_record_types_allowed`, `salesforce_record_type_default`, `fields`, `pull_trigger_field`, `sync_triggers`, `push_async`, `push_drafts`, `weight` FROM $table", ARRAY_A );
+				$mappings = $this->wpdb->get_results("SELECT `id`, `label`, `wordpress_object`, `salesforce_object`, `salesforce_record_types_allowed`, `salesforce_record_type_default`, `fields`, `pull_trigger_field`, `sync_triggers`, `push_async`, `push_drafts`, `weight` FROM $table", ARRAY_A);
 			}
 
-			if ( ! empty( $mappings ) ) {
-				$mappings = $this->prepare_fieldmap_data( $mappings );
+			if ( ! empty($mappings)) {
+				$mappings = $this->prepare_fieldmap_data($mappings);
 			}
 
 			return $mappings;
@@ -214,29 +214,29 @@ 
 	 *
 	 * @return Array of mapped fields
 	 */
-	public function get_mapped_fields( $mapping, $directions = array() ) {
+	public function get_mapped_fields($mapping, $directions = array()) {
 		$mapped_fields = array();
-		foreach ( $mapping['fields'] as $fields ) {
-			if ( empty( $directions ) || in_array( $fields['direction'], $directions, true ) ) {
+		foreach ($mapping['fields'] as $fields) {
+			if (empty($directions) || in_array($fields['direction'], $directions, true)) {
 
-				if ( version_compare( $this->version, '1.2.0', '>=' ) && isset( $fields['salesforce_field']['name'] ) ) {
+				if (version_compare($this->version, '1.2.0', '>=') && isset($fields['salesforce_field']['name'])) {
 					$array_key = 'name';
 				} else {
 					$array_key = 'label';
 				}
 
 				// Some field map types (Relation) store a collection of SF objects.
-				if ( is_array( $fields['salesforce_field'] ) && ! isset( $fields['salesforce_field'][ $array_key ] ) ) {
-					foreach ( $fields['salesforce_field'] as $sf_field ) {
-						$mapped_fields[ $sf_field[ $array_key ] ] = $sf_field[ $array_key ];
+				if (is_array($fields['salesforce_field']) && ! isset($fields['salesforce_field'][$array_key])) {
+					foreach ($fields['salesforce_field'] as $sf_field) {
+						$mapped_fields[$sf_field[$array_key]] = $sf_field[$array_key];
 					}
 				} else { // The rest are just a name/value pair.
-					$mapped_fields[ $fields['salesforce_field'][ $array_key ] ] = $fields['salesforce_field'][ $array_key ];
+					$mapped_fields[$fields['salesforce_field'][$array_key]] = $fields['salesforce_field'][$array_key];
 				}
 			}
 		}
 
-		if ( ! empty( $this->get_mapped_record_types ) ) {
+		if ( ! empty($this->get_mapped_record_types)) {
 			$mapped_fields['RecordTypeId'] = 'RecordTypeId';
 		}
 
@@ -249,8 +249,8 @@ 
 	 * @param Array $mapping A mapping from which we wish to estract the record type.
 	 * @return Array of mappings. Empty if the mapping's record type is default, else full of the record types.
 	 */
-	public function get_mapped_record_types( $mapping ) {
-		return $mapping['salesforce_record_type_default'] === $this->salesforce_default_record_type ? array() : array_filter( maybe_unserialize( $mapping['salesforce_record_types_allowed'] ) );
+	public function get_mapped_record_types($mapping) {
+		return $mapping['salesforce_record_type_default'] === $this->salesforce_default_record_type ? array() : array_filter(maybe_unserialize($mapping['salesforce_record_types_allowed']));
 	}
 
 	/**
@@ -263,9 +263,9 @@ 
 	 * @return $map
 	 * @throws \Exception
 	 */
-	public function update_fieldmap( $posted = array(), $wordpress_fields = array(), $salesforce_fields = array(), $id = '' ) {
-		$data = $this->setup_fieldmap_data( $posted, $wordpress_fields, $salesforce_fields );
-		if ( version_compare( $this->version, '1.2.5', '>=' ) && ! isset( $data['updated'] ) ) {
+	public function update_fieldmap($posted = array(), $wordpress_fields = array(), $salesforce_fields = array(), $id = '') {
+		$data = $this->setup_fieldmap_data($posted, $wordpress_fields, $salesforce_fields);
+		if (version_compare($this->version, '1.2.5', '>=') && ! isset($data['updated'])) {
 			$data['version'] = $this->version;
 		}
 		$update = $this->wpdb->update(
@@ -275,7 +275,7 @@ 
 				'id' => $id,
 			)
 		);
-		if ( false === $update ) {
+		if (false === $update) {
 			return false;
 		} else {
 			return true;
@@ -291,76 +291,76 @@ 
 	 * @param array $salesforce_fields The fields for the Salesforce side of the mapping.
 	 * @return $data
 	 */
-	private function setup_fieldmap_data( $posted = array(), $wordpress_fields = array(), $salesforce_fields = array() ) {
+	private function setup_fieldmap_data($posted = array(), $wordpress_fields = array(), $salesforce_fields = array()) {
 		$data = array(
 			'label'             => $posted['label'],
-			'name'              => sanitize_title( $posted['label'] ),
+			'name'              => sanitize_title($posted['label']),
 			'salesforce_object' => $posted['salesforce_object'],
 			'wordpress_object'  => $posted['wordpress_object'],
 		);
-		if ( isset( $posted['wordpress_field'] ) && is_array( $posted['wordpress_field'] ) && isset( $posted['salesforce_field'] ) && is_array( $posted['salesforce_field'] ) ) {
+		if (isset($posted['wordpress_field']) && is_array($posted['wordpress_field']) && isset($posted['salesforce_field']) && is_array($posted['salesforce_field'])) {
 			$setup['fields'] = array();
-			foreach ( $posted['wordpress_field'] as $key => $value ) {
-				$method_key = array_search( $value, array_column( $wordpress_fields, 'key' ), true );
-				if ( ! isset( $posted['direction'][ $key ] ) ) {
-					$posted['direction'][ $key ] = 'sync';
+			foreach ($posted['wordpress_field'] as $key => $value) {
+				$method_key = array_search($value, array_column($wordpress_fields, 'key'), true);
+				if ( ! isset($posted['direction'][$key])) {
+					$posted['direction'][$key] = 'sync';
 				}
-				if ( ! isset( $posted['is_prematch'][ $key ] ) ) {
-					$posted['is_prematch'][ $key ] = false;
+				if ( ! isset($posted['is_prematch'][$key])) {
+					$posted['is_prematch'][$key] = false;
 				}
-				if ( ! isset( $posted['is_key'][ $key ] ) ) {
-					$posted['is_key'][ $key ] = false;
+				if ( ! isset($posted['is_key'][$key])) {
+					$posted['is_key'][$key] = false;
 				}
-				if ( ! isset( $posted['is_delete'][ $key ] ) ) {
-					$posted['is_delete'][ $key ] = false;
+				if ( ! isset($posted['is_delete'][$key])) {
+					$posted['is_delete'][$key] = false;
 				}
-				if ( false === $posted['is_delete'][ $key ] ) {
+				if (false === $posted['is_delete'][$key]) {
 					// I think it's good to over-mention that updateable is really how the Salesforce api spells it.
-					$updateable_key = array_search( $posted['salesforce_field'][ $key ], array_column( $salesforce_fields, 'name' ), true );
+					$updateable_key = array_search($posted['salesforce_field'][$key], array_column($salesforce_fields, 'name'), true);
 
 					$salesforce_field_attributes = array();
-					foreach ( $salesforce_fields[ $updateable_key ] as $sf_key => $sf_value ) {
-						if ( isset( $sf_value ) && ! is_array( $sf_value ) ) {
-							$salesforce_field_attributes[ $sf_key ] = esc_attr( $sf_value );
-						} elseif ( ! empty( $sf_value ) && is_array( $sf_value ) ) {
-							$salesforce_field_attributes[ $sf_key ] = maybe_unserialize( $sf_value );
+					foreach ($salesforce_fields[$updateable_key] as $sf_key => $sf_value) {
+						if (isset($sf_value) && ! is_array($sf_value)) {
+							$salesforce_field_attributes[$sf_key] = esc_attr($sf_value);
+						} elseif ( ! empty($sf_value) && is_array($sf_value)) {
+							$salesforce_field_attributes[$sf_key] = maybe_unserialize($sf_value);
 						} else {
-							$salesforce_field_attributes[ $sf_key ] = '';
+							$salesforce_field_attributes[$sf_key] = '';
 						}
 					}
 
-					$setup['fields'][ $key ] = array(
+					$setup['fields'][$key] = array(
 						'wordpress_field'  => array(
-							'label'   => sanitize_text_field( $posted['wordpress_field'][ $key ] ),
-							'methods' => maybe_unserialize( $wordpress_fields[ $method_key ]['methods'] ),
-							'type'    => isset( $wordpress_fields[ $method_key ]['type'] ) ? sanitize_text_field( $wordpress_fields[ $method_key ]['type'] ) : 'text',
+							'label'   => sanitize_text_field($posted['wordpress_field'][$key]),
+							'methods' => maybe_unserialize($wordpress_fields[$method_key]['methods']),
+							'type'    => isset($wordpress_fields[$method_key]['type']) ? sanitize_text_field($wordpress_fields[$method_key]['type']) : 'text',
 						),
 						'salesforce_field' => $salesforce_field_attributes,
-						'is_prematch'      => sanitize_text_field( $posted['is_prematch'][ $key ] ),
-						'is_key'           => sanitize_text_field( $posted['is_key'][ $key ] ),
-						'direction'        => sanitize_text_field( $posted['direction'][ $key ] ),
-						'is_delete'        => sanitize_text_field( $posted['is_delete'][ $key ] ),
+						'is_prematch'      => sanitize_text_field($posted['is_prematch'][$key]),
+						'is_key'           => sanitize_text_field($posted['is_key'][$key]),
+						'direction'        => sanitize_text_field($posted['direction'][$key]),
+						'is_delete'        => sanitize_text_field($posted['is_delete'][$key]),
 					);
 
 					// If the WordPress key or the Salesforce key are blank, remove this incomplete mapping.
 					// This prevents https://github.com/MinnPost/object-sync-for-salesforce/issues/82 .
 					if (
-						empty( $setup['fields'][ $key ]['wordpress_field']['label'] )
+						empty($setup['fields'][$key]['wordpress_field']['label'])
 						||
-						empty( $setup['fields'][ $key ]['salesforce_field']['name'] )
+						empty($setup['fields'][$key]['salesforce_field']['name'])
 					) {
-						unset( $setup['fields'][ $key ] );
+						unset($setup['fields'][$key]);
 					}
 				}
 			} // End foreach() on WordPress fields.
-			$data['fields'] = maybe_serialize( $setup['fields'] );
-		} elseif ( isset( $posted['fields'] ) && is_array( $posted['fields'] ) ) {
+			$data['fields'] = maybe_serialize($setup['fields']);
+		} elseif (isset($posted['fields']) && is_array($posted['fields'])) {
 			// if $posted['fields'] is already set, use that
-			$data['fields'] = maybe_serialize( $posted['fields'] );
+			$data['fields'] = maybe_serialize($posted['fields']);
 		} // End if() WordPress fields are present.
 
-		if ( isset( $posted['salesforce_record_types_allowed'] ) ) {
-			$data['salesforce_record_types_allowed'] = maybe_serialize( $posted['salesforce_record_types_allowed'] );
+		if (isset($posted['salesforce_record_types_allowed'])) {
+			$data['salesforce_record_types_allowed'] = maybe_serialize($posted['salesforce_record_types_allowed']);
 		} else {
 			$data['salesforce_record_types_allowed'] = maybe_serialize(
 				array(
@@ -368,29 +368,29 @@ 
 				)
 			);
 		}
-		if ( isset( $posted['salesforce_record_type_default'] ) ) {
+		if (isset($posted['salesforce_record_type_default'])) {
 			$data['salesforce_record_type_default'] = $posted['salesforce_record_type_default'];
 		} else {
-			$data['salesforce_record_type_default'] = maybe_serialize( $this->salesforce_default_record_type );
+			$data['salesforce_record_type_default'] = maybe_serialize($this->salesforce_default_record_type);
 		}
-		if ( isset( $posted['pull_trigger_field'] ) ) {
+		if (isset($posted['pull_trigger_field'])) {
 			$data['pull_trigger_field'] = $posted['pull_trigger_field'];
 		}
-		if ( isset( $posted['sync_triggers'] ) && is_array( $posted['sync_triggers'] ) ) {
+		if (isset($posted['sync_triggers']) && is_array($posted['sync_triggers'])) {
 			$setup['sync_triggers'] = array();
-			foreach ( $posted['sync_triggers'] as $key => $value ) {
-				$setup['sync_triggers'][ $key ] = esc_html( $posted['sync_triggers'][ $key ] );
+			foreach ($posted['sync_triggers'] as $key => $value) {
+				$setup['sync_triggers'][$key] = esc_html($posted['sync_triggers'][$key]);
 			}
 		} else {
 			$setup['sync_triggers'] = array();
 		}
-		$data['sync_triggers'] = maybe_serialize( $setup['sync_triggers'] );
-		if ( isset( $posted['pull_trigger_field'] ) ) {
+		$data['sync_triggers'] = maybe_serialize($setup['sync_triggers']);
+		if (isset($posted['pull_trigger_field'])) {
 			$data['pull_trigger_field'] = $posted['pull_trigger_field'];
 		}
-		$data['push_async']  = isset( $posted['push_async'] ) ? $posted['push_async'] : '';
-		$data['push_drafts'] = isset( $posted['push_drafts'] ) ? $posted['push_drafts'] : '';
-		$data['weight']      = isset( $posted['weight'] ) ? $posted['weight'] : '';
+		$data['push_async']  = isset($posted['push_async']) ? $posted['push_async'] : '';
+		$data['push_drafts'] = isset($posted['push_drafts']) ? $posted['push_drafts'] : '';
+		$data['weight']      = isset($posted['weight']) ? $posted['weight'] : '';
 		return $data;
 	}
 
@@ -401,12 +401,12 @@ 
 	 * @return Boolean
 	 * @throws \Exception
 	 */
-	public function delete_fieldmap( $id = '' ) {
+	public function delete_fieldmap($id = '') {
 		$data   = array(
 			'id' => $id,
 		);
-		$delete = $this->wpdb->delete( $this->fieldmap_table, $data );
-		if ( 1 === $delete ) {
+		$delete = $this->wpdb->delete($this->fieldmap_table, $data);
+		if (1 === $delete) {
 			return true;
 		} else {
 			return false;
@@ -420,27 +420,27 @@ 
 	 * @return false|Int of field mapping between WordPress and Salesforce objects
 	 * @throws \Exception
 	 */
-	public function create_object_map( $posted = array() ) {
-		$data            = $this->setup_object_map_data( $posted );
-		$data['created'] = current_time( 'mysql' );
+	public function create_object_map($posted = array()) {
+		$data            = $this->setup_object_map_data($posted);
+		$data['created'] = current_time('mysql');
 		// Check to see if we don't know the salesforce id and it is not a temporary id, or if this is pending.
 		// If it is using a temporary id, the map will get updated after it finishes running; it won't call this method unless there's an error, which we should log.
-		if ( substr( $data['salesforce_id'], 0, 7 ) !== 'tmp_sf_' || 'pending' === $data['action'] ) {
-			unset( $data['action'] );
-			$insert = $this->wpdb->insert( $this->object_map_table, $data );
+		if (substr($data['salesforce_id'], 0, 7) !== 'tmp_sf_' || 'pending' === $data['action']) {
+			unset($data['action']);
+			$insert = $this->wpdb->insert($this->object_map_table, $data);
 		} else {
 			$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);
 			}
 			$logging->setup(
 				sprintf(
 					// translators: %1$s is the name of a WordPress object. %2$s is the id of that object.
-					esc_html__( 'Error Mapping: error caused by trying to map the WordPress %1$s with ID of %2$s to Salesforce ID starting with "tmp_sf_", which is invalid.', 'object-sync-for-salesforce' ),
-					esc_attr( $data['wordpress_object'] ),
-					absint( $data['wordpress_id'] )
+					esc_html__('Error Mapping: error caused by trying to map the WordPress %1$s with ID of %2$s to Salesforce ID starting with "tmp_sf_", which is invalid.', 'object-sync-for-salesforce'),
+					esc_attr($data['wordpress_object']),
+					absint($data['wordpress_id'])
 				),
 				'',
 				0,
@@ -449,23 +449,23 @@ 
 			);
 			return false;
 		}
-		if ( 1 === $insert ) {
+		if (1 === $insert) {
 			return $this->wpdb->insert_id;
-		} elseif ( false !== strpos( $this->wpdb->last_error, 'Duplicate entry' ) ) {
-			$mapping = $this->load_by_salesforce( $data['salesforce_id'] );
+		} elseif (false !== strpos($this->wpdb->last_error, 'Duplicate entry')) {
+			$mapping = $this->load_by_salesforce($data['salesforce_id']);
 			$id      = $mapping['id'];
 			$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);
 			}
 			$logging->setup(
 				sprintf(
 					// translators: %1$s is the status word "Error". %1$s is the Id of a Salesforce object. %2$s is the ID of a mapping object.
-					esc_html__( 'Error: Mapping: there is already a WordPress object mapped to the Salesforce object %1$s and the mapping object ID is %2$s', 'object-sync-for-salesforce' ),
-					esc_attr( $data['salesforce_id'] ),
-					absint( $id )
+					esc_html__('Error: Mapping: there is already a WordPress object mapped to the Salesforce object %1$s and the mapping object ID is %2$s', 'object-sync-for-salesforce'),
+					esc_attr($data['salesforce_id']),
+					absint($id)
 				),
 				'',
 				0,
@@ -486,18 +486,18 @@ 
 	 * @return $map or $mappings
 	 * @throws \Exception
 	 */
-	public function get_object_maps( $conditions = array(), $reset = false ) {
+	public function get_object_maps($conditions = array(), $reset = false) {
 		$table = $this->object_map_table;
 		$order = ' ORDER BY object_updated, created';
-		if ( ! empty( $conditions ) ) { // get multiple but with a limitation.
+		if ( ! empty($conditions)) { // get multiple but with a limitation.
 			$mappings = array();
 
-			if ( ! empty( $conditions ) ) {
+			if ( ! empty($conditions)) {
 				$where = ' WHERE ';
 				$i     = 0;
-				foreach ( $conditions as $key => $value ) {
+				foreach ($conditions as $key => $value) {
 					$i++;
-					if ( $i > 1 ) {
+					if ($i > 1) {
 						$where .= ' AND ';
 					}
 					$where .= '`' . $key . '` = "' . $value . '"';
@@ -506,13 +506,13 @@ 
 				$where = '';
 			}
 
-			$mappings = $this->wpdb->get_results( 'SELECT * FROM ' . $table . $where . $order, ARRAY_A );
-			if ( ! empty( $mappings ) && 1 === $this->wpdb->num_rows ) {
+			$mappings = $this->wpdb->get_results('SELECT * FROM ' . $table . $where . $order, ARRAY_A);
+			if ( ! empty($mappings) && 1 === $this->wpdb->num_rows) {
 				$mappings = $mappings[0];
 			}
 		} else { // get all of the mappings. ALL THE MAPPINGS.
-			$mappings = $this->wpdb->get_results( 'SELECT * FROM ' . $table . $order, ARRAY_A );
-			if ( ! empty( $mappings ) && 1 === $this->wpdb->num_rows ) {
+			$mappings = $this->wpdb->get_results('SELECT * FROM ' . $table . $order, ARRAY_A);
+			if ( ! empty($mappings) && 1 === $this->wpdb->num_rows) {
 				$mappings = $mappings[0];
 			}
 		}
@@ -529,10 +529,10 @@ 
 	 * @return $map
 	 * @throws \Exception
 	 */
-	public function update_object_map( $posted = array(), $id = '' ) {
-		$data = $this->setup_object_map_data( $posted );
-		if ( ! isset( $data['object_updated'] ) ) {
-			$data['object_updated'] = current_time( 'mysql' );
+	public function update_object_map($posted = array(), $id = '') {
+		$data = $this->setup_object_map_data($posted);
+		if ( ! isset($data['object_updated'])) {
+			$data['object_updated'] = current_time('mysql');
 		}
 		$update = $this->wpdb->update(
 			$this->object_map_table,
@@ -541,7 +541,7 @@ 
 				'id' => $id,
 			)
 		);
-		if ( false === $update ) {
+		if (false === $update) {
 			return false;
 		} else {
 			return true;
@@ -554,11 +554,11 @@ 
 	 * @param array $posted It's $_POST.
 	 * @return $data Filtered array with only the keys that are in the object map database table. Strips out things from WordPress form if they're present.
 	 */
-	private function setup_object_map_data( $posted = array() ) {
-		$allowed_fields   = $this->wpdb->get_col( "DESC {$this->object_map_table}", 0 );
+	private function setup_object_map_data($posted = array()) {
+		$allowed_fields   = $this->wpdb->get_col("DESC {$this->object_map_table}", 0);
 		$allowed_fields[] = 'action'; // we use this in both directions even though it isn't in the database; we remove it from the array later if it is present
 
-		$data = array_intersect_key( $posted, array_flip( $allowed_fields ) );
+		$data = array_intersect_key($posted, array_flip($allowed_fields));
 		return $data;
 	}
 
@@ -568,12 +568,12 @@ 
 	 * @param array $id The ID of the object map row.
 	 * @throws \Exception
 	 */
-	public function delete_object_map( $id = '' ) {
+	public function delete_object_map($id = '') {
 		$data   = array(
 			'id' => $id,
 		);
-		$delete = $this->wpdb->delete( $this->object_map_table, $data );
-		if ( 1 === $delete ) {
+		$delete = $this->wpdb->delete($this->object_map_table, $data);
+		if (1 === $delete) {
 			return true;
 		} else {
 			return false;
@@ -586,13 +586,13 @@ 
 	 * @param string $direction Whether this is part of a push or pull action
 	 * @return $id is a temporary string that will be replaced if the modification is successful
 	 */
-	public function generate_temporary_id( $direction ) {
-		if ( 'push' === $direction ) {
+	public function generate_temporary_id($direction) {
+		if ('push' === $direction) {
 			$prefix = 'tmp_sf_';
-		} elseif ( 'pull' === $direction ) {
+		} elseif ('pull' === $direction) {
 			$prefix = 'tmp_wp_';
 		}
-		$id = uniqid( $prefix, true );
+		$id = uniqid($prefix, true);
 		return $id;
 	}
 
@@ -606,12 +606,12 @@ 
 	 * @return SalesforceMappingObject
 	 *   The requested SalesforceMappingObject or FALSE if none was found.
 	 */
-	public function load_by_wordpress( $object_type, $object_id, $reset = false ) {
+	public function load_by_wordpress($object_type, $object_id, $reset = false) {
 		$conditions = array(
 			'wordpress_id'     => $object_id,
 			'wordpress_object' => $object_type,
 		);
-		return $this->get_object_maps( $conditions, $reset );
+		return $this->get_object_maps($conditions, $reset);
 	}
 
 	/**
@@ -623,24 +623,24 @@ 
 	 * @return array $map
 	 *   The most recent fieldmap
 	 */
-	public function load_by_salesforce( $salesforce_id, $reset = false ) {
+	public function load_by_salesforce($salesforce_id, $reset = false) {
 		$conditions = array(
 			'salesforce_id' => $salesforce_id,
 		);
 
-		$map = $this->get_object_maps( $conditions, $reset );
+		$map = $this->get_object_maps($conditions, $reset);
 
-		if ( isset( $map[0] ) && is_array( $map[0] ) && count( $map ) > 1 ) {
+		if (isset($map[0]) && is_array($map[0]) && count($map) > 1) {
 			$status = 'notice';
 			$log    = '';
 			$log   .= 'Mapping: there is more than one mapped WordPress object for the Salesforce object ' . $salesforce_id . '. These WordPress IDs are: ';
 			$i      = 0;
-			foreach ( $map as $mapping ) {
+			foreach ($map as $mapping) {
 				$i++;
-				if ( isset( $mapping['wordpress_id'] ) ) {
+				if (isset($mapping['wordpress_id'])) {
 					$log .= 'object type: ' . $mapping['wordpress_object'] . ', id: ' . $mapping['wordpress_id'];
 				}
-				if ( count( $map ) !== $i ) {
+				if (count($map) !== $i) {
 					$log .= '; ';
 				} else {
 					$log .= '.';
@@ -648,16 +648,16 @@ 
 			}
 			$map = $map[0];
 			// Create log entry for multiple maps.
-			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(
 				sprintf(
 					// translators: %1$s is the Id of a Salesforce object.
-					esc_html__( 'Notice: Mapping: there is more than one mapped WordPress object for the Salesforce object %2$s', 'object-sync-for-salesforce' ),
-					esc_attr( $salesforce_id )
+					esc_html__('Notice: Mapping: there is more than one mapped WordPress object for the Salesforce object %2$s', 'object-sync-for-salesforce'),
+					esc_attr($salesforce_id)
 				),
 				$log,
 				0,
@@ -680,20 +680,20 @@ 
 	 *
 	 * @return array Associative array of key value pairs.
 	 */
-	public function map_params( $mapping, $object, $trigger, $use_soap = false, $is_new = true ) {
+	public function map_params($mapping, $object, $trigger, $use_soap = false, $is_new = true) {
 
 		$params = array();
 
-		foreach ( $mapping['fields'] as $fieldmap ) {
+		foreach ($mapping['fields'] as $fieldmap) {
 
-			$wordpress_haystack  = array_values( $this->wordpress_events );
-			$salesforce_haystack = array_values( $this->salesforce_events );
+			$wordpress_haystack  = array_values($this->wordpress_events);
+			$salesforce_haystack = array_values($this->salesforce_events);
 
-			$fieldmap['wordpress_field']['methods'] = maybe_unserialize( $fieldmap['wordpress_field']['methods'] );
+			$fieldmap['wordpress_field']['methods'] = maybe_unserialize($fieldmap['wordpress_field']['methods']);
 
 			$wordpress_field = $fieldmap['wordpress_field']['label'];
 
-			if ( version_compare( $this->version, '1.2.0', '>=' ) && isset( $fieldmap['salesforce_field']['name'] ) ) {
+			if (version_compare($this->version, '1.2.0', '>=') && isset($fieldmap['salesforce_field']['name'])) {
 				$salesforce_field = $fieldmap['salesforce_field']['name'];
 				// Load the type of the Salesforce field. We can use this to handle Salesforce field value issues that come up based on what the field sends into WordPress or expects from WordPress.
 				$salesforce_field_type = $fieldmap['salesforce_field']['type'];
@@ -702,113 +702,113 @@ 
 			}
 
 			// A WordPress event caused this.
-			if ( in_array( $trigger, array_values( $wordpress_haystack ), true ) ) {
+			if (in_array($trigger, array_values($wordpress_haystack), true)) {
 
 				// Is the field in WordPress an array, if we unserialize it? Salesforce wants it to be an imploded string.
-				if ( is_array( maybe_unserialize( $object[ $wordpress_field ] ) ) ) {
-					$object[ $wordpress_field ] = implode( $this->array_delimiter, $object[ $wordpress_field ] );
+				if (is_array(maybe_unserialize($object[$wordpress_field]))) {
+					$object[$wordpress_field] = implode($this->array_delimiter, $object[$wordpress_field]);
 				}
 
-				if ( isset( $salesforce_field_type ) ) {
+				if (isset($salesforce_field_type)) {
 					// Is the Salesforce field a date, and is the WordPress value a valid date?
 					// According to https://salesforce.stackexchange.com/questions/57032/date-format-with-salesforce-rest-api
-					if ( in_array( $salesforce_field_type, $this->date_types_from_salesforce ) ) {
-						if ( '' === $object[ $wordpress_field ] ) {
-							$object[ $wordpress_field ] = null;
+					if (in_array($salesforce_field_type, $this->date_types_from_salesforce)) {
+						if ('' === $object[$wordpress_field]) {
+							$object[$wordpress_field] = null;
 						} else {
-							if ( false !== strtotime( $object[ $wordpress_field ] ) ) {
-								$timestamp = strtotime( $object[ $wordpress_field ] );
+							if (false !== strtotime($object[$wordpress_field])) {
+								$timestamp = strtotime($object[$wordpress_field]);
 							} else {
-								$timestamp = $object[ $wordpress_field ];
+								$timestamp = $object[$wordpress_field];
 							}
-							if ( 'datetime' === $salesforce_field_type ) {
-								$object[ $wordpress_field ] = date_i18n( 'c', $timestamp );
+							if ('datetime' === $salesforce_field_type) {
+								$object[$wordpress_field] = date_i18n('c', $timestamp);
 							} else {
-								$object[ $wordpress_field ] = date_i18n( 'Y-m-d', $timestamp );
+								$object[$wordpress_field] = date_i18n('Y-m-d', $timestamp);
 							}
 						}
 					}
 
 					// Boolean SF fields only want real boolean values. NULL is also not allowed.
-					if ( 'boolean' === $salesforce_field_type ) {
-						$object[ $wordpress_field ] = (bool) $object[ $wordpress_field ];
+					if ('boolean' === $salesforce_field_type) {
+						$object[$wordpress_field] = (bool) $object[$wordpress_field];
 					}
 				}
 
-				$params[ $salesforce_field ] = $object[ $wordpress_field ];
+				$params[$salesforce_field] = $object[$wordpress_field];
 
 				// If the field is a key in Salesforce, remove it from $params to avoid upsert errors from Salesforce,
 				// but still put its name in the params array so we can check for it later.
-				if ( '1' === $fieldmap['is_key'] ) {
-					if ( ! $use_soap ) {
-						unset( $params[ $salesforce_field ] );
+				if ('1' === $fieldmap['is_key']) {
+					if ( ! $use_soap) {
+						unset($params[$salesforce_field]);
 					}
 					$params['key'] = array(
 						'salesforce_field' => $salesforce_field,
 						'wordpress_field'  => $wordpress_field,
-						'value'            => $object[ $wordpress_field ],
+						'value'            => $object[$wordpress_field],
 					);
 				}
 
 				// If the field is a prematch in Salesforce, put its name in the params array so we can check for it later.
-				if ( '1' === $fieldmap['is_prematch'] ) {
+				if ('1' === $fieldmap['is_prematch']) {
 					$params['prematch'] = array(
 						'salesforce_field' => $salesforce_field,
 						'wordpress_field'  => $wordpress_field,
-						'value'            => $object[ $wordpress_field ],
+						'value'            => $object[$wordpress_field],
 					);
 				}
 
 				// Skip fields that aren't being pushed to Salesforce.
-				if ( ! in_array( $fieldmap['direction'], array_values( $this->direction_wordpress ), true ) ) {
+				if ( ! in_array($fieldmap['direction'], array_values($this->direction_wordpress), true)) {
 					// The trigger is a WordPress trigger, but the fieldmap direction is not a WordPress direction.
-					unset( $params[ $salesforce_field ] );
+					unset($params[$salesforce_field]);
 				}
 
 				// I think it's good to over-mention that updateable is really how the Salesforce api spells it.
 				// Skip fields that aren't updateable when mapping params because Salesforce will error otherwise.
 				// This happens after dealing with the field types because key and prematch should still be available to the plugin, even if the values are not updateable in Salesforce.
-				if ( 1 !== (int) $fieldmap['salesforce_field']['updateable'] ) {
-					unset( $params[ $salesforce_field ] );
+				if (1 !== (int) $fieldmap['salesforce_field']['updateable']) {
+					unset($params[$salesforce_field]);
 				}
 
 				// we don't need a continue with the unset methods because there's no array being created down here
-			} elseif ( in_array( $trigger, $salesforce_haystack, true ) ) {
+			} elseif (in_array($trigger, $salesforce_haystack, true)) {
 
 				// A Salesforce event caused this.
 
-				if ( isset( $salesforce_field_type ) && ! is_null( $object[ $salesforce_field ] ) ) {
+				if (isset($salesforce_field_type) && ! is_null($object[$salesforce_field])) {
 					// Salesforce provides multipicklist values as a delimited string. If the
 					// destination field in WordPress accepts multiple values, explode the string into an array and then serialize it.
-					if ( in_array( $salesforce_field_type, $this->array_types_from_salesforce ) ) {
-						$object[ $salesforce_field ] = explode( $this->array_delimiter, $object[ $salesforce_field ] );
+					if (in_array($salesforce_field_type, $this->array_types_from_salesforce)) {
+						$object[$salesforce_field] = explode($this->array_delimiter, $object[$salesforce_field]);
 					}
 
 					// Handle specific data types from Salesforce.
-					switch ( $salesforce_field_type ) {
-						case ( in_array( $salesforce_field_type, $this->date_types_from_salesforce ) ):
-							$format = get_option( 'date_format', 'U' );
-							if ( isset( $fieldmap['wordpress_field']['type'] ) && 'datetime' === $fieldmap['wordpress_field']['type'] ) {
+					switch ($salesforce_field_type) {
+						case (in_array($salesforce_field_type, $this->date_types_from_salesforce)):
+							$format = get_option('date_format', 'U');
+							if (isset($fieldmap['wordpress_field']['type']) && 'datetime' === $fieldmap['wordpress_field']['type']) {
 								$format = 'Y-m-d H:i:s';
 							}
-							$object[ $salesforce_field ] = date_i18n( $format, strtotime( $object[ $salesforce_field ] ) );
+							$object[$salesforce_field] = date_i18n($format, strtotime($object[$salesforce_field]));
 							break;
-						case ( in_array( $salesforce_field_type, $this->int_types_from_salesforce ) ):
-							$object[ $salesforce_field ] = isset( $object[ $salesforce_field ] ) ? (int) $object[ $salesforce_field ] : 0;
+						case (in_array($salesforce_field_type, $this->int_types_from_salesforce)):
+							$object[$salesforce_field] = isset($object[$salesforce_field]) ? (int) $object[$salesforce_field] : 0;
 							break;
 						case 'text':
-							$object[ $salesforce_field ] = (string) $object[ $salesforce_field ];
+							$object[$salesforce_field] = (string) $object[$salesforce_field];
 							break;
 						case 'url':
-							$object[ $salesforce_field ] = esc_url_raw( $object[ $salesforce_field ] );
+							$object[$salesforce_field] = esc_url_raw($object[$salesforce_field]);
 							break;
 					}
 				}
 
 				// Make an array because we need to store the methods for each field as well.
-				if ( '' !== $object[ $salesforce_field ] ) {
-					$params[ $wordpress_field ]          = array();
-					$params[ $wordpress_field ]['value'] = $object[ $salesforce_field ];
+				if ('' !== $object[$salesforce_field]) {
+					$params[$wordpress_field]          = array();
+					$params[$wordpress_field]['value'] = $object[$salesforce_field];
 				} else {
 					// If we try to save certain fields with empty values, WordPress will silently start skipping stuff. This keeps that from happening.
 					continue;
@@ -817,11 +817,11 @@ 
 				// If the field is a key in Salesforce, disregard since this is caused by a Salesforce event. We're setting up data to be stored in WordPress here, and WordPress is not concerned with external key designations in Salesforce.
 
 				// If the field is a prematch in Salesforce, put its name in the params array so we can check for it later.
-				if ( '1' === $fieldmap['is_prematch'] ) {
+				if ('1' === $fieldmap['is_prematch']) {
 					$params['prematch'] = array(
 						'salesforce_field' => $salesforce_field,
 						'wordpress_field'  => $wordpress_field,
-						'value'            => $object[ $salesforce_field ],
+						'value'            => $object[$salesforce_field],
 						'method_read'      => $fieldmap['wordpress_field']['methods']['read'],
 						'method_create'    => $fieldmap['wordpress_field']['methods']['create'],
 						'method_update'    => $fieldmap['wordpress_field']['methods']['update'],
@@ -829,26 +829,26 @@ 
 				}
 
 				// Skip fields that aren't being pulled from Salesforce.
-				if ( ! in_array( $fieldmap['direction'], array_values( $this->direction_salesforce ), true ) ) {
+				if ( ! in_array($fieldmap['direction'], array_values($this->direction_salesforce), true)) {
 					// The trigger is a Salesforce trigger, but the fieldmap direction is not a Salesforce direction.
-					unset( $params[ $wordpress_field ] );
+					unset($params[$wordpress_field]);
 					// we also need to continue here, so it doesn't create an empty array below for fields that are WordPress -> Salesforce only
 					continue;
 				}
 
-				switch ( $trigger ) {
+				switch ($trigger) {
 					case $this->sync_sf_create:
-						$params[ $wordpress_field ]['method_modify'] = $fieldmap['wordpress_field']['methods']['create'];
+						$params[$wordpress_field]['method_modify'] = $fieldmap['wordpress_field']['methods']['create'];
 						break;
 					case $this->sync_sf_update:
-						$params[ $wordpress_field ]['method_modify'] = $fieldmap['wordpress_field']['methods']['update'];
+						$params[$wordpress_field]['method_modify'] = $fieldmap['wordpress_field']['methods']['update'];
 						break;
 					case $this->sync_sf_delete:
-						$params[ $wordpress_field ]['method_modify'] = $fieldmap['wordpress_field']['methods']['delete'];
+						$params[$wordpress_field]['method_modify'] = $fieldmap['wordpress_field']['methods']['delete'];
 						break;
 				}
 
-				$params[ $wordpress_field ]['method_read'] = $fieldmap['wordpress_field']['methods']['read'];
+				$params[$wordpress_field]['method_read'] = $fieldmap['wordpress_field']['methods']['read'];
 
 			} // End if().
 		} // End foreach().
@@ -865,14 +865,14 @@ 
 	 *
 	 * @return array $mappings Associative array of field maps ready to use
 	 */
-	private function prepare_fieldmap_data( $mappings, $record_type = '' ) {
-
-		foreach ( $mappings as $id => $mapping ) {
-			$mappings[ $id ]['salesforce_record_types_allowed'] = maybe_unserialize( $mapping['salesforce_record_types_allowed'] );
-			$mappings[ $id ]['fields']                          = maybe_unserialize( $mapping['fields'] );
-			$mappings[ $id ]['sync_triggers']                   = maybe_unserialize( $mapping['sync_triggers'] );
-			if ( '' !== $record_type && ! in_array( $record_type, $mappings[ $id ]['salesforce_record_types_allowed'], true ) ) {
-				unset( $mappings[ $id ] );
+	private function prepare_fieldmap_data($mappings, $record_type = '') {
+
+		foreach ($mappings as $id => $mapping) {
+			$mappings[$id]['salesforce_record_types_allowed'] = maybe_unserialize($mapping['salesforce_record_types_allowed']);
+			$mappings[$id]['fields']                          = maybe_unserialize($mapping['fields']);
+			$mappings[$id]['sync_triggers']                   = maybe_unserialize($mapping['sync_triggers']);
+			if ('' !== $record_type && ! in_array($record_type, $mappings[$id]['salesforce_record_types_allowed'], true)) {
+				unset($mappings[$id]);
 			}
 		}
 
@@ -888,12 +888,12 @@ 
 	public function get_failed_object_maps() {
 		$table       = $this->object_map_table;
 		$errors      = array();
-		$push_errors = $this->wpdb->get_results( 'SELECT * FROM ' . $table . ' WHERE salesforce_id LIKE "tmp_sf_%"', ARRAY_A );
-		$pull_errors = $this->wpdb->get_results( 'SELECT * FROM ' . $table . ' WHERE wordpress_id LIKE "tmp_wp_%"', ARRAY_A );
-		if ( ! empty( $push_errors ) ) {
+		$push_errors = $this->wpdb->get_results('SELECT * FROM ' . $table . ' WHERE salesforce_id LIKE "tmp_sf_%"', ARRAY_A);
+		$pull_errors = $this->wpdb->get_results('SELECT * FROM ' . $table . ' WHERE wordpress_id LIKE "tmp_wp_%"', ARRAY_A);
+		if ( ! empty($push_errors)) {
 			$errors['push_errors'] = $push_errors;
 		}
-		if ( ! empty( $pull_errors ) ) {
+		if ( ! empty($pull_errors)) {
 			$errors['pull_errors'] = $pull_errors;
 		}
 		return $errors;
@@ -906,11 +906,11 @@ 
 	 *
 	 * @return array $error Associative array of single row that failed to finish based on id
 	 */
-	public function get_failed_object_map( $id ) {
+	public function get_failed_object_map($id) {
 		$table     = $this->object_map_table;
 		$error     = array();
-		$error_row = $this->wpdb->get_row( 'SELECT * FROM ' . $table . ' WHERE id = "' . $id . '"', ARRAY_A );
-		if ( ! empty( $error_row ) ) {
+		$error_row = $this->wpdb->get_row('SELECT * FROM ' . $table . ' WHERE id = "' . $id . '"', ARRAY_A);
+		if ( ! empty($error_row)) {
 			$error = $error_row;
 		}
 		return $error;

object-sync-for-salesforce.php

Indentation +103 added lines, -103 removed lines

@@ -16,81 +16,81 @@ 
 class Object_Sync_Salesforce {
 
 	/**
-	* @var object
-	* Global object of `$wpdb`, the WordPress database
-	*/
+	 * @var object
+	 * Global object of `$wpdb`, the WordPress database
+	 */
 	private $wpdb;
 
 	/**
-	* @var array
-	* Login credentials for the Salesforce API; comes from wp-config or from the plugin settings
-	*/
+	 * @var array
+	 * Login credentials for the Salesforce API; comes from wp-config or from the plugin settings
+	 */
 	private $login_credentials;
 
 	/**
-	* @var string
-	* The plugin's slug so we can include it when necessary
-	*/
+	 * @var string
+	 * The plugin's slug so we can include it when necessary
+	 */
 	private $slug;
 
 	/**
-	* @var string
-	* The plugin's option prefix
-	*/
+	 * @var string
+	 * The plugin's option prefix
+	 */
 	private $option_prefix;
 
 	/**
-	* @var array
-	* Array of what classes in the plugin can be scheduled to occur with `wp_cron` events
-	*/
+	 * @var array
+	 * Array of what classes in the plugin can be scheduled to occur with `wp_cron` events
+	 */
 	public $schedulable_classes;
 
 	/**
-	* @var string
-	* Current version of the plugin
-	*/
+	 * @var string
+	 * Current version of the plugin
+	 */
 	private $version;
 
 	/**
-	* @var object
-	*/
+	 * @var object
+	 */
 	private $activated;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Logging class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Logging class
+	 */
 	private $logging;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Mapping class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Mapping class
+	 */
 	private $mappings;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_WordPress class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_WordPress class
+	 */
 	private $wordpress;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Salesforce class.
-	* This contains the Salesforce API methods
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Salesforce class.
+	 * This contains the Salesforce API methods
+	 */
 	public $salesforce;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Salesforce_Push class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Salesforce_Push class
+	 */
 	private $push;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Salesforce_Pull class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Salesforce_Pull class
+	 */
 	private $pull;
 
 	/**
@@ -101,13 +101,13 @@ 
 	static $instance = null;
 
 	/**
-	* Load the static $instance property that holds the instance of the class.
-	* This instance makes the class reusable by other plugins
-	*
-	* @return object
-	*   The sfapi object if it is authenticated (empty, otherwise)
-	*
-	*/
+	 * Load the static $instance property that holds the instance of the class.
+	 * This instance makes the class reusable by other plugins
+	 *
+	 * @return object
+	 *   The sfapi object if it is authenticated (empty, otherwise)
+	 *
+	 */
 	static public function get_instance() {
 		if ( null === self::$instance ) {
 			self::$instance = new Object_Sync_Salesforce();
@@ -257,18 +257,18 @@ 
 	}
 
 	/**
-	* Private helper to load methods for manipulating core WordPress data across the plugin
-	*
-	* @param object $wpdb
-	* @param string $version
-	* @param string $slug
-	* @param string $option_prefix
-	* @param object $mappings
-	* @param object $logging
-	*
-	* @return object
-	*   Instance of Object_Sync_Sf_WordPress
-	*/
+	 * Private helper to load methods for manipulating core WordPress data across the plugin
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param string $slug
+	 * @param string $option_prefix
+	 * @param object $mappings
+	 * @param object $logging
+	 *
+	 * @return object
+	 *   Instance of Object_Sync_Sf_WordPress
+	 */
 	private function wordpress( $wpdb, $version, $slug, $option_prefix, $mappings, $logging ) {
 		require_once plugin_dir_path( __FILE__ ) . 'classes/wordpress.php';
 		$wordpress = new Object_Sync_Sf_WordPress( $wpdb, $version, $slug, $option_prefix, $mappings, $logging );
@@ -276,13 +276,13 @@ 
 	}
 
 	/**
-	* Public helper to load the Salesforce API and see if it is authenticated.
-	* This is public so other plugins can access the same SF API instance
-	*
-	* @return array
-	*   Whether Salesforce is authenticated (boolean)
-	*   The sfapi object if it is authenticated (empty, otherwise)
-	*/
+	 * Public helper to load the Salesforce API and see if it is authenticated.
+	 * This is public so other plugins can access the same SF API instance
+	 *
+	 * @return array
+	 *   Whether Salesforce is authenticated (boolean)
+	 *   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
@@ -391,26 +391,26 @@ 
 	}
 
 	/**
-	* Load the admin class.
-	* This also creates admin menu, unless the plugin that calls this library has indicated that it has its own menu
-	*
-	* @param object $wpdb
-	* @param string $version
-	* @param array $login_credentials
-	* @param string $slug
-	* @param string $option_prefix
-	* @param object $wordpress
-	* @param object $salesforce
-	* @param object $mappings
-	* @param object $push
-	* @param object $pull
-	* @param object $logging
-	* @param array $schedulable_classes
-	* @param object $queue
-	* @return object $admin
-	*   Instance of Object_Sync_Sf_Admin
-	*
-	*/
+	 * Load the admin class.
+	 * This also creates admin menu, unless the plugin that calls this library has indicated that it has its own menu
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param array $login_credentials
+	 * @param string $slug
+	 * @param string $option_prefix
+	 * @param object $wordpress
+	 * @param object $salesforce
+	 * @param object $mappings
+	 * @param object $push
+	 * @param object $pull
+	 * @param object $logging
+	 * @param array $schedulable_classes
+	 * @param object $queue
+	 * @return object $admin
+	 *   Instance of Object_Sync_Sf_Admin
+	 *
+	 */
 	private function load_admin( $wpdb, $version, $login_credentials, $slug, $option_prefix, $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, $option_prefix, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes, $queue );
@@ -422,13 +422,13 @@ 
 	}
 
 	/**
-	* Display a Settings link on the main Plugins page
-	*
-	* @param array $links
-	* @param string $file
-	* @return array $links
-	*   These are the links that go with this plugin's entry
-	*/
+	 * Display a Settings link on the main Plugins page
+	 *
+	 * @param array $links
+	 * @param string $file
+	 * @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>';
@@ -440,10 +440,10 @@ 
 
 
 	/**
-	* Admin styles. Load the CSS and JavaScript for the plugin's settings
-	*
-	* @return void
-	*/
+	 * Admin styles. Load the CSS and JavaScript for the plugin's settings
+	 *
+	 * @return void
+	 */
 	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
@@ -484,13 +484,13 @@ 
 	}
 
 	/**
-	* Get the pre-login Salesforce credentials.
-	* These depend on the plugin's settings or constants defined in wp-config.php.
-	*
-	* @return array $login_credentials
-	*   Includes all settings necessary to log into the Salesforce API.
-	*   Replaces settings options with wp-config.php values if they exist.
-	*/
+	 * Get the pre-login Salesforce credentials.
+	 * These depend on the plugin's settings or constants defined in wp-config.php.
+	 *
+	 * @return array $login_credentials
+	 *   Includes all settings necessary to log into the Salesforce API.
+	 *   Replaces settings options with wp-config.php values if they exist.
+	 */
 	private function get_login_credentials() {
 
 		$consumer_key       = defined( 'OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY' ) ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY : get_option( $this->option_prefix . 'consumer_key', '' );

Spacing +69 added lines, -69 removed lines

@@ -109,7 +109,7 @@ 
 	*
 	*/
 	static public function get_instance() {
-		if ( null === self::$instance ) {
+		if (null === self::$instance) {
 			self::$instance = new Object_Sync_Salesforce();
 		}
 		return self::$instance;
@@ -145,7 +145,7 @@ 
 		);
 
 		// users can modify the list of schedulable classes
-		$this->schedulable_classes = apply_filters( $this->option_prefix . 'modify_schedulable_classes', $this->schedulable_classes );
+		$this->schedulable_classes = apply_filters($this->option_prefix . 'modify_schedulable_classes', $this->schedulable_classes);
 
 		/*
 		 * example to modify the array of classes by adding one and removing one
@@ -170,25 +170,25 @@ 
 		 * }
 		*/
 
-		$this->load = $this->load( $this->wpdb, $this->version, $this->slug, $this->option_prefix );
+		$this->load = $this->load($this->wpdb, $this->version, $this->slug, $this->option_prefix);
 
-		$this->queue = $this->queue( $this->wpdb, $this->version, $this->slug, $this->option_prefix, $this->schedulable_classes );
+		$this->queue = $this->queue($this->wpdb, $this->version, $this->slug, $this->option_prefix, $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->slug, $this->option_prefix );
+		$this->logging = $this->logging($this->wpdb, $this->version, $this->slug, $this->option_prefix);
 
-		$this->mappings = $this->mappings( $this->wpdb, $this->version, $this->slug, $this->option_prefix, $this->logging );
+		$this->mappings = $this->mappings($this->wpdb, $this->version, $this->slug, $this->option_prefix, $this->logging);
 
-		$this->wordpress  = $this->wordpress( $this->wpdb, $this->version, $this->slug, $this->option_prefix, $this->mappings, $this->logging );
+		$this->wordpress  = $this->wordpress($this->wpdb, $this->version, $this->slug, $this->option_prefix, $this->mappings, $this->logging);
 		$this->salesforce = $this->salesforce_get_api();
 
-		$this->push = $this->push( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->option_prefix, $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->option_prefix, $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->option_prefix, $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->option_prefix, $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->option_prefix, $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->option_prefix, $this->wordpress, $this->salesforce, $this->mappings, $this->push, $this->pull, $this->logging, $this->schedulable_classes, $this->queue);
 
 	}
 
@@ -201,8 +201,8 @@ 
 	 * @param string $option_prefix
 	 *
 	 */
-	private function load( $wpdb, $version, $slug, $option_prefix ) {
-		require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';
+	private function load($wpdb, $version, $slug, $option_prefix) {
+		require_once plugin_dir_path(__FILE__) . 'vendor/autoload.php';
 	}
 
 	/**
@@ -215,9 +215,9 @@ 
 	 * @param array $schedulable_classes
 	 * @return Object_Sync_Sf_Queue
 	 */
-	public function queue( $wpdb, $version, $slug, $option_prefix, $schedulable_classes ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/class-object-sync-sf-queue.php';
-		$queue = new Object_Sync_Sf_Queue( $wpdb, $version, $slug, $option_prefix, $schedulable_classes );
+	public function queue($wpdb, $version, $slug, $option_prefix, $schedulable_classes) {
+		require_once plugin_dir_path(__FILE__) . 'classes/class-object-sync-sf-queue.php';
+		$queue = new Object_Sync_Sf_Queue($wpdb, $version, $slug, $option_prefix, $schedulable_classes);
 		return $queue;
 	}
 
@@ -232,9 +232,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Logging
 	 */
-	private function logging( $wpdb, $version, $slug, $option_prefix ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/logging.php';
-		$logging = new Object_Sync_Sf_Logging( $wpdb, $version, $slug, $option_prefix );
+	private function logging($wpdb, $version, $slug, $option_prefix) {
+		require_once plugin_dir_path(__FILE__) . 'classes/logging.php';
+		$logging = new Object_Sync_Sf_Logging($wpdb, $version, $slug, $option_prefix);
 		return $logging;
 	}
 
@@ -250,9 +250,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Mapping
 	 */
-	private function mappings( $wpdb, $version, $slug, $option_prefix, $logging ) {
-		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce_mapping.php' );
-		$mappings = new Object_Sync_Sf_Mapping( $wpdb, $version, $slug, $option_prefix, $logging );
+	private function mappings($wpdb, $version, $slug, $option_prefix, $logging) {
+		require_once(plugin_dir_path(__FILE__) . 'classes/salesforce_mapping.php');
+		$mappings = new Object_Sync_Sf_Mapping($wpdb, $version, $slug, $option_prefix, $logging);
 		return $mappings;
 	}
 
@@ -269,9 +269,9 @@ 
 	* @return object
 	*   Instance of Object_Sync_Sf_WordPress
 	*/
-	private function wordpress( $wpdb, $version, $slug, $option_prefix, $mappings, $logging ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/wordpress.php';
-		$wordpress = new Object_Sync_Sf_WordPress( $wpdb, $version, $slug, $option_prefix, $mappings, $logging );
+	private function wordpress($wpdb, $version, $slug, $option_prefix, $mappings, $logging) {
+		require_once plugin_dir_path(__FILE__) . 'classes/wordpress.php';
+		$wordpress = new Object_Sync_Sf_WordPress($wpdb, $version, $slug, $option_prefix, $mappings, $logging);
 		return $wordpress;
 	}
 
@@ -284,8 +284,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'];
@@ -300,9 +300,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, $option_prefix, $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, $option_prefix, $logging, $schedulable_classes);
+			if ($sfapi->is_authorized() === true) {
 				$is_authorized = true;
 			}
 		}
@@ -322,9 +322,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;
 	}
 
@@ -339,9 +339,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);
 	}
 
 
@@ -362,9 +362,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Salesforce_Push
 	 */
-	private function push( $wpdb, $version, $login_credentials, $slug, $option_prefix, $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, $option_prefix, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue );
+	private function push($wpdb, $version, $login_credentials, $slug, $option_prefix, $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, $option_prefix, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue);
 		return $push;
 	}
 
@@ -384,9 +384,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Salesforce_Pull
 	 */
-	private function pull( $wpdb, $version, $login_credentials, $slug, $option_prefix, $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, $option_prefix, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue );
+	private function pull($wpdb, $version, $login_credentials, $slug, $option_prefix, $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, $option_prefix, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes, $queue);
 		return $pull;
 	}
 
@@ -411,13 +411,13 @@ 
 	*   Instance of Object_Sync_Sf_Admin
 	*
 	*/
-	private function load_admin( $wpdb, $version, $login_credentials, $slug, $option_prefix, $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, $option_prefix, $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, $option_prefix, $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, $option_prefix, $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;
 	}
 
@@ -429,11 +429,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;
 	}
@@ -447,7 +447,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( $this->option_prefix . 'select_library', 'selectwoo' );
+		$select_library = apply_filters($this->option_prefix . 'select_library', 'selectwoo');
 
 		/*
 		 * example to modify the select library
@@ -459,19 +459,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');
 	}
 
 	/**
@@ -480,7 +480,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/');
 	}
 
 	/**
@@ -493,13 +493,13 @@ 
 	*/
 	private function get_login_credentials() {
 
-		$consumer_key       = defined( 'OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY' ) ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY : get_option( $this->option_prefix . 'consumer_key', '' );
-		$consumer_secret    = defined( 'OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET' ) ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET : get_option( $this->option_prefix . 'consumer_secret', '' );
-		$callback_url       = defined( 'OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL' ) ? OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL : get_option( $this->option_prefix . 'callback_url', '' );
-		$login_base_url     = defined( 'OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL' ) ? OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL : get_option( $this->option_prefix . 'login_base_url', '' );
-		$authorize_url_path = defined( 'OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH' ) ? OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH : get_option( $this->option_prefix . 'authorize_url_path', '' );
-		$token_url_path     = defined( 'OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH' ) ? OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH : get_option( $this->option_prefix . 'token_url_path', '' );
-		$api_version        = defined( 'OBJECT_SYNC_SF_SALESFORCE_API_VERSION' ) ? OBJECT_SYNC_SF_SALESFORCE_API_VERSION : get_option( $this->option_prefix . 'api_version', '' );
+		$consumer_key       = defined('OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY') ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY : get_option($this->option_prefix . 'consumer_key', '');
+		$consumer_secret    = defined('OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET') ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET : get_option($this->option_prefix . 'consumer_secret', '');
+		$callback_url       = defined('OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL') ? OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL : get_option($this->option_prefix . 'callback_url', '');
+		$login_base_url     = defined('OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL') ? OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL : get_option($this->option_prefix . 'login_base_url', '');
+		$authorize_url_path = defined('OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH') ? OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH : get_option($this->option_prefix . 'authorize_url_path', '');
+		$token_url_path     = defined('OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH') ? OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH : get_option($this->option_prefix . 'token_url_path', '');
+		$api_version        = defined('OBJECT_SYNC_SF_SALESFORCE_API_VERSION') ? OBJECT_SYNC_SF_SALESFORCE_API_VERSION : get_option($this->option_prefix . 'api_version', '');
 
 		$login_credentials = array(
 			'consumer_key'     => $consumer_key,