MinnPost / object-sync-for-salesforce

templates/admin/user-profile-salesforce-change.php

Spacing +5 added lines, -5 removed lines

@@ -1,12 +1,12 @@
 <input type="hidden" name="salesforce_update_mapped_user" value="1" />
-<h2><?php echo esc_html__( 'Salesforce', 'object-sync-for-salesforce' ); ?></h2>
-<p><?php echo esc_html__( 'You can change the Salesforce object that this WordPress user maps to by changing the ID and updating this user.', 'object-sync-for-salesforce' ); ?></p>
+<h2><?php echo esc_html__('Salesforce', 'object-sync-for-salesforce'); ?></h2>
+<p><?php echo esc_html__('You can change the Salesforce object that this WordPress user maps to by changing the ID and updating this user.', 'object-sync-for-salesforce'); ?></p>
 <table class="form-table">
 	<tr>
-		<th><label for="salesforce_id"><?php echo esc_html__( 'Salesforce ID', 'object-sync-for-salesforce' ); ?></label></th>
+		<th><label for="salesforce_id"><?php echo esc_html__('Salesforce ID', 'object-sync-for-salesforce'); ?></label></th>
 		<td>
-			<input type="text" name="salesforce_id" id="salesforce_id" value="<?php if ( isset( $mapping['id'] ) ) { echo esc_html( $mapping['salesforce_id'] ); } ?>" class="regular-text" /><br />
-			<span class="description"><?php echo esc_html__( 'Enter a Salesforce object ID.', 'object-sync-for-salesforce' ); ?></span>
+			<input type="text" name="salesforce_id" id="salesforce_id" value="<?php if (isset($mapping['id'])) { echo esc_html($mapping['salesforce_id']); } ?>" class="regular-text" /><br />
+			<span class="description"><?php echo esc_html__('Enter a Salesforce object ID.', 'object-sync-for-salesforce'); ?></span>
 		</td>
 	</tr>
 </table>

templates/admin/authorized.php

Spacing +2 added lines, -2 removed lines

@@ -1,2 +1,2 @@
-<div class="success"><h2><?php echo esc_html__( 'Salesforce is successfully authenticated.' ); ?></h2></div>
-<p><a class="button button-primary" href="<?php echo esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=logout' ) ); ?>"><?php echo esc_html__( 'Disconnect from Salesforce', 'object-sync-for-salesforce' ); ?></a></p>
+<div class="success"><h2><?php echo esc_html__('Salesforce is successfully authenticated.'); ?></h2></div>
+<p><a class="button button-primary" href="<?php echo esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=logout')); ?>"><?php echo esc_html__('Disconnect from Salesforce', 'object-sync-for-salesforce'); ?></a></p>

templates/admin/user-profile-salesforce-map.php

Spacing +5 added lines, -5 removed lines

@@ -1,14 +1,14 @@
 <input type="hidden" name="salesforce_create_mapped_user" value="1" />
-<h2><?php echo esc_html__( 'Salesforce', 'object-sync-for-salesforce' ); ?></h2>
-<p><?php echo esc_html__( "This user is not mapped to an object in Salesforce. You can run a push to send this object to Salesforce, which will cause it to follow the plugin's normal mapping conventions, or you can create a manual link to a Salesforce object.", 'object-sync-for-salesforce' ); ?></p>
+<h2><?php echo esc_html__('Salesforce', 'object-sync-for-salesforce'); ?></h2>
+<p><?php echo esc_html__("This user is not mapped to an object in Salesforce. You can run a push to send this object to Salesforce, which will cause it to follow the plugin's normal mapping conventions, or you can create a manual link to a Salesforce object.", 'object-sync-for-salesforce'); ?></p>
 <table class="form-table">
 	<tr>
-		<th><label for="salesforce_id"><?php echo esc_html__( 'Salesforce ID', 'object-sync-for-salesforce' ); ?></label></th>
+		<th><label for="salesforce_id"><?php echo esc_html__('Salesforce ID', 'object-sync-for-salesforce'); ?></label></th>
 		<td>
 			<input type="text" name="salesforce_id" id="salesforce_id" value="" class="regular-text" /><br />
-			<span class="description"><?php echo esc_html__( 'Enter a Salesforce object ID.', 'object-sync-for-salesforce' ); ?></span>
+			<span class="description"><?php echo esc_html__('Enter a Salesforce object ID.', 'object-sync-for-salesforce'); ?></span>
 			<p><strong>or</strong></p>
-			<p><button type="submit" class="button button-secondary push_to_salesforce_button" name="push_new_user_to_salesforce"><?php echo esc_html__( 'Push to Salesforce as new record', 'object-sync-for-salesforce' ); ?></button></p>
+			<p><button type="submit" class="button button-secondary push_to_salesforce_button" name="push_new_user_to_salesforce"><?php echo esc_html__('Push to Salesforce as new record', 'object-sync-for-salesforce'); ?></button></p>
 		</td>
 	</tr>
 </table>

classes/salesforce_query.php

Indentation +23 added lines, -23 removed lines

@@ -22,27 +22,27 @@ 
 	public $conditions = array();
 
 	/**
-	* Constructor which sets the query object type.
-	*
-	* @param string $object_type
-	*   Salesforce object type to query.
-	*/
+	 * Constructor which sets the query object type.
+	 *
+	 * @param string $object_type
+	 *   Salesforce object type to query.
+	 */
 	public function __construct( $object_type = '' ) {
 		$this->object_type = $object_type;
 	}
 
 	/**
-	* Add a condition to the query.
-	*
-	* @param string $field
-	*   Field name.
-	* @param mixed $value
-	*   Condition value. If an array, it will be split into quote enclosed
-	*   strings separated by commas inside of parenthesis. Note that the caller
-	*   must enclose the value in quotes as needed by the SF API.
-	* @param string $operator
-	*   Conditional operator. One of '=', '!=', '<', '>', 'LIKE, 'IN', 'NOT IN'.
-	*/
+	 * Add a condition to the query.
+	 *
+	 * @param string $field
+	 *   Field name.
+	 * @param mixed $value
+	 *   Condition value. If an array, it will be split into quote enclosed
+	 *   strings separated by commas inside of parenthesis. Note that the caller
+	 *   must enclose the value in quotes as needed by the SF API.
+	 * @param string $operator
+	 *   Conditional operator. One of '=', '!=', '<', '>', 'LIKE, 'IN', 'NOT IN'.
+	 */
 	public function add_condition( $field, $value, $operator = '=' ) {
 		if ( is_array( $value ) ) {
 			$value = "('" . implode( "','", $value ) . "')";
@@ -60,13 +60,13 @@ 
 	}
 
 	/**
-	* Implements PHP's magic __toString().
-	*
-	* Function to convert the query to a string to pass to the SF API.
-	*
-	* @return string
-	*   SOQL query ready to be executed the SF API.
-	*/
+	 * Implements PHP's magic __toString().
+	 *
+	 * Function to convert the query to a string to pass to the SF API.
+	 *
+	 * @return string
+	 *   SOQL query ready to be executed the SF API.
+	 */
 	public function __toString() {
 
 		$query  = 'SELECT ';

Spacing +16 added lines, -16 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -27,7 +27,7 @@ 
 	* @param string $object_type
 	*   Salesforce object type to query.
 	*/
-	public function __construct( $object_type = '' ) {
+	public function __construct($object_type = '') {
 		$this->object_type = $object_type;
 	}
 
@@ -43,12 +43,12 @@ 
 	* @param string $operator
 	*   Conditional operator. One of '=', '!=', '<', '>', 'LIKE, 'IN', 'NOT IN'.
 	*/
-	public function add_condition( $field, $value, $operator = '=' ) {
-		if ( is_array( $value ) ) {
-			$value = "('" . implode( "','", $value ) . "')";
+	public function add_condition($field, $value, $operator = '=') {
+		if (is_array($value)) {
+			$value = "('" . implode("','", $value) . "')";
 
 			// Set operator to IN if wasn't already changed from the default.
-			if ( '=' === $operator ) {
+			if ('=' === $operator) {
 				$operator = 'IN';
 			}
 		}
@@ -70,31 +70,31 @@ 
 	public function __toString() {
 
 		$query  = 'SELECT ';
-		$query .= implode( ', ', $this->fields );
+		$query .= implode(', ', $this->fields);
 		$query .= ' FROM ' . $this->object_type;
 
-		if ( count( $this->conditions ) > 0 ) {
+		if (count($this->conditions) > 0) {
 			$where = array();
-			foreach ( $this->conditions as $condition ) {
-				$where[] = implode( ' ', $condition );
+			foreach ($this->conditions as $condition) {
+				$where[] = implode(' ', $condition);
 			}
-			$query .= ' WHERE ' . implode( ' AND ', $where );
+			$query .= ' WHERE ' . implode(' AND ', $where);
 		}
 
-		if ( $this->order ) {
+		if ($this->order) {
 			$query .= ' ORDER BY ';
 			$fields = array();
-			foreach ( $this->order as $field => $direction ) {
+			foreach ($this->order as $field => $direction) {
 				$fields[] = $field . ' ' . $direction;
 			}
-			$query .= implode( ', ', $fields );
+			$query .= implode(', ', $fields);
 		}
 
-		if ( $this->limit ) {
+		if ($this->limit) {
 			$query .= ' LIMIT ' . (int) $this->limit;
 		}
 
-		if ( $this->offset ) {
+		if ($this->offset) {
 			$query .= ' OFFSET ' . (int) $this->offset;
 		}
 

classes/admin-notice.php

Indentation +12 added lines, -12 removed lines

@@ -21,15 +21,15 @@ 
 	protected $template;
 
 	/**
-	* Constructor which sets up the admin_notices hook for rendering
-	*
-	* @param mixed $condition
-	* @param string $message
-	* @param bool $dismissible
-	* @param string $type
-	* @param string $template
-	*
-	*/
+	 * Constructor which sets up the admin_notices hook for rendering
+	 *
+	 * @param mixed $condition
+	 * @param string $message
+	 * @param bool $dismissible
+	 * @param string $type
+	 * @param string $template
+	 *
+	 */
 	public function __construct( $condition, $message, $dismissible = false, $type = '', $template = '' ) {
 		$this->condition   = $condition;
 		$this->message     = $message;
@@ -42,9 +42,9 @@ 
 	}
 
 	/**
-	* Render an admin notice
-	*
-	*/
+	 * Render an admin notice
+	 *
+	 */
 	public function render() {
 
 		// class for the notice to use

Spacing +8 added lines, -8 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -30,14 +30,14 @@ 
 	* @param string $template
 	*
 	*/
-	public function __construct( $condition, $message, $dismissible = false, $type = '', $template = '' ) {
+	public function __construct($condition, $message, $dismissible = false, $type = '', $template = '') {
 		$this->condition   = $condition;
 		$this->message     = $message;
 		$this->dismissible = $dismissible;
 		$this->type        = $type;
 		$this->template    = $template;
 
-		add_action( 'admin_notices', array( $this, 'render' ) );
+		add_action('admin_notices', array($this, 'render'));
 
 	}
 
@@ -49,18 +49,18 @@ 
 
 		// class for the notice to use
 		$class = '';
-		if ( '' !== $this->type ) {
+		if ('' !== $this->type) {
 			$class = ' notice-' . $this->type;
 		}
 
 		$dismissible = '';
-		if ( true === $this->dismissible ) {
+		if (true === $this->dismissible) {
 			$dismissible = ' is-dismissible';
 		}
 
 		// template for notice has a default
-		if ( '' === $this->template ) {
-			$template = plugin_dir_path( __FILE__ ) . '/../templates/admin/notice.php';
+		if ('' === $this->template) {
+			$template = plugin_dir_path(__FILE__) . '/../templates/admin/notice.php';
 		} else {
 			$template = $this->template;
 		}
@@ -68,7 +68,7 @@ 
 		$condition = $this->condition;
 		$message   = $this->message;
 
-		require_once( $template );
+		require_once($template);
 
 	}
 

classes/activate.php

Indentation +23 added lines, -23 removed lines

@@ -19,13 +19,13 @@ 
 	protected $installed_version;
 
 	/**
-	* Constructor which sets up activate hooks
-	*
-	* @param object $wpdb
-	* @param string $version
-	* @param string $slug
-	*
-	*/
+	 * Constructor which sets up activate hooks
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param string $slug
+	 *
+	 */
 	public function __construct( $wpdb, $version, $slug ) {
 		$this->wpdb              = $wpdb;
 		$this->version           = $version;
@@ -37,8 +37,8 @@ 
 	}
 
 	/**
-	* Check for the minimum required version of php
-	*/
+	 * Check for the minimum required version of php
+	 */
 	public function php_requirements() {
 		if ( version_compare( PHP_VERSION, '5.5', '<' ) ) {
 			deactivate_plugins( plugin_basename( __FILE__ ) );
@@ -47,10 +47,10 @@ 
 	}
 
 	/**
-	* Create database tables for Salesforce
-	* This creates tables for fieldmaps (between types of objects) and object maps (between indidual instances of objects)
-	*
-	*/
+	 * Create database tables for Salesforce
+	 * This creates tables for fieldmaps (between types of objects) and object maps (between indidual instances of objects)
+	 *
+	 */
 	public function wordpress_salesforce_tables() {
 
 		$charset_collate = $this->wpdb->get_charset_collate();
@@ -111,10 +111,10 @@ 
 	}
 
 	/**
-	* Check for database version on plugin upgrade
-	* When the plugin is upgraded, if the database version does not match the current version, perform these methods
-	*
-	*/
+	 * Check for database version on plugin upgrade
+	 * When the plugin is upgraded, if the database version does not match the current version, perform these methods
+	 *
+	 */
 	public function wordpress_salesforce_update_db_check() {
 		if ( get_site_option( 'object_sync_for_salesforce_db_version' ) !== $this->version ) {
 			$this->wordpress_salesforce_tables();
@@ -122,12 +122,12 @@ 
 	}
 
 	/**
-	* Add roles and capabilities
-	* This adds the configure_salesforce capability to the admin role
-	*
-	* It also allows other plugins to add the capability to other roles
-	*
-	*/
+	 * Add roles and capabilities
+	 * This adds the configure_salesforce capability to the admin role
+	 *
+	 * It also allows other plugins to add the capability to other roles
+	 *
+	 */
 	public function add_roles_capabilities() {
 
 		// by default, only administrators can configure the plugin

Spacing +23 added lines, -23 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -26,23 +26,23 @@ 
 	* @param string $slug
 	*
 	*/
-	public function __construct( $wpdb, $version, $slug ) {
+	public function __construct($wpdb, $version, $slug) {
 		$this->wpdb              = $wpdb;
 		$this->version           = $version;
-		$this->installed_version = get_option( 'object_sync_for_salesforce_db_version', '' );
-		register_activation_hook( dirname( __DIR__ ) . '/' . $slug . '.php', array( $this, 'php_requirements' ) );
-		register_activation_hook( dirname( __DIR__ ) . '/' . $slug . '.php', array( $this, 'wordpress_salesforce_tables' ) );
-		register_activation_hook( dirname( __DIR__ ) . '/' . $slug . '.php', array( $this, 'add_roles_capabilities' ) );
-		add_action( 'plugins_loaded', array( $this, 'wordpress_salesforce_update_db_check' ) );
+		$this->installed_version = get_option('object_sync_for_salesforce_db_version', '');
+		register_activation_hook(dirname(__DIR__) . '/' . $slug . '.php', array($this, 'php_requirements'));
+		register_activation_hook(dirname(__DIR__) . '/' . $slug . '.php', array($this, 'wordpress_salesforce_tables'));
+		register_activation_hook(dirname(__DIR__) . '/' . $slug . '.php', array($this, 'add_roles_capabilities'));
+		add_action('plugins_loaded', array($this, 'wordpress_salesforce_update_db_check'));
 	}
 
 	/**
 	* Check for the minimum required version of php
 	*/
 	public function php_requirements() {
-		if ( version_compare( PHP_VERSION, '5.5', '<' ) ) {
-			deactivate_plugins( plugin_basename( __FILE__ ) );
-			wp_die( '<strong>This plugin requires PHP Version 5.5</strong> <br />Please contact your host to upgrade PHP on your server, and then retry activating the plugin.' );
+		if (version_compare(PHP_VERSION, '5.5', '<')) {
+			deactivate_plugins(plugin_basename(__FILE__));
+			wp_die('<strong>This plugin requires PHP Version 5.5</strong> <br />Please contact your host to upgrade PHP on your server, and then retry activating the plugin.');
 		}
 	}
 
@@ -95,18 +95,18 @@ 
 			KEY salesforce_object (salesforce_id)
 		) $charset_collate";
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
 		// Note: see https://wordpress.stackexchange.com/questions/67345/how-to-implement-wordpress-plugin-update-that-modifies-the-database
 		// When we run the dbDelta method below, "it checks if the table exists. What's more, it checks the column types. So if the table doesn't exist, it creates it, if it does, but some column types have changed it updates them, and if a column doesn't exists - it adds it."
 		// This does not remove columns if we remove columns, so we'll need to expand beyond this in the future if that happens, although I think the schema is pretty solid now.
-		dbDelta( $field_map_sql );
-		dbDelta( $object_map_sql );
+		dbDelta($field_map_sql);
+		dbDelta($object_map_sql);
 
-		update_option( 'object_sync_for_salesforce_db_version', $this->version );
+		update_option('object_sync_for_salesforce_db_version', $this->version);
 
 		// store right now as the time for the plugin's activation
-		update_option( 'object_sync_for_salesforce_activate_time', current_time( 'timestamp', true ) );
+		update_option('object_sync_for_salesforce_activate_time', current_time('timestamp', true));
 
 	}
 
@@ -116,7 +116,7 @@ 
 	*
 	*/
 	public function wordpress_salesforce_update_db_check() {
-		if ( get_site_option( 'object_sync_for_salesforce_db_version' ) !== $this->version ) {
+		if (get_site_option('object_sync_for_salesforce_db_version') !== $this->version) {
 			$this->wordpress_salesforce_tables();
 		}
 	}
@@ -131,17 +131,17 @@ 
 	public function add_roles_capabilities() {
 
 		// by default, only administrators can configure the plugin
-		$role = get_role( 'administrator' );
-		$role->add_cap( 'configure_salesforce' );
+		$role = get_role('administrator');
+		$role->add_cap('configure_salesforce');
 
 		// hook that allows other roles to configure the plugin as well
-		$roles = apply_filters( 'object_sync_for_salesforce_roles_configure_salesforce', null );
+		$roles = apply_filters('object_sync_for_salesforce_roles_configure_salesforce', null);
 
 		// for each role that we have, give it the configure salesforce capability
-		if ( null !== $roles ) {
-			foreach ( $roles as $role ) {
-				$role = get_role( $role );
-				$role->add_cap( 'configure_salesforce' );
+		if (null !== $roles) {
+			foreach ($roles as $role) {
+				$role = get_role($role);
+				$role->add_cap('configure_salesforce');
 			}
 		}
 

classes/salesforce_pull.php

Indentation +93 added lines, -93 removed lines

@@ -24,24 +24,24 @@ 
 	protected $schedulable_classes;
 
 	/**
-	* @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 object $wordpress
-	* @param object $salesforce
-	* @param object $mappings
-	* @param object $logging
-	* @param array $schedulable_classes
-	* @throws \Exception
-	*/
+	 * Constructor which sets up pull schedule
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param array $login_credentials
+	 * @param string $slug
+	 * @param object $wordpress
+	 * @param object $salesforce
+	 * @param object $mappings
+	 * @param object $logging
+	 * @param array $schedulable_classes
+	 * @throws \Exception
+	 */
 	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes ) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
@@ -70,19 +70,19 @@ 
 	}
 
 	/**
-	* 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
+	 *
+	 */
 	private function add_actions() {
 		add_action( 'wp_ajax_salesforce_pull_webhook', array( $this, 'salesforce_pull_webhook' ) );
 	}
 
 	/**
-	* 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() ) {
@@ -102,8 +102,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'];
 
@@ -123,9 +123,9 @@ 
 	}
 
 	/**
-	* Load schedule
-	* This loads the schedule class
-	*/
+	 * Load schedule
+	 * This loads the schedule class
+	 */
 	private function schedule() {
 		if ( ! class_exists( 'Object_Sync_Sf_Schedule' ) && file_exists( plugin_dir_path( __FILE__ ) . '../vendor/autoload.php' ) ) {
 			require_once plugin_dir_path( __FILE__ ) . '../vendor/autoload.php';
@@ -137,13 +137,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( 'object_sync_for_salesforce_pull_throttle', 5 );
 		$last_sync     = get_option( 'object_sync_for_salesforce_pull_last_sync', 0 );
@@ -156,14 +156,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 ) {
@@ -329,18 +329,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();
@@ -422,10 +422,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'];
@@ -517,13 +517,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 );
@@ -538,20 +538,20 @@ 
 	}
 
 	/**
-	* Sync WordPress objects and Salesforce objects from the queue using the REST API.
-	*
-	* @param string $object_type
-	*   Type of Salesforce object.
-	* @param object $object
-	*   The Salesforce object.
-	* @param object $mapping
-	*   Salesforce/WP mapping object.
-	* @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 object $object
+	 *   The Salesforce object.
+	 * @param object $mapping
+	 *   Salesforce/WP mapping object.
+	 * @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 ) {
 		$mapping_conditions = array(
 			'salesforce_object' => $object_type,
@@ -1282,19 +1282,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 +316 added lines, -316 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -42,7 +42,7 @@ 
 	* @param array $schedulable_classes
 	* @throws \Exception
 	*/
-	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes ) {
+	public function __construct($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
 		$this->login_credentials   = $login_credentials;
@@ -61,11 +61,11 @@ 
 		$schedule = $this->schedule;
 		// create new schedule based on the options for this current class
 		// this will use the existing schedule if it already exists; otherwise it'll create one
-		$schedule->use_schedule( $this->schedule_name );
+		$schedule->use_schedule($this->schedule_name);
 
 		$this->add_actions();
 
-		$this->debug = get_option( 'object_sync_for_salesforce_debug_mode', false );
+		$this->debug = get_option('object_sync_for_salesforce_debug_mode', false);
 
 	}
 
@@ -74,7 +74,7 @@ 
 	*
 	*/
 	private function add_actions() {
-		add_action( 'wp_ajax_salesforce_pull_webhook', array( $this, 'salesforce_pull_webhook' ) );
+		add_action('wp_ajax_salesforce_pull_webhook', array($this, 'salesforce_pull_webhook'));
 	}
 
 	/**
@@ -85,7 +85,7 @@ 
 	*/
 	public function salesforce_pull_webhook() {
 
-		if ( true === $this->salesforce_pull() ) {
+		if (true === $this->salesforce_pull()) {
 			$code = '200';
 			// check to see if anything is in the queue and handle it if it is
 			$this->schedule->maybe_handle();
@@ -93,8 +93,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;
 		}
@@ -107,13 +107,13 @@ 
 	public function salesforce_pull() {
 		$sfapi = $this->salesforce['sfapi'];
 
-		if ( true === $this->salesforce['is_authorized'] && true === $this->check_throttle() ) {
+		if (true === $this->salesforce['is_authorized'] && true === $this->check_throttle()) {
 
 			$this->get_updated_records();
 			$this->get_deleted_records();
 
 			// Store this request time for the throttle check.
-			update_option( 'object_sync_for_salesforce_pull_last_sync', current_time( 'timestamp', true ) );
+			update_option('object_sync_for_salesforce_pull_last_sync', current_time('timestamp', true));
 			return true;
 
 		} else {
@@ -127,11 +127,11 @@ 
 	* This loads the schedule class
 	*/
 	private function schedule() {
-		if ( ! class_exists( 'Object_Sync_Sf_Schedule' ) && file_exists( plugin_dir_path( __FILE__ ) . '../vendor/autoload.php' ) ) {
-			require_once plugin_dir_path( __FILE__ ) . '../vendor/autoload.php';
-			require_once plugin_dir_path( __FILE__ ) . '../classes/schedule.php';
+		if ( ! class_exists('Object_Sync_Sf_Schedule') && file_exists(plugin_dir_path(__FILE__) . '../vendor/autoload.php')) {
+			require_once plugin_dir_path(__FILE__) . '../vendor/autoload.php';
+			require_once plugin_dir_path(__FILE__) . '../classes/schedule.php';
 		}
-		$schedule       = new Object_Sync_Sf_Schedule( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->schedule_name, $this->logging, $this->schedulable_classes );
+		$schedule       = new Object_Sync_Sf_Schedule($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->schedule_name, $this->logging, $this->schedulable_classes);
 		$this->schedule = $schedule;
 		return $schedule;
 	}
@@ -145,10 +145,10 @@ 
 	*    Returns false if the time elapsed between recent pulls is too short.
 	*/
 	private function check_throttle() {
-		$pull_throttle = get_option( 'object_sync_for_salesforce_pull_throttle', 5 );
-		$last_sync     = get_option( 'object_sync_for_salesforce_pull_last_sync', 0 );
+		$pull_throttle = get_option('object_sync_for_salesforce_pull_throttle', 5);
+		$last_sync     = get_option('object_sync_for_salesforce_pull_last_sync', 0);
 
-		if ( current_time( 'timestamp', true ) > ( $last_sync + $pull_throttle ) ) {
+		if (current_time('timestamp', true) > ($last_sync + $pull_throttle)) {
 			return true;
 		} else {
 			return false;
@@ -166,14 +166,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;
 			}
 
@@ -188,17 +188,17 @@ 
 			);
 
 			$response     = $results['data'];
-			$version_path = wp_parse_url( $sfapi->get_api_endpoint(), PHP_URL_PATH );
+			$version_path = wp_parse_url($sfapi->get_api_endpoint(), PHP_URL_PATH);
 
-			$sf_last_sync = get_option( 'object_sync_for_salesforce_pull_last_sync_' . $type, null );
-			$last_sync    = gmdate( 'Y-m-d\TH:i:s\Z', $sf_last_sync );
+			$sf_last_sync = get_option('object_sync_for_salesforce_pull_last_sync_' . $type, null);
+			$last_sync    = gmdate('Y-m-d\TH:i:s\Z', $sf_last_sync);
 
-			if ( ! isset( $response['errorCode'] ) ) {
+			if ( ! isset($response['errorCode'])) {
 				// Write items to the queue.
-				foreach ( $response['records'] as $result ) {
+				foreach ($response['records'] as $result) {
 
 					// if this record is new as of the last sync, use the create trigger
-					if ( isset( $result['CreatedDate'] ) && $result['CreatedDate'] > $last_sync ) {
+					if (isset($result['CreatedDate']) && $result['CreatedDate'] > $last_sync) {
 						$sf_sync_trigger = $this->mappings->sync_sf_create;
 					} else {
 						$sf_sync_trigger = $this->mappings->sync_sf_update;
@@ -206,7 +206,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,
@@ -218,16 +218,16 @@ 
 						$pull_allowed = true;
 
 						// if the current fieldmap does not allow create, we need to check if there is a fieldmap for the Salesforce object Id. if not, set pull_allowed to false.
-						if ( isset( $map_sync_triggers ) && ! in_array( $this->mappings->sync_sf_create, $map_sync_triggers ) ) {
-							$object_map = $this->mappings->load_by_salesforce( $result['Id'] );
-							if ( empty( $object_map ) ) {
+						if (isset($map_sync_triggers) && ! in_array($this->mappings->sync_sf_create, $map_sync_triggers)) {
+							$object_map = $this->mappings->load_by_salesforce($result['Id']);
+							if (empty($object_map)) {
 								$pull_allowed = false;
 							}
 						}
 
 						// Hook to allow other plugins to prevent a pull per-mapping.
 						// Putting the pull_allowed hook here will keep the queue from storing data when it is not supposed to store it
-						$pull_allowed = apply_filters( 'object_sync_for_salesforce_pull_object_allowed', $pull_allowed, $type, $result, $sf_sync_trigger, $salesforce_mapping );
+						$pull_allowed = apply_filters('object_sync_for_salesforce_pull_object_allowed', $pull_allowed, $type, $result, $sf_sync_trigger, $salesforce_mapping);
 
 						// example to keep from pulling the Contact with id of abcdef
 						/*
@@ -240,26 +240,26 @@ 
 						}
 						*/
 
-						if ( false === $pull_allowed ) {
-							update_option( 'object_sync_for_salesforce_pull_last_sync_' . $type, current_time( 'timestamp', true ) );
+						if (false === $pull_allowed) {
+							update_option('object_sync_for_salesforce_pull_last_sync_' . $type, current_time('timestamp', true));
 							continue;
 						}
 
 						// Initialize the queue with the data for this record and save
-						$this->schedule->data( array( $data ) );
+						$this->schedule->data(array($data));
 						$this->schedule->save()->dispatch();
 						// Update the last pull sync timestamp for this record type to avoid re-processing in case of error
-						$last_sync_pull_trigger = DateTime::createFromFormat( 'Y-m-d\TH:i:s+', $result[ $salesforce_mapping['pull_trigger_field'] ], new DateTimeZone( 'UTC' ) );
-						update_option( 'object_sync_for_salesforce_pull_last_sync_' . $type, $last_sync_pull_trigger->format( 'U' ) );
+						$last_sync_pull_trigger = DateTime::createFromFormat('Y-m-d\TH:i:s+', $result[$salesforce_mapping['pull_trigger_field']], new DateTimeZone('UTC'));
+						update_option('object_sync_for_salesforce_pull_last_sync_' . $type, $last_sync_pull_trigger->format('U'));
 					}
 				}
 
 				// Handle requests larger than the batch limit (usually 2000).
-				$next_records_url = isset( $response['nextRecordsUrl'] ) ? str_replace( $version_path, '', $response['nextRecordsUrl'] ) : false;
+				$next_records_url = isset($response['nextRecordsUrl']) ? str_replace($version_path, '', $response['nextRecordsUrl']) : false;
 
-				while ( $next_records_url ) {
+				while ($next_records_url) {
 					// shouldn't cache this either. it's going into the queue if it exists anyway.
-					$new_results  = $sfapi->api_call(
+					$new_results = $sfapi->api_call(
 						$next_records_url,
 						array(),
 						'GET',
@@ -268,11 +268,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;
@@ -280,7 +280,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,
@@ -289,31 +289,31 @@ 
 								);
 
 								// Initialize the queue with the data for this record and save
-								$this->schedule->data( array( $data ) );
+								$this->schedule->data(array($data));
 								$this->schedule->save()->dispatch();
 								// Update the last pull sync timestamp for this record type to avoid re-processing in case of error
-								$last_sync_pull_trigger = DateTime::createFromFormat( 'Y-m-d\TH:i:s+', $result[ $salesforce_mapping['pull_trigger_field'] ], new DateTimeZone( 'UTC' ) );
-								update_option( 'object_sync_for_salesforce_pull_last_sync_' . $type, $last_sync_pull_trigger->format( 'U' ) );
+								$last_sync_pull_trigger = DateTime::createFromFormat('Y-m-d\TH:i:s+', $result[$salesforce_mapping['pull_trigger_field']], new DateTimeZone('UTC'));
+								update_option('object_sync_for_salesforce_pull_last_sync_' . $type, $last_sync_pull_trigger->format('U'));
 							}
 						}
 					}
 
-					$next_records_url = isset( $new_response['nextRecordsUrl'] ) ? str_replace( $version_path, '', $new_response['nextRecordsUrl'] ) : false;
+					$next_records_url = isset($new_response['nextRecordsUrl']) ? str_replace($version_path, '', $new_response['nextRecordsUrl']) : false;
 				}
 			} else {
 
 				// create log entry for failed pull
 				$status = 'error';
 				// translators: placeholders are: 1) the server error code, and 2) the name of the Salesforce object
-				$title = sprintf( esc_html__( 'Error: %1$s %2$s', 'object-sync-for-salesforce' ),
-					absint( $response['errorCode'] ),
-					esc_attr( $salesforce_mapping['salesforce_object'] )
+				$title = sprintf(esc_html__('Error: %1$s %2$s', 'object-sync-for-salesforce'),
+					absint($response['errorCode']),
+					esc_attr($salesforce_mapping['salesforce_object'])
 				);
 
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				$logging->setup(
@@ -341,7 +341,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();
 
@@ -353,35 +353,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(
@@ -393,7 +393,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';
 		}
 
@@ -401,14 +401,14 @@ 
 		// this should be what keeps it from getting all the records, whether or not they've ever been updated
 		// we also use the option for when the plugin was installed, and don't go back further than that by default
 
-		$sf_activate_time = get_option( 'object_sync_for_salesforce_activate_time', '' );
-		$sf_last_sync     = get_option( 'object_sync_for_salesforce_pull_last_sync_' . $type, null );
-		if ( $sf_last_sync ) {
-			$last_sync = gmdate( 'Y-m-d\TH:i:s\Z', $sf_last_sync );
-			$soql->add_condition( $salesforce_mapping['pull_trigger_field'], $last_sync, '>' );
+		$sf_activate_time = get_option('object_sync_for_salesforce_activate_time', '');
+		$sf_last_sync     = get_option('object_sync_for_salesforce_pull_last_sync_' . $type, null);
+		if ($sf_last_sync) {
+			$last_sync = gmdate('Y-m-d\TH:i:s\Z', $sf_last_sync);
+			$soql->add_condition($salesforce_mapping['pull_trigger_field'], $last_sync, '>');
 		} else {
-			$activated = gmdate( 'Y-m-d\TH:i:s\Z', $sf_activate_time );
-			$soql->add_condition( $salesforce_mapping['pull_trigger_field'], $activated, '>' );
+			$activated = gmdate('Y-m-d\TH:i:s\Z', $sf_activate_time);
+			$soql->add_condition($salesforce_mapping['pull_trigger_field'], $activated, '>');
 			// put a hook in here to let devs go retroactive if they want, and sync data from before plugin was activated
 		}
 
@@ -434,7 +434,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'];
 
@@ -446,37 +446,37 @@ 
 			);
 
 			// Iterate over each field mapping to determine our query parameters.
-			foreach ( $mappings as $mapping ) {
+			foreach ($mappings as $mapping) {
 
-				$last_delete_sync = get_option( 'object_sync_for_salesforce_pull_delete_last_' . $type, current_time( 'timestamp', true ) );
-				$now              = current_time( 'timestamp', true );
-				update_option( 'object_sync_for_salesforce_pull_delete_last_' . $type, $now );
+				$last_delete_sync = get_option('object_sync_for_salesforce_pull_delete_last_' . $type, current_time('timestamp', true));
+				$now              = current_time('timestamp', true);
+				update_option('object_sync_for_salesforce_pull_delete_last_' . $type, $now);
 
 				// get_deleted() constraint: startDate cannot be more than 30 days ago
 				// (using an incompatible date may lead to exceptions).
-				$last_delete_sync = $last_delete_sync > ( current_time( 'timestamp', true ) - 2505600 ) ? $last_delete_sync : ( current_time( 'timestamp', true ) - 2505600 );
+				$last_delete_sync = $last_delete_sync > (current_time('timestamp', true) - 2505600) ? $last_delete_sync : (current_time('timestamp', true) - 2505600);
 
 				// get_deleted() constraint: startDate must be at least one minute greater
 				// than endDate.
-				$now = $now > ( $last_delete_sync + 60 ) ? $now : $now + 60;
+				$now = $now > ($last_delete_sync + 60) ? $now : $now + 60;
 
 				// need to be using gmdate for salesforce call
-				$last_delete_sync_sf = gmdate( 'Y-m-d\TH:i:s\Z', $last_delete_sync );
-				$now_sf              = gmdate( 'Y-m-d\TH:i:s\Z', $now );
+				$last_delete_sync_sf = gmdate('Y-m-d\TH:i:s\Z', $last_delete_sync);
+				$now_sf              = gmdate('Y-m-d\TH:i:s\Z', $now);
 
 				// salesforce call
-				$deleted = $sfapi->get_deleted( $type, $last_delete_sync_sf, $now_sf );
+				$deleted = $sfapi->get_deleted($type, $last_delete_sync_sf, $now_sf);
 
-				if ( empty( $deleted['data']['deletedRecords'] ) ) {
+				if (empty($deleted['data']['deletedRecords'])) {
 					continue;
 				}
 
-				foreach ( $deleted['data']['deletedRecords'] as $result ) {
+				foreach ($deleted['data']['deletedRecords'] as $result) {
 
 					$sf_sync_trigger = $this->mappings->sync_sf_delete;
 
 					// salesforce seriously returns Id for update requests and id for delete requests and this makes no sense but maybe one day they might change it somehow?
-					if ( ! isset( $result['Id'] ) && isset( $result['id'] ) ) {
+					if ( ! isset($result['Id']) && isset($result['id'])) {
 						$result['Id'] = $result['id'];
 					}
 					$data = array(
@@ -488,7 +488,7 @@ 
 
 					// Hook to allow other plugins to prevent a pull per-mapping.
 					// Putting the pull_allowed hook here will keep the queue from storing data when it is not supposed to store it
-					$pull_allowed = apply_filters( 'object_sync_for_salesforce_pull_object_allowed', true, $type, $result, $sf_sync_trigger, $salesforce_mapping );
+					$pull_allowed = apply_filters('object_sync_for_salesforce_pull_object_allowed', true, $type, $result, $sf_sync_trigger, $salesforce_mapping);
 
 					// example to keep from pulling the Contact with id of abcdef
 					/*
@@ -501,16 +501,16 @@ 
 					}
 					*/
 
-					if ( false === $pull_allowed ) {
+					if (false === $pull_allowed) {
 						continue;
 					}
 
-					$this->schedule->push_to_queue( $data );
+					$this->schedule->push_to_queue($data);
 					$this->schedule->save()->dispatch();
 
 				}
 
-				update_option( 'object_sync_for_salesforce_pull_delete_last_' . $type, current_time( 'timestamp', true ) );
+				update_option('object_sync_for_salesforce_pull_delete_last_' . $type, current_time('timestamp', true));
 
 			} // End foreach().
 		} // End foreach().
@@ -524,9 +524,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(
@@ -534,7 +534,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);
 	}
 
 	/**
@@ -552,45 +552,45 @@ 
 	* @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) {
 		$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;
 
-		$seconds = $this->schedule->get_schedule_frequency_seconds( $this->schedule_name ) + 60;
+		$seconds = $this->schedule->get_schedule_frequency_seconds($this->schedule_name) + 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,
 					$status
 				);
@@ -601,7 +601,7 @@ 
 			// if it's not already connected (ie on create), the array will be empty
 
 			// hook to allow other plugins to define or alter the mapping object
-			$mapping_object = apply_filters( 'object_sync_for_salesforce_pull_mapping_object', $mapping_object, $object, $mapping );
+			$mapping_object = apply_filters('object_sync_for_salesforce_pull_mapping_object', $mapping_object, $object, $mapping);
 
 			// we already have the data from Salesforce at this point; we just need to work with it in WordPress
 			$synced_object = array(
@@ -610,58 +610,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(
@@ -672,38 +672,38 @@ 
 								$status
 							);
 
-							if ( false === $hold_exceptions ) {
+							if (false === $hold_exceptions) {
 								throw $e;
 							}
-							if ( empty( $exception ) ) {
+							if (empty($exception)) {
 								$exception = $e;
 							} else {
-								$my_class  = get_class( $e );
-								$exception = new $my_class( $e->getMessage(), $e->getCode(), $exception );
+								$my_class  = get_class($e);
+								$exception = new $my_class($e->getMessage(), $e->getCode(), $exception);
 							}
 
 							// hook for pull fail
-							do_action( 'object_sync_for_salesforce_pull_fail', $op, $result, $synced_object );
+							do_action('object_sync_for_salesforce_pull_fail', $op, $result, $synced_object);
 
 						} // End try().
 
-						if ( ! isset( $e ) ) {
+						if ( ! isset($e)) {
 							// create log entry for successful delete if the result had no errors
 							$status = 'success';
-							if ( isset( $this->logging ) ) {
+							if (isset($this->logging)) {
 								$logging = $this->logging;
-							} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-								$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+							} elseif (class_exists('Object_Sync_Sf_Logging')) {
+								$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 							}
 
 							// translators: placeholders are: 1) what operation is happening, 2) the name of the WordPress object type, 3) the WordPress id field name, 4) the WordPress object id value, 5) the name of the Salesforce object, 6) the Salesforce Id value
-							$title = sprintf( esc_html__( 'Success: %1$s WordPress %2$s with %3$s of %4$s (%5$s %6$s)', 'object-sync-for-salesforce' ),
-								esc_attr( $op ),
-								esc_attr( $salesforce_mapping['wordpress_object'] ),
-								esc_attr( $object_id ),
-								esc_attr( $mapping_object['wordpress_id'] ),
-								esc_attr( $salesforce_mapping['salesforce_object'] ),
-								esc_attr( $mapping_object['salesforce_id'] )
+							$title = sprintf(esc_html__('Success: %1$s WordPress %2$s with %3$s of %4$s (%5$s %6$s)', 'object-sync-for-salesforce'),
+								esc_attr($op),
+								esc_attr($salesforce_mapping['wordpress_object']),
+								esc_attr($object_id),
+								esc_attr($mapping_object['wordpress_id']),
+								esc_attr($salesforce_mapping['salesforce_object']),
+								esc_attr($mapping_object['salesforce_id'])
 							);
 
 							$logging->setup(
@@ -715,38 +715,38 @@ 
 							);
 
 							// hook for pull success
-							do_action( 'object_sync_for_salesforce_pull_success', $op, $result, $synced_object );
+							do_action('object_sync_for_salesforce_pull_success', $op, $result, $synced_object);
 						}
 					} else {
-						$more_ids = sprintf( '<p>' . esc_html__( 'The WordPress record was not deleted because there are multiple Salesforce IDs that match this WordPress ID. They are:', 'object-sync-for-salesforce' ) );
+						$more_ids = sprintf('<p>' . esc_html__('The WordPress record was not deleted because there are multiple Salesforce IDs that match this WordPress ID. They are:', 'object-sync-for-salesforce'));
 						$i        = 0;
-						foreach ( $wordpress_check as $match ) {
+						foreach ($wordpress_check as $match) {
 							$i++;
-							$more_ids .= sprintf( $match['salesforce_id'] );
-							if ( count( $wordpress_check ) !== $i ) {
-								$more_ids .= sprintf( ', ' );
+							$more_ids .= sprintf($match['salesforce_id']);
+							if (count($wordpress_check) !== $i) {
+								$more_ids .= sprintf(', ');
 							} else {
-								$more_ids .= sprintf( '.</p>' );
+								$more_ids .= sprintf('.</p>');
 							}
 						}
 
-						$more_ids .= sprintf( '<p>' . esc_html__( 'The map row between this Salesforce object and the WordPress object, as stored in the WordPress database, will be deleted, and this Salesforce object has been deleted, but the WordPress object row will remain untouched.', 'object-sync-for-salesforce' ) . '</p>' );
+						$more_ids .= sprintf('<p>' . esc_html__('The map row between this Salesforce object and the WordPress object, as stored in the WordPress database, will be deleted, and this Salesforce object has been deleted, but the WordPress object row will remain untouched.', 'object-sync-for-salesforce') . '</p>');
 
 						$status = 'notice';
-						if ( isset( $this->logging ) ) {
+						if (isset($this->logging)) {
 							$logging = $this->logging;
-						} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-							$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+						} elseif (class_exists('Object_Sync_Sf_Logging')) {
+							$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 						}
 
 						// translators: placeholders are: 1) what operation is happening, 2) the name of the WordPress object type, 3) the WordPress id field name, 4) the WordPress object id value, 5) the name of the Salesforce object, 6) the Salesforce Id value
-						$title = sprintf( esc_html__( 'Notice: %1$s %2$s with %3$s of %4$s (%5$s %6$s) did not delete the WordPress item.', 'object-sync-for-salesforce' ),
-							esc_attr( $op ),
-							esc_attr( $salesforce_mapping['wordpress_object'] ),
-							esc_attr( $object_id ),
-							esc_attr( $mapping_object['wordpress_id'] ),
-							esc_attr( $salesforce_mapping['salesforce_object'] ),
-							esc_attr( $mapping_object['salesforce_id'] )
+						$title = sprintf(esc_html__('Notice: %1$s %2$s with %3$s of %4$s (%5$s %6$s) did not delete the WordPress item.', 'object-sync-for-salesforce'),
+							esc_attr($op),
+							esc_attr($salesforce_mapping['wordpress_object']),
+							esc_attr($object_id),
+							esc_attr($mapping_object['wordpress_id']),
+							esc_attr($salesforce_mapping['salesforce_object']),
+							esc_attr($mapping_object['salesforce_id'])
 						);
 
 						$logging->setup(
@@ -760,27 +760,27 @@ 
 
 					// delete the map row from WordPress after the WordPress row has been deleted
 					// we delete the map row even if the WordPress delete failed, because the Salesforce object is gone
-					$this->mappings->delete_object_map( $mapping_object['id'] );
+					$this->mappings->delete_object_map($mapping_object['id']);
 					// there is no map row if we end this if statement
 				} // End if().
 				return;
 			} // End if().
 
 			// map the Salesforce values to WordPress fields
-			$params = $this->mappings->map_params( $mapping, $object, $sf_sync_trigger, false, $is_new );
+			$params = $this->mappings->map_params($mapping, $object, $sf_sync_trigger, false, $is_new);
 
 			// hook to allow other plugins to modify the $params array
 			// use hook to map fields between the WordPress and Salesforce objects
 			// returns $params.
-			$params = apply_filters( 'object_sync_for_salesforce_pull_params_modify', $params, $mapping, $object, $sf_sync_trigger, false, $is_new );
+			$params = apply_filters('object_sync_for_salesforce_pull_params_modify', $params, $mapping, $object, $sf_sync_trigger, false, $is_new);
 
 			// if we don't get any params, there are no fields that should be sent to WordPress
-			if ( empty( $params ) ) {
+			if (empty($params)) {
 				return;
 			}
 
 			// if there is a prematch WordPress field - ie email - on the fieldmap object
-			if ( isset( $params['prematch'] ) && is_array( $params['prematch'] ) ) {
+			if (isset($params['prematch']) && is_array($params['prematch'])) {
 				$prematch_field_wordpress  = $params['prematch']['wordpress_field'];
 				$prematch_field_salesforce = $params['prematch']['salesforce_field'];
 				$prematch_value            = $params['prematch']['value'];
@@ -790,11 +790,11 @@ 
 					'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 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'];
@@ -804,20 +804,20 @@ 
 					'method_update' => $params['prematch']['method_update'],
 					'method_read'   => $params['key']['method_read'],
 				);
-				unset( $params['key'] );
+				unset($params['key']);
 			}
 
 			// 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(
@@ -835,28 +835,28 @@ 
 					// returns a $salesforce_id.
 					// it should keep NULL if there is no match
 					// the function that calls this hook needs to check the mapping to make sure the WordPress object is the right type
-					$wordpress_id = apply_filters( 'object_sync_for_salesforce_find_wp_object_match', null, $object, $mapping, 'pull' );
+					$wordpress_id = apply_filters('object_sync_for_salesforce_find_wp_object_match', null, $object, $mapping, 'pull');
 
 					// hook to allow other plugins to do something right before WordPress data is saved
 					// ex: run outside methods on an object if it exists, or do something in preparation for it if it doesn't
-					do_action( 'object_sync_for_salesforce_pre_pull', $wordpress_id, $mapping, $object, $object_id, $params );
+					do_action('object_sync_for_salesforce_pre_pull', $wordpress_id, $mapping, $object, $object_id, $params);
 
-					if ( isset( $prematch_field_salesforce ) || isset( $key_field_salesforce ) || null !== $wordpress_id ) {
+					if (isset($prematch_field_salesforce) || isset($key_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;
-						} elseif ( isset( $key_field_salesforce ) ) {
+						} elseif (isset($key_field_salesforce)) {
 							$upsert_key     = $key_field_wordpress;
 							$upsert_value   = $key_value;
 							$upsert_methods = $key_methods;
 						}
 
-						if ( null !== $wordpress_id ) {
+						if (null !== $wordpress_id) {
 							$upsert_key     = $object_id;
 							$upsert_value   = $wordpress_id;
 							$upsert_methods = array();
@@ -865,13 +865,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,
@@ -886,35 +886,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(
@@ -928,37 +928,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( $salesforce_mapping['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($salesforce_mapping['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;
@@ -977,9 +977,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,
@@ -988,50 +988,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;
@@ -1045,26 +1045,26 @@ 
 						$status
 					);
 
-					if ( false === $hold_exceptions ) {
+					if (false === $hold_exceptions) {
 						throw $e;
 					}
-					if ( empty( $exception ) ) {
+					if (empty($exception)) {
 						$exception = $e;
 					} else {
-						$my_class  = get_class( $e );
-						$exception = new $my_class( $e->getMessage(), $e->getCode(), $exception );
+						$my_class  = get_class($e);
+						$exception = new $my_class($e->getMessage(), $e->getCode(), $exception);
 					}
 
 					// hook for pull fail
-					do_action( 'object_sync_for_salesforce_pull_fail', $op, $result, $synced_object );
+					do_action('object_sync_for_salesforce_pull_fail', $op, $result, $synced_object);
 
 					return;
 				} // End try().
 
 				// set $wordpress_data to the query result
 				$wordpress_data = $result['data'];
-				if ( isset( $wordpress_data[ "$object_id" ] ) ) {
-					$wordpress_id = $wordpress_data[ "$object_id" ];
+				if (isset($wordpress_data["$object_id"])) {
+					$wordpress_id = $wordpress_data["$object_id"];
 				} else {
 					$wordpress_id = 0;
 				}
@@ -1073,23 +1073,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(
@@ -1102,40 +1102,40 @@ 
 
 					// update that mapping object
 					$mapping_object['wordpress_id'] = $wordpress_id;
-					$mapping_object                 = $this->mappings->update_object_map( $mapping_object, $mapping_object['id'] );
+					$mapping_object                 = $this->mappings->update_object_map($mapping_object, $mapping_object['id']);
 
 					// hook for pull success
-					do_action( 'object_sync_for_salesforce_pull_success', $op, $result, $synced_object );
+					do_action('object_sync_for_salesforce_pull_success', $op, $result, $synced_object);
 				} else {
 
 					// create log entry for failed create or upsert
 					// this is part of the drupal module but i am failing to understand when it would ever fire, since the catch should catch the errors
 					// if we see this in the log entries, we can understand what it does, but probably not until then
 					$status = 'error';
-					if ( isset( $this->logging ) ) {
+					if (isset($this->logging)) {
 						$logging = $this->logging;
-					} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-						$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+					} elseif (class_exists('Object_Sync_Sf_Logging')) {
+						$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 					}
 
-					if ( is_object( $wordpress_id ) ) {
+					if (is_object($wordpress_id)) {
 						// print this array because if this happens, something weird has happened and we want to log whatever we have
-						$wordpress_id = print_r( $wordpress_id, true );
+						$wordpress_id = print_r($wordpress_id, true);
 					}
 
 					// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object type, 3) the Salesforce object Id value
-					$title = sprintf( esc_html__( 'Error syncing: %1$s to WordPress (Salesforce %2$s Id %3$s)', 'object-sync-for-salesforce' ),
-						esc_attr( $op ),
-						esc_attr( $salesforce_mapping['salesforce_object'] ),
-						esc_attr( $object['Id'] )
+					$title = sprintf(esc_html__('Error syncing: %1$s to WordPress (Salesforce %2$s Id %3$s)', 'object-sync-for-salesforce'),
+						esc_attr($op),
+						esc_attr($salesforce_mapping['salesforce_object']),
+						esc_attr($object['Id'])
 					);
 
 					// translators: placeholders are: 1) the name of the WordPress object type, 2) the WordPress id field name, 3) the WordPress id field value, 4) the array of errors
-					$body = sprintf( '<p>' . esc_html__( 'Object: %1$s with %2$s of %3$s', 'object-sync-for-salesforce' ) . '</p><p>' . esc_html__( 'Message: ', 'object-sync-for-salesforce' ) . '%4$s',
-						esc_attr( $salesforce_mapping['wordpress_object'] ),
-						esc_attr( $object_id ),
-						esc_attr( $wordpress_id ),
-						print_r( $result['errors'], true ) // if we get this error, we need to know whatever we have
+					$body = sprintf('<p>' . esc_html__('Object: %1$s with %2$s of %3$s', 'object-sync-for-salesforce') . '</p><p>' . esc_html__('Message: ', 'object-sync-for-salesforce') . '%4$s',
+						esc_attr($salesforce_mapping['wordpress_object']),
+						esc_attr($object_id),
+						esc_attr($wordpress_id),
+						print_r($result['errors'], true) // if we get this error, we need to know whatever we have
 					);
 
 					$logging->setup(
@@ -1147,52 +1147,52 @@ 
 					);
 
 					// hook for pull fail
-					do_action( 'object_sync_for_salesforce_pull_fail', $op, $result, $synced_object );
+					do_action('object_sync_for_salesforce_pull_fail', $op, $result, $synced_object);
 
 					return;
 				} // End if().
-			} elseif ( false === $is_new ) {
+			} elseif (false === $is_new) {
 
 				// right here we should set the pulling transient
-				set_transient( 'salesforce_pulling_' . $mapping_object['id'], 1, $seconds );
-				set_transient( 'salesforce_pulling_object_id', $mapping_object['id'] );
+				set_transient('salesforce_pulling_' . $mapping_object['id'], 1, $seconds);
+				set_transient('salesforce_pulling_object_id', $mapping_object['id']);
 
 				// there is an existing object link
 				// if the last sync is greater than the last time this object was updated by Salesforce, skip it
 				// this keeps us from doing redundant syncs
 				// because SF stores all DateTimes in UTC.
-				$mapping_object['object_updated'] = current_time( 'mysql' );
+				$mapping_object['object_updated'] = current_time('mysql');
 
 				$pull_trigger_field = $salesforce_mapping['pull_trigger_field'];
-				$pull_trigger_value = $object[ $pull_trigger_field ];
+				$pull_trigger_value = $object[$pull_trigger_field];
 
 				try {
 
 					// hook to allow other plugins to do something right before WordPress data is saved
 					// ex: run outside methods on an object if it exists, or do something in preparation for it if it doesn't
-					do_action( 'object_sync_for_salesforce_pre_pull', $mapping_object['wordpress_id'], $mapping, $object, $object_id, $params );
+					do_action('object_sync_for_salesforce_pre_pull', $mapping_object['wordpress_id'], $mapping, $object, $object_id, $params);
 
 					$op     = 'Update';
-					$result = $this->wordpress->object_update( $salesforce_mapping['wordpress_object'], $mapping_object['wordpress_id'], $params );
+					$result = $this->wordpress->object_update($salesforce_mapping['wordpress_object'], $mapping_object['wordpress_id'], $params);
 
 					$mapping_object['last_sync_status']  = $this->mappings->status_success;
-					$mapping_object['last_sync_message'] = esc_html__( 'Mapping object updated via function: ', 'object-sync-for-salesforce' ) . __FUNCTION__;
+					$mapping_object['last_sync_message'] = esc_html__('Mapping object updated via function: ', 'object-sync-for-salesforce') . __FUNCTION__;
 
 					$status = 'success';
-					if ( isset( $this->logging ) ) {
+					if (isset($this->logging)) {
 						$logging = $this->logging;
-					} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-						$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+					} elseif (class_exists('Object_Sync_Sf_Logging')) {
+						$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 					}
 
 					// translators: placeholders are: 1) what operation is happening, 2) the name of the WordPress object type, 3) the WordPress id field name, 4) the WordPress object id value, 5) the name of the Salesforce object, 6) the Salesforce Id value
-					$title = sprintf( esc_html__( 'Success: %1$s %2$s with %3$s of %4$s (Salesforce %5$s Id of %6$s)', 'object-sync-for-salesforce' ),
-						esc_attr( $op ),
-						esc_attr( $salesforce_mapping['wordpress_object'] ),
-						esc_attr( $object_id ),
-						esc_attr( $mapping_object['wordpress_id'] ),
-						esc_attr( $salesforce_mapping['salesforce_object'] ),
-						esc_attr( $object['Id'] )
+					$title = sprintf(esc_html__('Success: %1$s %2$s with %3$s of %4$s (Salesforce %5$s Id of %6$s)', 'object-sync-for-salesforce'),
+						esc_attr($op),
+						esc_attr($salesforce_mapping['wordpress_object']),
+						esc_attr($object_id),
+						esc_attr($mapping_object['wordpress_id']),
+						esc_attr($salesforce_mapping['salesforce_object']),
+						esc_attr($object['Id'])
 					);
 
 					$logging->setup(
@@ -1204,25 +1204,25 @@ 
 					);
 
 					// hook for pull success
-					do_action( 'object_sync_for_salesforce_pull_success', $op, $result, $synced_object );
+					do_action('object_sync_for_salesforce_pull_success', $op, $result, $synced_object);
 
-				} catch ( WordpressException $e ) {
+				} catch (WordpressException $e) {
 					// create log entry for failed update
 					$status = 'error';
-					if ( isset( $this->logging ) ) {
+					if (isset($this->logging)) {
 						$logging = $this->logging;
-					} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-						$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+					} elseif (class_exists('Object_Sync_Sf_Logging')) {
+						$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 					}
 
 					// translators: placeholders are: 1) what operation is happening, 2) the name of the WordPress object, 3) the WordPress id field name, 4) the WordPress object id value, 5) the name of the Salesforce object, 6) the Salesforce Id value
-					$title .= sprintf( esc_html__( 'Error: %1$s %2$s with %3$s of %4$s (Salesforce %5$s with Id of %6$s)', 'object-sync-for-salesforce' ),
-						esc_attr( $op ),
-						esc_attr( $salesforce_mapping['wordpress_object'] ),
-						esc_attr( $object_id ),
-						esc_attr( $mapping_object['wordpress_id'] ),
-						esc_attr( $salesforce_mapping['salesforce_object'] ),
-						esc_attr( $object['Id'] )
+					$title .= sprintf(esc_html__('Error: %1$s %2$s with %3$s of %4$s (Salesforce %5$s with Id of %6$s)', 'object-sync-for-salesforce'),
+						esc_attr($op),
+						esc_attr($salesforce_mapping['wordpress_object']),
+						esc_attr($object_id),
+						esc_attr($mapping_object['wordpress_id']),
+						esc_attr($salesforce_mapping['salesforce_object']),
+						esc_attr($object['Id'])
 					);
 
 					$logging->setup(
@@ -1236,18 +1236,18 @@ 
 					$mapping_object['last_sync_status']  = $this->mappings->status_error;
 					$mapping_object['last_sync_message'] = $e->getMessage();
 
-					if ( false === $hold_exceptions ) {
+					if (false === $hold_exceptions) {
 						throw $e;
 					}
-					if ( empty( $exception ) ) {
+					if (empty($exception)) {
 						$exception = $e;
 					} else {
-						$my_class  = get_class( $e );
-						$exception = new $my_class( $e->getMessage(), $e->getCode(), $exception );
+						$my_class  = get_class($e);
+						$exception = new $my_class($e->getMessage(), $e->getCode(), $exception);
 					}
 
 					// hook for pull fail
-					do_action( 'object_sync_for_salesforce_pull_fail', $op, $result, $synced_object );
+					do_action('object_sync_for_salesforce_pull_fail', $op, $result, $synced_object);
 
 				} // End try().
 
@@ -1256,26 +1256,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;
 		}
 
@@ -1295,17 +1295,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/admin.php

Indentation +231 added lines, -231 removed lines

@@ -26,62 +26,62 @@ 
 	protected $schedulable_classes;
 
 	/**
-	* @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 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 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;
 
 	/**
-	* 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
-	* @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
+	 * @throws \Exception
+	 */
 	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes ) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
@@ -117,9 +117,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' ) );
@@ -148,21 +148,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">';
@@ -372,10 +372,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';
@@ -400,13 +400,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(
@@ -611,25 +611,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 ) {
 		foreach ( $this->schedulable_classes as $key => $value ) {
 			add_settings_section( $key, $value['label'], null, $page );
@@ -708,13 +708,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(
@@ -892,9 +892,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
@@ -967,14 +967,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 ) ) {
@@ -1022,13 +1022,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'] ) ) {
@@ -1056,12 +1056,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 );
@@ -1080,13 +1080,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 ) ) {
@@ -1111,12 +1111,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 ) ) {
@@ -1135,12 +1135,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 ) ) {
@@ -1157,11 +1157,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 ) ) {
@@ -1180,13 +1180,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 );
@@ -1234,12 +1234,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'] ) {
@@ -1255,13 +1255,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 );
@@ -1300,12 +1300,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'] ) {
@@ -1321,9 +1321,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' ) ) {
@@ -1421,9 +1421,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' ) ) {
@@ -1452,10 +1452,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'];
@@ -1502,11 +1502,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'];
@@ -1540,10 +1540,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'];
@@ -1587,10 +1587,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();
@@ -1604,10 +1604,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'];
@@ -1634,10 +1634,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();
@@ -1696,10 +1696,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' );
@@ -1711,8 +1711,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(
@@ -1723,9 +1723,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 ) {
@@ -1745,9 +1745,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
@@ -1767,10 +1767,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() ) {
@@ -1794,10 +1794,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'] ) ) {
@@ -1822,10 +1822,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 );
@@ -1855,9 +1855,9 @@ 
 	}
 
 	/**
-	* Clear schedule
-	* This clears the schedule if the user clicks the button
-	*/
+	 * Clear schedule
+	 * This clears the schedule if the user clicks the button
+	 */
 	private function clear_schedule( $schedule_name = '' ) {
 		if ( '' !== $schedule_name ) {
 			$schedule = $this->schedule( $schedule_name );
@@ -1879,8 +1879,8 @@ 
 	}
 
 	/**
-	* Load the schedule class
-	*/
+	 * Load the schedule class
+	 */
 	private function schedule( $schedule_name ) {
 		if ( ! class_exists( 'Object_Sync_Sf_Schedule' ) && file_exists( plugin_dir_path( __FILE__ ) . '../vendor/autoload.php' ) ) {
 			require_once plugin_dir_path( __FILE__ ) . '../vendor/autoload.php';
@@ -1892,21 +1892,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 +547 added lines, -547 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -82,7 +82,7 @@ 
 	* @param array $schedulable_classes
 	* @throws \Exception
 	*/
-	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes ) {
+	public function __construct($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
 		$this->login_credentials   = $login_credentials;
@@ -121,29 +121,29 @@ 
 	*
 	*/
 	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_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_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_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'));
 
 	}
 
@@ -152,8 +152,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'));
 	}
 
 	/**
@@ -164,114 +164,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'];
@@ -282,14 +282,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':
@@ -299,73 +299,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>';
@@ -377,14 +377,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,
@@ -393,10 +393,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);
 	}
 
 	/**
@@ -407,11 +407,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,
@@ -424,7 +424,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,
@@ -436,7 +436,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,
@@ -448,7 +448,7 @@ 
 				),
 			),
 			'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,
@@ -456,22 +456,22 @@ 
 					'type'     => 'url',
 					'validate' => 'sanitize_text_field',
 					// 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_text_field',
-					'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,
 				),
@@ -484,7 +484,7 @@ 
 				'args'     => array(
 					'type'     => 'text',
 					'validate' => 'sanitize_text_field',
-					'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,
 				),
@@ -510,7 +510,7 @@ 
 				'args'     => array(
 					'type'     => 'checkboxes',
 					'validate' => 'sanitize_text_field',
-					'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',
@@ -535,7 +535,7 @@ 
 				'args'     => array(
 					'type'     => 'number',
 					'validate' => 'sanitize_text_field',
-					'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,
 				),
@@ -548,7 +548,7 @@ 
 				'args'     => array(
 					'type'     => 'checkbox',
 					'validate' => 'sanitize_text_field',
-					'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' => '',
 				),
 			),
@@ -560,13 +560,13 @@ 
 				'args'     => array(
 					'type'     => 'checkbox',
 					'validate' => 'sanitize_text_field',
-					'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'],
@@ -582,7 +582,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'];
@@ -601,12 +601,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));
 		}
 	}
 
@@ -618,8 +618,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);
 	}
 
 	/**
@@ -630,12 +630,12 @@ 
 	* @param string $section
 	* @param string $input_callback
 	*/
-	private function fields_scheduling( $page, $section, $callbacks ) {
-		foreach ( $this->schedulable_classes as $key => $value ) {
-			add_settings_section( $key, $value['label'], null, $page );
+	private function fields_scheduling($page, $section, $callbacks) {
+		foreach ($this->schedulable_classes as $key => $value) {
+			add_settings_section($key, $value['label'], null, $page);
 			$schedule_settings = array(
 				$key . '_schedule_number' => array(
-					'title'    => __( 'Run schedule every', 'object-sync-for-salesforce' ),
+					'title'    => __('Run schedule every', 'object-sync-for-salesforce'),
 					'callback' => $callbacks['text'],
 					'page'     => $page,
 					'section'  => $key,
@@ -647,7 +647,7 @@ 
 					),
 				),
 				$key . '_schedule_unit'   => array(
-					'title'    => __( 'Time unit', 'object-sync-for-salesforce' ),
+					'title'    => __('Time unit', 'object-sync-for-salesforce'),
 					'callback' => $callbacks['select'],
 					'page'     => $page,
 					'section'  => $key,
@@ -673,19 +673,19 @@ 
 				),
 				$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',
 						'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'];
@@ -701,8 +701,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().
 	}
@@ -715,11 +715,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,
@@ -731,32 +731,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_text_field',
-					'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' => '',
 						),
@@ -764,7 +764,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,
@@ -776,20 +776,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_text_field',
-					'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,
@@ -802,67 +802,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_text_field',
-					'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_text_field',
-					'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' => '',
 						),
@@ -870,7 +870,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'];
@@ -886,8 +886,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);
 		}
 	}
 
@@ -898,69 +898,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);
 			}
 		}
 
@@ -975,47 +975,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;
 		}
@@ -1029,23 +1029,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'];
 					}
 				}
 			}
@@ -1062,18 +1062,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;
 		}
@@ -1087,24 +1087,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;
 		}
@@ -1117,17 +1117,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;
 		}
@@ -1141,16 +1141,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;
 		}
@@ -1162,18 +1162,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;
 		}
@@ -1189,47 +1189,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();
 	}
 
@@ -1241,15 +1241,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();
 		}
 	}
@@ -1264,38 +1264,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();
 	}
 
@@ -1307,15 +1307,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();
 		}
 	}
@@ -1326,95 +1326,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;
 		}
 
@@ -1426,28 +1426,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;
 	}
 
@@ -1456,7 +1456,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'];
@@ -1465,38 +1465,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')
 			);
 		}
 	}
@@ -1507,33 +1507,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)
 				);
 			}
 		}
@@ -1544,44 +1544,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')
 			);
 		}
 	}
@@ -1594,7 +1594,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'] . ')',
@@ -1608,26 +1608,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)
 			);
 		}
 
@@ -1638,60 +1638,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');
 
 	}
 
@@ -1701,12 +1701,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')
 		);
 	}
 
@@ -1714,28 +1714,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,
@@ -1758,7 +1758,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;
@@ -1771,23 +1771,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');
 				}
 			}
 		}
@@ -1798,10 +1798,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',
@@ -1809,14 +1809,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);
 			}
 		}
 	}
@@ -1826,29 +1826,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 = '';
 		}
@@ -1858,21 +1858,21 @@ 
 	* Clear schedule
 	* This clears the schedule if the user clicks the button
 	*/
-	private function clear_schedule( $schedule_name = '' ) {
-		if ( '' !== $schedule_name ) {
-			$schedule = $this->schedule( $schedule_name );
-			$schedule->cancel_by_name( $schedule_name );
+	private function clear_schedule($schedule_name = '') {
+		if ('' !== $schedule_name) {
+			$schedule = $this->schedule($schedule_name);
+			$schedule->cancel_by_name($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');
 		}
 	}
 
-	private function get_schedule_count( $schedule_name = '' ) {
-		if ( '' !== $schedule_name ) {
-			$schedule = $this->schedule( $schedule_name );
-			return $this->schedule->count_queue_items( $schedule_name );
+	private function get_schedule_count($schedule_name = '') {
+		if ('' !== $schedule_name) {
+			$schedule = $this->schedule($schedule_name);
+			return $this->schedule->count_queue_items($schedule_name);
 		} else {
 			return 'unknown';
 		}
@@ -1881,12 +1881,12 @@ 
 	/**
 	* Load the schedule class
 	*/
-	private function schedule( $schedule_name ) {
-		if ( ! class_exists( 'Object_Sync_Sf_Schedule' ) && file_exists( plugin_dir_path( __FILE__ ) . '../vendor/autoload.php' ) ) {
-			require_once plugin_dir_path( __FILE__ ) . '../vendor/autoload.php';
-			require_once plugin_dir_path( __FILE__ ) . '../classes/schedule.php';
+	private function schedule($schedule_name) {
+		if ( ! class_exists('Object_Sync_Sf_Schedule') && file_exists(plugin_dir_path(__FILE__) . '../vendor/autoload.php')) {
+			require_once plugin_dir_path(__FILE__) . '../vendor/autoload.php';
+			require_once plugin_dir_path(__FILE__) . '../classes/schedule.php';
 		}
-		$schedule       = new Object_Sync_Sf_Schedule( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $schedule_name, $this->logging, $this->schedulable_classes );
+		$schedule       = new Object_Sync_Sf_Schedule($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $schedule_name, $this->logging, $this->schedulable_classes);
 		$this->schedule = $schedule;
 		return $schedule;
 	}
@@ -1907,17 +1907,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/salesforce_push.php

Indentation +139 added lines, -139 removed lines

@@ -24,24 +24,24 @@ 
 	protected $schedulable_classes;
 
 	/**
-	* @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 object $wordpress
-	* @param object $salesforce
-	* @param object $mappings
-	* @param object $logging
-	* @param array $schedulable_classes
-	* @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 object $wordpress
+	 * @param object $salesforce
+	 * @param object $mappings
+	 * @param object $logging
+	 * @param array $schedulable_classes
+	 * @throws \Object_Sync_Sf_Exception
+	 */
 	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes ) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
@@ -62,10 +62,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.
+	 *
+	 */
 	private function add_actions() {
 		$db_version = get_option( 'object_sync_for_salesforce_db_version', false );
 		if ( $db_version === $this->version ) {
@@ -97,54 +97,54 @@ 
 	}
 
 	/**
-	* 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 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;
@@ -191,66 +191,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'];
@@ -258,75 +258,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 );
@@ -451,20 +451,20 @@ 
 	}
 
 	/**
-	* Sync WordPress objects and Salesforce objects using the REST API.
-	*
-	* @param string $object_type
-	*   Type of WordPress object.
-	* @param object $object
-	*   The object object.
-	* @param object $mapping
-	*   Salesforce mapping object.
-	* @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 object $object
+	 *   The object object.
+	 * @param object $mapping
+	 *   Salesforce mapping object.
+	 * @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 Salesforce is not authorized, don't do anything.
@@ -1006,21 +1006,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 +292 added lines, -292 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -42,7 +42,7 @@ 
 	* @param array $schedulable_classes
 	* @throws \Object_Sync_Sf_Exception
 	*/
-	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes ) {
+	public function __construct($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
 		$this->login_credentials   = $login_credentials;
@@ -57,7 +57,7 @@ 
 		$this->schedule      = $this->schedule();
 		$this->add_actions();
 
-		$this->debug = get_option( 'object_sync_for_salesforce_debug_mode', false );
+		$this->debug = get_option('object_sync_for_salesforce_debug_mode', false);
 
 	}
 
@@ -67,31 +67,31 @@ 
 	*
 	*/
 	private function add_actions() {
-		$db_version = get_option( 'object_sync_for_salesforce_db_version', false );
-		if ( $db_version === $this->version ) {
-			foreach ( $this->mappings->get_fieldmaps() as $mapping ) {
+		$db_version = get_option('object_sync_for_salesforce_db_version', false);
+		if ($db_version === $this->version) {
+			foreach ($this->mappings->get_fieldmaps() as $mapping) {
 				$object_type = $mapping['wordpress_object'];
-				if ( 'user' === $object_type ) {
-					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
+				if ('user' === $object_type) {
+					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
 				} 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);
 				}
 			}
 		}
@@ -104,8 +104,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);
 	}
 
 	/**
@@ -113,9 +113,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');
 	}
 
 	/**
@@ -124,9 +124,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');
 	}
 
 	/**
@@ -134,9 +134,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');
 	}
 
 	/**
@@ -146,48 +146,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);
 		}
 	}
 
@@ -196,9 +196,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');
 	}
 
 	/**
@@ -206,9 +206,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');
 	}
 
 	/**
@@ -216,9 +216,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');
 	}
 
 	/**
@@ -228,9 +228,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);
 	}
 
 	/**
@@ -239,9 +239,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);
 	}
 
 	/**
@@ -252,10 +252,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);
 	}
 
 	/**
@@ -265,9 +265,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');
 	}
 
 	/**
@@ -275,9 +275,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');
 	}
 
 	/**
@@ -285,33 +285,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);
 	}
 
 	/**
@@ -328,50 +328,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
@@ -388,14 +388,14 @@ 
 			)
 		);
 
-		foreach ( $sf_mappings as $mapping ) { // for each mapping of this object
+		foreach ($sf_mappings as $mapping) { // for each mapping of this object
 			$map_sync_triggers = $mapping['sync_triggers'];
 
 			// these are bit operators, so we leave out the strict
-			if ( isset( $map_sync_triggers ) && isset( $sf_sync_trigger ) && in_array( $sf_sync_trigger, $map_sync_triggers ) ) { // wp or sf crud event
+			if (isset($map_sync_triggers) && isset($sf_sync_trigger) && in_array($sf_sync_trigger, $map_sync_triggers)) { // wp or sf crud event
 
 				// hook to allow other plugins to prevent a push per-mapping.
-				$push_allowed = apply_filters( 'object_sync_for_salesforce_push_object_allowed', true, $object_type, $object, $sf_sync_trigger, $mapping );
+				$push_allowed = apply_filters('object_sync_for_salesforce_push_object_allowed', true, $object_type, $object, $sf_sync_trigger, $mapping);
 
 				// example to keep from pushing the user with id of 1
 				/*
@@ -408,17 +408,17 @@ 
 				}
 				*/
 
-				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
 					$data = array(
 						'object_type'     => $object_type,
@@ -429,24 +429,24 @@ 
 
 					// create new schedule based on the options for this current class
 					// this will use the existing schedule if it already exists; otherwise it'll create one
-					$this->schedule->use_schedule( $this->schedule_name );
-					$this->schedule->push_to_queue( $data );
+					$this->schedule->use_schedule($this->schedule_name);
+					$this->schedule->push_to_queue($data);
 					$this->schedule->save()->dispatch();
 
 				} 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().
 	}
 
 	private function schedule() {
-		if ( ! class_exists( 'Object_Sync_Sf_Schedule' ) && file_exists( plugin_dir_path( __FILE__ ) . '../vendor/autoload.php' ) ) {
-			require_once plugin_dir_path( __FILE__ ) . '../vendor/autoload.php';
-			require_once plugin_dir_path( __FILE__ ) . '../classes/schedule.php';
+		if ( ! class_exists('Object_Sync_Sf_Schedule') && file_exists(plugin_dir_path(__FILE__) . '../vendor/autoload.php')) {
+			require_once plugin_dir_path(__FILE__) . '../vendor/autoload.php';
+			require_once plugin_dir_path(__FILE__) . '../classes/schedule.php';
 		}
-		$schedule       = new Object_Sync_Sf_Schedule( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->schedule_name, $this->logging, $this->schedulable_classes );
+		$schedule       = new Object_Sync_Sf_Schedule($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->schedule_name, $this->logging, $this->schedulable_classes);
 		$this->schedule = $schedule;
 		return $schedule;
 	}
@@ -466,25 +466,25 @@ 
 	* @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 Salesforce is not authorized, don't do anything.
 		// it's unclear to me if we need to do something else here or if this is sufficient. This is all Drupal does.
-		if ( true !== $this->salesforce['is_authorized'] ) {
+		if (true !== $this->salesforce['is_authorized']) {
 			return;
 		}
 
 		$sfapi = $this->salesforce['sfapi'];
 
 		// we need to get the WordPress id here so we can check to see if the object already has a map
-		$structure = $this->wordpress->get_wordpress_table_structure( $object_type );
+		$structure = $this->wordpress->get_wordpress_table_structure($object_type);
 		$object_id = $structure['id_field'];
 
 		// this returns the row that maps the individual WordPress row to the individual Salesfoce row
-		$mapping_object = $this->mappings->load_by_wordpress( $object_type, $object[ "$object_id" ] );
+		$mapping_object = $this->mappings->load_by_wordpress($object_type, $object["$object_id"]);
 
 		// hook to allow other plugins to define or alter the mapping object
-		$mapping_object = apply_filters( 'object_sync_for_salesforce_push_mapping_object', $mapping_object, $object, $mapping );
+		$mapping_object = apply_filters('object_sync_for_salesforce_push_mapping_object', $mapping_object, $object, $mapping);
 
 		// we already have the data from WordPress at this point; we just need to work with it in Salesforce
 		$synced_object = array(
@@ -498,84 +498,84 @@ 
 
 		// deleting mapped objects
 		// these are bit operators, so we leave out the strict
-		if ( $sf_sync_trigger == $this->mappings->sync_wordpress_delete ) {
-			if ( isset( $mapping_object['id'] ) ) {
+		if ($sf_sync_trigger == $this->mappings->sync_wordpress_delete) {
+			if (isset($mapping_object['id'])) {
 				$op = 'Delete';
 
-				$salesforce_check = $this->mappings->load_by_salesforce( $mapping_object['salesforce_id'] );
+				$salesforce_check = $this->mappings->load_by_salesforce($mapping_object['salesforce_id']);
 
-				if ( count( $salesforce_check ) === count( $salesforce_check, COUNT_RECURSIVE ) ) {
+				if (count($salesforce_check) === count($salesforce_check, COUNT_RECURSIVE)) {
 					try {
-						$result = $sfapi->object_delete( $mapping['salesforce_object'], $mapping_object['salesforce_id'] );
-					} catch ( Object_Sync_Sf_Exception $e ) {
+						$result = $sfapi->object_delete($mapping['salesforce_object'], $mapping_object['salesforce_id']);
+					} catch (Object_Sync_Sf_Exception $e) {
 						$status = 'error';
 						// create log entry for failed delete
-						if ( isset( $this->logging ) ) {
+						if (isset($this->logging)) {
 							$logging = $this->logging;
-						} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-							$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+						} elseif (class_exists('Object_Sync_Sf_Logging')) {
+							$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 						}
 
 						// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-						$title = sprintf( esc_html__( 'Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-							esc_attr( $op ),
-							esc_attr( $mapping['salesforce_object'] ),
-							esc_attr( $mapping_object['salesforce_id'] ),
-							esc_attr( $mapping['wordpress_object'] ),
-							esc_attr( $object_id ),
-							esc_attr( $object[ "$object_id" ] )
+						$title = sprintf(esc_html__('Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+							esc_attr($op),
+							esc_attr($mapping['salesforce_object']),
+							esc_attr($mapping_object['salesforce_id']),
+							esc_attr($mapping['wordpress_object']),
+							esc_attr($object_id),
+							esc_attr($object["$object_id"])
 						);
 
 						$logging->setup(
 							$title,
 							$e->getMessage(),
 							$sf_sync_trigger,
-							$object[ "$object_id" ],
+							$object["$object_id"],
 							$status
 						);
 
 						// hook for push fail
-						do_action( 'object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object, $object_id );
+						do_action('object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object, $object_id);
 
 					}
 
-					if ( ! isset( $e ) ) {
+					if ( ! isset($e)) {
 						// create log entry for successful delete if the result had no errors
 						$status = 'success';
-						if ( isset( $this->logging ) ) {
+						if (isset($this->logging)) {
 							$logging = $this->logging;
-						} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-							$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+						} elseif (class_exists('Object_Sync_Sf_Logging')) {
+							$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 						}
 
 						// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-						$title = sprintf( esc_html__( 'Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-							esc_attr( $op ),
-							esc_attr( $mapping['salesforce_object'] ),
-							esc_attr( $mapping_object['salesforce_id'] ),
-							esc_attr( $mapping['wordpress_object'] ),
-							esc_attr( $object_id ),
-							esc_attr( $object[ "$object_id" ] )
+						$title = sprintf(esc_html__('Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+							esc_attr($op),
+							esc_attr($mapping['salesforce_object']),
+							esc_attr($mapping_object['salesforce_id']),
+							esc_attr($mapping['wordpress_object']),
+							esc_attr($object_id),
+							esc_attr($object["$object_id"])
 						);
 
 						$logging->setup(
 							$title,
 							'',
 							$sf_sync_trigger,
-							$object[ "$object_id" ],
+							$object["$object_id"],
 							$status
 						);
 
 						// hook for push success
-						do_action( 'object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id );
+						do_action('object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id);
 					}
 				} else {
 					$more_ids = '<p>The Salesforce record was not deleted because there are multiple WordPress IDs that match this Salesforce ID. They are: ';
 					$i        = 0;
-					foreach ( $salesforce_check as $match ) {
+					foreach ($salesforce_check as $match) {
 						$i++;
 						$more_ids .= $match['wordpress_id'];
-						if ( count( $salesforce_check ) !== $i ) {
+						if (count($salesforce_check) !== $i) {
 							$more_ids .= ', ';
 						} else {
 							$more_ids .= '.</p>';
@@ -585,34 +585,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
 
@@ -620,51 +620,51 @@ 
 		} // End if().
 
 		// are these objects already connected in WordPress?
-		if ( isset( $mapping_object['id'] ) ) {
+		if (isset($mapping_object['id'])) {
 			$is_new = false;
 		} else {
 			$is_new = true;
 		}
 
 		// map the WordPress values to salesforce fields
-		$params = $this->mappings->map_params( $mapping, $object, $sf_sync_trigger, false, $is_new );
+		$params = $this->mappings->map_params($mapping, $object, $sf_sync_trigger, false, $is_new);
 
 		// hook to allow other plugins to modify the $params array
 		// use hook to map fields between the WordPress and Salesforce objects
 		// returns $params.
-		$params = apply_filters( 'object_sync_for_salesforce_push_params_modify', $params, $mapping, $object, $sf_sync_trigger, false, $is_new );
+		$params = apply_filters('object_sync_for_salesforce_push_params_modify', $params, $mapping, $object, $sf_sync_trigger, false, $is_new);
 
 		// if we don't get any params, there are no fields that should be sent to Salesforce
-		if ( empty( $params ) ) {
+		if (empty($params)) {
 			return;
 		}
 
 		// if there is a prematch WordPress field - ie email - on the fieldmap object
-		if ( isset( $params['prematch'] ) && is_array( $params['prematch'] ) ) {
+		if (isset($params['prematch']) && is_array($params['prematch'])) {
 			$prematch_field_wordpress  = $params['prematch']['wordpress_field'];
 			$prematch_field_salesforce = $params['prematch']['salesforce_field'];
 			$prematch_value            = $params['prematch']['value'];
-			unset( $params['prematch'] );
+			unset($params['prematch']);
 		}
 
 		// if there is an external key field in Salesforce - ie mailchimp user id - on the fieldmap object
-		if ( isset( $params['key'] ) && is_array( $params['key'] ) ) {
+		if (isset($params['key']) && is_array($params['key'])) {
 			$key_field_wordpress  = $params['key']['wordpress_field'];
 			$key_field_salesforce = $params['key']['salesforce_field'];
 			$key_value            = $params['key']['value'];
-			unset( $params['key'] );
+			unset($params['key']);
 		}
 
-		$seconds = $this->schedule->get_schedule_frequency_seconds( $this->schedule_name ) + 60;
+		$seconds = $this->schedule->get_schedule_frequency_seconds($this->schedule_name) + 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,
@@ -673,7 +673,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'];
 			}
 
@@ -685,61 +685,61 @@ 
 				// returns a $salesforce_id.
 				// it should keep NULL if there is no match
 				// the function that calls this hook needs to check the mapping to make sure the WordPress object is the right type
-				$salesforce_id = apply_filters( 'object_sync_for_salesforce_find_sf_object_match', null, $object, $mapping, 'push' );
+				$salesforce_id = apply_filters('object_sync_for_salesforce_find_sf_object_match', null, $object, $mapping, 'push');
 
 				// hook to allow other plugins to do something right before Salesforce data is saved
 				// ex: run WordPress methods on an object if it exists, or do something in preparation for it if it doesn't
-				do_action( 'object_sync_for_salesforce_pre_push', $salesforce_id, $mapping, $object, $object_id, $params );
+				do_action('object_sync_for_salesforce_pre_push', $salesforce_id, $mapping, $object, $object_id, $params);
 
 				// hook to allow other plugins to change params on update actions only
 				// use hook to map fields between the WordPress and Salesforce objects
 				// returns $params.
-				$params = apply_filters( 'object_sync_for_salesforce_push_update_params_modify', $params, $salesforce_id, $mapping, $object );
+				$params = apply_filters('object_sync_for_salesforce_push_update_params_modify', $params, $salesforce_id, $mapping, $object);
 
-				if ( isset( $prematch_field_wordpress ) || isset( $key_field_wordpress ) || null !== $salesforce_id ) {
+				if (isset($prematch_field_wordpress) || isset($key_field_wordpress) || null !== $salesforce_id) {
 
 					// if either prematch criteria exists, make the values queryable
 
-					if ( isset( $prematch_field_wordpress ) ) {
+					if (isset($prematch_field_wordpress)) {
 						// a prematch has been specified, attempt an upsert().
 						// prematch values with punctuation need to be escaped
-						$encoded_prematch_value = rawurlencode( $prematch_value );
+						$encoded_prematch_value = rawurlencode($prematch_value);
 						// for at least 'email' fields, periods also need to be escaped:
 						// https://developer.salesforce.com/forums?id=906F000000099xPIAQ
-						$encoded_prematch_value = str_replace( '.', '%2E', $encoded_prematch_value );
+						$encoded_prematch_value = str_replace('.', '%2E', $encoded_prematch_value);
 					}
 
-					if ( isset( $key_field_wordpress ) ) {
+					if (isset($key_field_wordpress)) {
 						// an external key has been specified, attempt an upsert().
 						// external key values with punctuation need to be escaped
-						$encoded_key_value = rawurlencode( $key_value );
+						$encoded_key_value = rawurlencode($key_value);
 						// for at least 'email' fields, periods also need to be escaped:
 						// https://developer.salesforce.com/forums?id=906F000000099xPIAQ
-						$encoded_key_value = str_replace( '.', '%2E', $encoded_key_value );
+						$encoded_key_value = str_replace('.', '%2E', $encoded_key_value);
 					}
 
-					if ( isset( $prematch_field_wordpress ) ) {
+					if (isset($prematch_field_wordpress)) {
 						$upsert_key   = $prematch_field_salesforce;
 						$upsert_value = $encoded_prematch_value;
-					} elseif ( isset( $key_field_wordpress ) ) {
+					} elseif (isset($key_field_wordpress)) {
 						$upsert_key   = $key_field_salesforce;
 						$upsert_value = $encoded_key_value;
 					}
 
-					if ( null !== $salesforce_id ) {
+					if (null !== $salesforce_id) {
 						$upsert_key   = 'Id';
 						$upsert_value = $salesforce_id;
 					}
 
 					$op = 'Upsert';
 
-					$result = $sfapi->object_upsert( $mapping['salesforce_object'], $upsert_key, $upsert_value, $params );
+					$result = $sfapi->object_upsert($mapping['salesforce_object'], $upsert_key, $upsert_value, $params);
 
 					// Handle upsert responses.
-					switch ( $sfapi->response['code'] ) {
+					switch ($sfapi->response['code']) {
 						// On Upsert:update retrieved object.
 						case '204':
-							$sf_object             = $sfapi->object_readby_external_id( $mapping['salesforce_object'], $upsert_key, $upsert_value );
+							$sf_object             = $sfapi->object_readby_external_id($mapping['salesforce_object'], $upsert_key, $upsert_value);
 							$salesforce_data['id'] = $sf_object['data']['Id'];
 							break;
 						// Handle duplicate records.
@@ -750,43 +750,43 @@ 
 				} else {
 					// No key or prematch field exists on this field map object, create a new object in Salesforce.
 					$op     = 'Create';
-					$result = $sfapi->object_create( $mapping['salesforce_object'], $params );
+					$result = $sfapi->object_create($mapping['salesforce_object'], $params);
 				} // End if().
-			} catch ( Object_Sync_Sf_Exception $e ) {
+			} catch (Object_Sync_Sf_Exception $e) {
 				// create log entry for failed create or upsert
 				$status = 'error';
 
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value if there is one, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-				$title = sprintf( esc_html__( 'Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['salesforce_object'] ),
-					isset( $salesforce_id ) ? ' ' . esc_attr( $salesforce_id ) : '',
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['salesforce_object']),
+					isset($salesforce_id) ? ' ' . esc_attr($salesforce_id) : '',
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				$logging->setup(
 					$title,
 					$e->getMessage(),
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
 				// hook for push fail
-				do_action( 'object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object );
+				do_action('object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object);
 
 				return;
 			} // End try().
 
-			if ( ! isset( $salesforce_data ) ) {
+			if ( ! isset($salesforce_data)) {
 				// if we didn't set $salesforce_data already, set it now to api call result
 				$salesforce_data = $result['data'];
 			}
@@ -795,78 +795,78 @@ 
 			// this means the object has already been created/updated in Salesforce
 			// this is not redundant because this is where it creates the object mapping rows in WordPress if the object does not already have one (we are still inside $is_new === TRUE here)
 
-			if ( empty( $result['errorCode'] ) ) {
+			if (empty($result['errorCode'])) {
 				$salesforce_id = $salesforce_data['id'];
 				$status        = 'success';
 
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-				$title = sprintf( esc_html__( 'Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['salesforce_object'] ),
-					esc_attr( $salesforce_id ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['salesforce_object']),
+					esc_attr($salesforce_id),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				$logging->setup(
 					$title,
 					'',
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
 				// update that mapping object
 				$mapping_object['salesforce_id']     = $salesforce_id;
-				$mapping_object['last_sync_message'] = esc_html__( 'Mapping object updated via function: ', 'object-sync-for-salesforce' ) . __FUNCTION__;
-				$mapping_object                      = $this->mappings->update_object_map( $mapping_object, $mapping_object['id'] );
+				$mapping_object['last_sync_message'] = esc_html__('Mapping object updated via function: ', 'object-sync-for-salesforce') . __FUNCTION__;
+				$mapping_object                      = $this->mappings->update_object_map($mapping_object, $mapping_object['id']);
 
 				// hook for push success
-				do_action( 'object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id );
+				do_action('object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id);
 			} else {
 
 				// create log entry for failed create or upsert
 				// this is part of the drupal module but i am failing to understand when it would ever fire, since the catch should catch the errors
 				// if we see this in the log entries, we can understand what it does, but probably not until then
 				$status = 'error';
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholders are: 1) error code the Salesforce API returned, 2) what operation is happening, 3) the name of the WordPress object type, 4) the WordPress id field name, 5) the WordPress object id value
-				$title = sprintf( esc_html__( '%1$s error syncing: %2$s to Salesforce (WordPress %3$s with %4$s of %5$s)', 'object-sync-for-salesforce' ),
-					absint( $salesforce_data['errorCode'] ),
-					esc_attr( $op ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('%1$s error syncing: %2$s to Salesforce (WordPress %3$s with %4$s of %5$s)', 'object-sync-for-salesforce'),
+					absint($salesforce_data['errorCode']),
+					esc_attr($op),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				// translators: placeholders are 1) the name of the Salesforce object type, 2) the error message returned from the Salesforce APIs
-				$body = sprintf( '<p>' . esc_html__( 'Object: %1$s', 'object-sync-for-salesforce' ) . '</p><p>' . esc_html__( 'Message: %2$s', 'object-sync-for-salesforce' ) . '</p>',
-					esc_attr( $mapping['salesforce_object'] ),
-					esc_html( $salesforce_data['message'] )
+				$body = sprintf('<p>' . esc_html__('Object: %1$s', 'object-sync-for-salesforce') . '</p><p>' . esc_html__('Message: %2$s', 'object-sync-for-salesforce') . '</p>',
+					esc_attr($mapping['salesforce_object']),
+					esc_html($salesforce_data['message'])
 				);
 
 				$logging->setup(
 					$title,
 					$body,
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
 				// hook for push fail
-				do_action( 'object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object );
+				do_action('object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object);
 
 				return;
 			} // End if().
@@ -874,41 +874,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;
@@ -919,71 +919,71 @@ 
 
 				// hook to allow other plugins to do something right before Salesforce data is saved
 				// ex: run WordPress methods on an object if it exists, or do something in preparation for it if it doesn't
-				do_action( 'object_sync_for_salesforce_pre_push', $mapping_object['salesforce_id'], $mapping, $object, $object_id, $params );
+				do_action('object_sync_for_salesforce_pre_push', $mapping_object['salesforce_id'], $mapping, $object, $object_id, $params);
 
 				// hook to allow other plugins to change params on update actions only
 				// use hook to map fields between the WordPress and Salesforce objects
 				// returns $params.
-				$params = apply_filters( 'object_sync_for_salesforce_push_update_params_modify', $params, $mapping_object['salesforce_id'], $mapping, $object );
+				$params = apply_filters('object_sync_for_salesforce_push_update_params_modify', $params, $mapping_object['salesforce_id'], $mapping, $object);
 
 				$op     = 'Update';
-				$result = $sfapi->object_update( $mapping['salesforce_object'], $mapping_object['salesforce_id'], $params );
+				$result = $sfapi->object_update($mapping['salesforce_object'], $mapping_object['salesforce_id'], $params);
 
 				$mapping_object['last_sync_status']  = $this->mappings->status_success;
-				$mapping_object['last_sync_message'] = esc_html__( 'Mapping object updated via function: ', 'object-sync-for-salesforce' ) . __FUNCTION__;
+				$mapping_object['last_sync_message'] = esc_html__('Mapping object updated via function: ', 'object-sync-for-salesforce') . __FUNCTION__;
 
 				$status = 'success';
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-				$title = sprintf( esc_html__( 'Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['salesforce_object'] ),
-					esc_attr( $mapping_object['salesforce_id'] ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('Success: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['salesforce_object']),
+					esc_attr($mapping_object['salesforce_id']),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				$logging->setup(
 					$title,
 					'',
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
 				// hook for push success
-				do_action( 'object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id );
+				do_action('object_sync_for_salesforce_push_success', $op, $sfapi->response, $synced_object, $object_id);
 
-			} catch ( Object_Sync_Sf_Exception $e ) {
+			} catch (Object_Sync_Sf_Exception $e) {
 				// create log entry for failed update
 				$status = 'error';
-				if ( isset( $this->logging ) ) {
+				if (isset($this->logging)) {
 					$logging = $this->logging;
-				} elseif ( class_exists( 'Object_Sync_Sf_Logging' ) ) {
-					$logging = new Object_Sync_Sf_Logging( $this->wpdb, $this->version );
+				} elseif (class_exists('Object_Sync_Sf_Logging')) {
+					$logging = new Object_Sync_Sf_Logging($this->wpdb, $this->version);
 				}
 
 				// translators: placeholders are: 1) what operation is happening, 2) the name of the Salesforce object, 3) the Salesforce Id value, 4) the name of the WordPress object type, 5) the WordPress id field name, 6) the WordPress object id value
-				$title = sprintf( esc_html__( 'Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce' ),
-					esc_attr( $op ),
-					esc_attr( $mapping['salesforce_object'] ),
-					esc_attr( $mapping_object['salesforce_id'] ),
-					esc_attr( $mapping['wordpress_object'] ),
-					esc_attr( $object_id ),
-					esc_attr( $object[ "$object_id" ] )
+				$title = sprintf(esc_html__('Error: %1$s %2$s %3$s (WordPress %4$s with %5$s of %6$s)', 'object-sync-for-salesforce'),
+					esc_attr($op),
+					esc_attr($mapping['salesforce_object']),
+					esc_attr($mapping_object['salesforce_id']),
+					esc_attr($mapping['wordpress_object']),
+					esc_attr($object_id),
+					esc_attr($object["$object_id"])
 				);
 
 				$logging->setup(
 					$title,
 					$e->getMessage(),
 					$sf_sync_trigger,
-					$object[ "$object_id" ],
+					$object["$object_id"],
 					$status
 				);
 
@@ -991,16 +991,16 @@ 
 				$mapping_object['last_sync_message'] = $e->getMessage();
 
 				// hook for push fail
-				do_action( 'object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object );
+				do_action('object_sync_for_salesforce_push_fail', $op, $sfapi->response, $synced_object);
 
 			} // End try().
 
 			// tell the mapping object - whether it is new or already existed - how we just used it
 			$mapping_object['last_sync_action'] = 'push';
-			$mapping_object['last_sync']        = current_time( 'mysql' );
+			$mapping_object['last_sync']        = current_time('mysql');
 
 			// update that mapping object
-			$result = $this->mappings->update_object_map( $mapping_object, $mapping_object['id'] );
+			$result = $this->mappings->update_object_map($mapping_object, $mapping_object['id']);
 
 		} // End if(). this is the end of the if is_new stuff
 
@@ -1022,9 +1022,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';
@@ -1033,15 +1033,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,
 			)