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/salesforce_soap_partner.php

Indentation +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@
 	public $wsdl;
 
 	/**
-	* Constructor which loads the SOAP client
-	*
-	*/
+	 * Constructor which loads the SOAP client
+	 *
+	 */
 	public function __construct( Object_Sync_Sf_Salesforce $sfapi, $wsdl = null ) {
 		if ( ! class_exists( 'SforceBaseClient' ) && file_exists( plugin_dir_path( __FILE__ ) . '../vendor/autoload.php' ) ) {
 			require_once plugin_dir_path( __FILE__ ) . '../vendor/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php';

Spacing +25 added lines, -25 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -25,33 +25,33 @@ 
 	* Constructor which loads the SOAP client
 	*
 	*/
-	public function __construct( Object_Sync_Sf_Salesforce $sfapi, $wsdl = null ) {
-		if ( ! class_exists( 'SforceBaseClient' ) && file_exists( plugin_dir_path( __FILE__ ) . '../vendor/autoload.php' ) ) {
-			require_once plugin_dir_path( __FILE__ ) . '../vendor/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php';
+	public function __construct(Object_Sync_Sf_Salesforce $sfapi, $wsdl = null) {
+		if ( ! class_exists('SforceBaseClient') && file_exists(plugin_dir_path(__FILE__) . '../vendor/autoload.php')) {
+			require_once plugin_dir_path(__FILE__) . '../vendor/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php';
 		}
 		parent::__construct();
-		if ( empty( $wsdl ) ) {
-			$wsdl = plugin_dir_path( __FILE__ ) . '../vendor/developerforce/force.com-toolkit-for-php/soapclient/partner.wsdl.xml';
+		if (empty($wsdl)) {
+			$wsdl = plugin_dir_path(__FILE__) . '../vendor/developerforce/force.com-toolkit-for-php/soapclient/partner.wsdl.xml';
 		}
-		$this->set_authorized( false );
-		$this->createConnection( $wsdl );
+		$this->set_authorized(false);
+		$this->createConnection($wsdl);
 		$this->salesforce_api = $sfapi;
 
-		if ( $this->salesforce_api->is_authorized() ) {
+		if ($this->salesforce_api->is_authorized()) {
 			$token = $this->salesforce_api->get_access_token();
-			if ( ! $token ) {
+			if ( ! $token) {
 				$token = $this->salesforce_api->refresh_token();
 			}
-			$this->setSessionHeader( $token );
-			$this->setEndPoint( $this->salesforce_api->get_api_endpoint( 'partner' ) );
-			$this->set_authorized( true );
+			$this->setSessionHeader($token);
+			$this->setEndPoint($this->salesforce_api->get_api_endpoint('partner'));
+			$this->set_authorized(true);
 		} else {
-			error_log( 'salesforce is not authorized so we cannot use soap' );
-			$this->set_authorized( false );
+			error_log('salesforce is not authorized so we cannot use soap');
+			$this->set_authorized(false);
 		}
 	}
 
-	protected function set_authorized( $is_authorized ) {
+	protected function set_authorized($is_authorized) {
 		$this->is_authorized = $is_authorized;
 	}
 
@@ -59,35 +59,35 @@ 
 		return $this->is_authorized;
 	}
 
-	public function try_soap( $function ) {
+	public function try_soap($function) {
 		$args = func_get_args();
-		array_shift( $args );
+		array_shift($args);
 		try {
-			$results = call_user_func_array( array( $this, $function ), $args );
+			$results = call_user_func_array(array($this, $function), $args);
 			// If returned without exceptions, reset the refreshed flag.
 			$this->refreshed = false;
 			return $results;
-		} catch ( SoapFault $e ) {
+		} catch (SoapFault $e) {
 			// sf:INVALID_SESSION_ID is thrown on expired login (and other reasons).
 			// Our only recourse is to try refreshing our auth token. If we get any
 			// other exception, bubble it up.
-			if ( 'sf:INVALID_SESSION_ID' !== $e->faultcode ) {
+			if ('sf:INVALID_SESSION_ID' !== $e->faultcode) {
 				throw $e;
 			}
 
-			if ( ! $this->refreshed ) {
+			if ( ! $this->refreshed) {
 				// If we got an invalid session exception, try to refresh the auth
 				// token through REST API. The "refreshed" flag will make sure we retry
 				// only once.
 				$this->refreshed = true;
 				$this->salesforce_api->refresh_token();
-				return $this->trySoap( $function, $args );
+				return $this->trySoap($function, $args);
 			}
 
 			// If we've already tried a refresh, this refresh token is probably
 			// invalid. Kill it, log, and bubble the exception.
-			$this->set_authorized( false );
-			error_log( 'website is not authorized to connect to salesforce. visit authorize page.' );
+			$this->set_authorized(false);
+			error_log('website is not authorized to connect to salesforce. visit authorize page.');
 			throw $e;
 
 		}

tests/bootstrap.php

Spacing +4 added lines, -4 removed lines

@@ -5,8 +5,8 @@ 
  * @package Object_Sync_Salesforce
  */
 
-$_tests_dir = getenv( 'WP_TESTS_DIR' );
-if ( ! $_tests_dir ) {
+$_tests_dir = getenv('WP_TESTS_DIR');
+if ( ! $_tests_dir) {
 	$_tests_dir = '/tmp/wordpress-tests-lib';
 }
 
@@ -17,9 +17,9 @@ 
  * Manually load the plugin being tested.
  */
 function _manually_load_plugin() {
-	require dirname( dirname( __FILE__ ) ) . '/object-sync-for-salesforce.php';
+	require dirname(dirname(__FILE__)) . '/object-sync-for-salesforce.php';
 }
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
+tests_add_filter('muplugins_loaded', '_manually_load_plugin');
 
 // Start up the WP testing environment.
 require $_tests_dir . '/includes/bootstrap.php';

tests/test-sample.php

Spacing +1 added lines, -1 removed lines

@@ -15,6 +15,6 @@
 	 */
 	function test_sample() {
 		// Replace this with some actual testing code.
-		$this->assertTrue( true );
+		$this->assertTrue(true);
 	}
 }

templates/admin/fieldmaps-add-edit-clone.php

Spacing +140 added lines, -140 removed lines

@@ -1,35 +1,35 @@ 
-<form method="post" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>" class="fieldmap">
-	<input type="hidden" name="redirect_url_error" value="<?php echo esc_url( $error_url ); ?>" />
-	<input type="hidden" name="redirect_url_success" value="<?php echo esc_url( $success_url ); ?>" />
-	<?php if ( isset( $transient ) ) { ?>
-	<input type="hidden" name="transient" value="<?php echo esc_html( $transient ); ?>" />
+<form method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>" class="fieldmap">
+	<input type="hidden" name="redirect_url_error" value="<?php echo esc_url($error_url); ?>" />
+	<input type="hidden" name="redirect_url_success" value="<?php echo esc_url($success_url); ?>" />
+	<?php if (isset($transient)) { ?>
+	<input type="hidden" name="transient" value="<?php echo esc_html($transient); ?>" />
 	<?php } ?>
 	<input type="hidden" name="action" value="post_fieldmap" >
-	<input type="hidden" name="method" value="<?php echo esc_attr( $method ); ?>" />
-	<?php if ( 'edit' === $method ) { ?>
-	<input type="hidden" name="id" value="<?php echo absint( $map['id'] ); ?>" />
+	<input type="hidden" name="method" value="<?php echo esc_attr($method); ?>" />
+	<?php if ('edit' === $method) { ?>
+	<input type="hidden" name="id" value="<?php echo absint($map['id']); ?>" />
 	<?php } ?>
 	<div class="fieldmap_label">
-		<label for="label"><?php echo esc_html__( 'Label', 'object-sync-for-salesforce' ); ?>: </label>
-		<input type="text" id="label" name="label" required value="<?php echo isset( $label ) ? esc_html( $label ) : ''; ?>" />
+		<label for="label"><?php echo esc_html__('Label', 'object-sync-for-salesforce'); ?>: </label>
+		<input type="text" id="label" name="label" required value="<?php echo isset($label) ? esc_html($label) : ''; ?>" />
 	</div>
 	<fieldset class="wordpress_side">
 		<div class="wordpress_object">
-			<label for="wordpress_object"><?php echo esc_html__( 'WordPress Object', 'object-sync-for-salesforce' ); ?>: </label>
+			<label for="wordpress_object"><?php echo esc_html__('WordPress Object', 'object-sync-for-salesforce'); ?>: </label>
 			<select id="wordpress_object" name="wordpress_object" required>
-				<option value="">- <?php echo esc_html__( 'Select object type', 'object-sync-for-salesforce' ); ?> -</option>
+				<option value="">- <?php echo esc_html__('Select object type', 'object-sync-for-salesforce'); ?> -</option>
 				<?php
 				$wordpress_objects = $this->wordpress->wordpress_objects;
-				foreach ( $wordpress_objects as $object ) {
-					if ( isset( $wordpress_object ) && $wordpress_object === $object ) {
+				foreach ($wordpress_objects as $object) {
+					if (isset($wordpress_object) && $wordpress_object === $object) {
 						$selected = ' selected';
 					} else {
 						$selected = '';
 					}
-					echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-						esc_html( $object ),
-						esc_attr( $selected ),
-						esc_html( $object )
+					echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+						esc_html($object),
+						esc_attr($selected),
+						esc_html($object)
 					);
 				}
 				?>
@@ -38,31 +38,31 @@ 
 	</fieldset>
 	<fieldset class="salesforce_side">
 		<div class="salesforce_object">
-			<label for="salesforce_object"><?php echo esc_html__( 'Salesforce Object', 'object-sync-for-salesforce' ); ?>: </label>
+			<label for="salesforce_object"><?php echo esc_html__('Salesforce Object', 'object-sync-for-salesforce'); ?>: </label>
 			<div class="spinner"></div>
 			<select id="salesforce_object" name="salesforce_object" required>
-				<option value="">- <?php echo esc_html__( 'Select object type', 'object-sync-for-salesforce' ); ?> -</option>
+				<option value="">- <?php echo esc_html__('Select object type', 'object-sync-for-salesforce'); ?> -</option>
 				<?php
 				$sfapi          = $this->salesforce['sfapi'];
-				$object_filters = maybe_unserialize( get_option( 'salesforce_api_object_filters' ), array() );
+				$object_filters = maybe_unserialize(get_option('salesforce_api_object_filters'), array());
 				$conditions     = array();
-				if ( is_array( $object_filters ) && in_array( 'updateable', $object_filters, true ) ) {
+				if (is_array($object_filters) && in_array('updateable', $object_filters, true)) {
 					$conditions['updateable'] = true;
 				}
-				if ( is_array( $object_filters ) && in_array( 'triggerable', $object_filters, true ) ) {
+				if (is_array($object_filters) && in_array('triggerable', $object_filters, true)) {
 					$conditions['triggerable'] = true;
 				}
-				$salesforce_objects = $sfapi->objects( $conditions );
-				foreach ( $salesforce_objects as $object ) {
-					if ( isset( $salesforce_object ) && $salesforce_object === $object['name'] ) {
+				$salesforce_objects = $sfapi->objects($conditions);
+				foreach ($salesforce_objects as $object) {
+					if (isset($salesforce_object) && $salesforce_object === $object['name']) {
 						$selected = ' selected';
 					} else {
 						$selected = '';
 					}
-					echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-						esc_html( $object['name'] ),
-						esc_attr( $selected ),
-						esc_html( $object['label'] )
+					echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+						esc_html($object['name']),
+						esc_attr($selected),
+						esc_html($object['label'])
 					);
 				}
 				?>
@@ -70,30 +70,30 @@ 
 		</div>
 		<div class="salesforce_record_types_allowed">
 			<?php
-			if ( isset( $salesforce_record_types_allowed ) ) :
+			if (isset($salesforce_record_types_allowed)) :
 				$record_types = $this->get_salesforce_object_description(
 					array(
 						'salesforce_object' => $salesforce_object,
 						'include'           => 'recordTypeInfos',
 					)
 				);
-				if ( isset( $record_types['recordTypeInfos'] ) ) :
+				if (isset($record_types['recordTypeInfos'])) :
 					?>
-					<label for="salesforce_record_types_allowed"><?php echo __( 'Allowed Record Types', 'object-sync-for-salesforce' ); ?>:</label>
+					<label for="salesforce_record_types_allowed"><?php echo __('Allowed Record Types', 'object-sync-for-salesforce'); ?>:</label>
 					<div class="checkboxes">
-					<?php foreach ( $record_types['recordTypeInfos'] as $key => $value ) : ?>
+					<?php foreach ($record_types['recordTypeInfos'] as $key => $value) : ?>
 						<?php
-						if ( in_array( $key, $salesforce_record_types_allowed, true ) ) {
+						if (in_array($key, $salesforce_record_types_allowed, true)) {
 							$checked = ' checked';
 						} else {
 							$checked = '';
 						}
-						echo sprintf( '<label><input type="checkbox" class="form-checkbox" value="%1$s" name="%2$s" id="%3$s"%4$s>%5$s</label>',
-							esc_html( $key ),
-							esc_attr( 'salesforce_record_types_allowed[' . $key . ']' ),
-							esc_attr( 'salesforce_record_types_allowed-' . $key ),
-							esc_html( $checked ),
-							esc_html( $value )
+						echo sprintf('<label><input type="checkbox" class="form-checkbox" value="%1$s" name="%2$s" id="%3$s"%4$s>%5$s</label>',
+							esc_html($key),
+							esc_attr('salesforce_record_types_allowed[' . $key . ']'),
+							esc_attr('salesforce_record_types_allowed-' . $key),
+							esc_html($checked),
+							esc_html($value)
 						);
 						?>
 					<?php endforeach; ?>
@@ -103,29 +103,29 @@ 
 		</div>
 		<div class="salesforce_record_type_default">
 			<?php
-			if ( isset( $salesforce_record_type_default ) ) :
+			if (isset($salesforce_record_type_default)) :
 				$record_types = $this->get_salesforce_object_description(
 					array(
 						'salesforce_object' => $salesforce_object,
 						'include'           => 'recordTypeInfos',
 					)
 				);
-				if ( isset( $record_types['recordTypeInfos'] ) ) :
+				if (isset($record_types['recordTypeInfos'])) :
 					?>
-					<label for="salesforce_record_type_default"><?php echo __( 'Default Record Type', 'object-sync-for-salesforce' ); ?>:</label>
-					<select id="salesforce_record_type_default" name="salesforce_record_type_default" required><option value="">- <?php echo __( 'Select record type', 'object-sync-for-salesforce' ); ?> -</option>
+					<label for="salesforce_record_type_default"><?php echo __('Default Record Type', 'object-sync-for-salesforce'); ?>:</label>
+					<select id="salesforce_record_type_default" name="salesforce_record_type_default" required><option value="">- <?php echo __('Select record type', 'object-sync-for-salesforce'); ?> -</option>
 					<?php
-					foreach ( $record_types['recordTypeInfos'] as $key => $value ) :
-						if ( isset( $salesforce_record_type_default ) && $salesforce_record_type_default === $key ) {
+					foreach ($record_types['recordTypeInfos'] as $key => $value) :
+						if (isset($salesforce_record_type_default) && $salesforce_record_type_default === $key) {
 							$selected = ' selected';
 						} else {
 							$selected = '';
 						}
-						if ( ! isset( $salesforce_record_types_allowed ) || in_array( $key, $salesforce_record_types_allowed, true ) ) {
-							echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-								esc_attr( $key ),
-								esc_attr( $selected ),
-								esc_html( $value )
+						if ( ! isset($salesforce_record_types_allowed) || in_array($key, $salesforce_record_types_allowed, true)) {
+							echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+								esc_attr($key),
+								esc_attr($selected),
+								esc_html($value)
 							);
 						}
 					endforeach;
@@ -137,8 +137,8 @@ 
 			?>
 		</div>
 		<div class="pull_trigger_field">
-			<?php if ( isset( $pull_trigger_field ) ) : ?>
-				<label for="pull_trigger_field"><?php echo __( 'Date field to trigger pull', 'object-sync-for-salesforce' ); ?>:</label>
+			<?php if (isset($pull_trigger_field)) : ?>
+				<label for="pull_trigger_field"><?php echo __('Date field to trigger pull', 'object-sync-for-salesforce'); ?>:</label>
 				<?php
 				$object_fields = $this->get_salesforce_object_fields(
 					array(
@@ -149,35 +149,35 @@ 
 				?>
 				<select name="pull_trigger_field" id="pull_trigger_field">
 				<?php
-				foreach ( $object_fields as $key => $value ) {
-					if ( $pull_trigger_field === $value['name'] ) {
+				foreach ($object_fields as $key => $value) {
+					if ($pull_trigger_field === $value['name']) {
 						$selected = ' selected';
 					} else {
 						$selected = '';
 					}
-					echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-						esc_attr( $value['name'] ),
-						esc_attr( $selected ),
-						esc_html( $value['label'] )
+					echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+						esc_attr($value['name']),
+						esc_attr($selected),
+						esc_html($value['label'])
 					);
 				}
 				?>
 				</select>
-				<p class="description"><?php echo esc_html__( 'When the plugin checks for data to bring from Salesforce into WordPress, it will use the selected field to determine what relevant changes have occurred in Salesforce.', 'object-sync-for-salesforce' ); ?></p>
+				<p class="description"><?php echo esc_html__('When the plugin checks for data to bring from Salesforce into WordPress, it will use the selected field to determine what relevant changes have occurred in Salesforce.', 'object-sync-for-salesforce'); ?></p>
 			<?php endif; ?>
 		</div>
 	</fieldset>
 	<fieldset class="fields">
-		<legend><?php echo esc_html__( 'Fieldmap', 'object-sync-for-salesforce' ); ?></legend>
+		<legend><?php echo esc_html__('Fieldmap', 'object-sync-for-salesforce'); ?></legend>
 		<table class="wp-list-table widefat striped fields">
 			<thead>
 				<tr>
-					<th class="column-wordpress_field"><?php echo esc_html__( 'WordPress Field', 'object-sync-for-salesforce' ); ?></th>
-					<th class="column-salesforce_field"><?php echo esc_html__( 'Salesforce Field', 'object-sync-for-salesforce' ); ?></th>
-					<th class="column-is_prematch"><?php echo esc_html__( 'Prematch', 'object-sync-for-salesforce' ); ?></th>
-					<th class="column-is_key"><?php echo esc_html__( 'Salesforce Key', 'object-sync-for-salesforce' ); ?></th>
-					<th class="column-direction"><?php echo esc_html__( 'Direction', 'object-sync-for-salesforce' ); ?></th>
-					<th class="column-is_delete"><?php echo esc_html__( 'Delete', 'object-sync-for-salesforce' ); ?></th>
+					<th class="column-wordpress_field"><?php echo esc_html__('WordPress Field', 'object-sync-for-salesforce'); ?></th>
+					<th class="column-salesforce_field"><?php echo esc_html__('Salesforce Field', 'object-sync-for-salesforce'); ?></th>
+					<th class="column-is_prematch"><?php echo esc_html__('Prematch', 'object-sync-for-salesforce'); ?></th>
+					<th class="column-is_key"><?php echo esc_html__('Salesforce Key', 'object-sync-for-salesforce'); ?></th>
+					<th class="column-direction"><?php echo esc_html__('Direction', 'object-sync-for-salesforce'); ?></th>
+					<th class="column-is_delete"><?php echo esc_html__('Delete', 'object-sync-for-salesforce'); ?></th>
 				</tr>
 			</thead>
 			<tfoot>
@@ -186,9 +186,9 @@ 
 						<p><small>
 							<?php
 							// translators: the placeholders refer to: 1) the cache clear link, 2) the cache clear link text
-							echo sprintf( '<strong>' . esc_html__( 'Note:', 'object-sync-for-salesforce' ) . '</strong>' . esc_html__( ' to map a custom meta field (such as wp_postmeta, wp_usermeta, wp_termmeta, etc.), WordPress must have at least one value for that field. If you add a new meta field and want to map it, make sure to add a value for it and ', 'object-sync-for-salesforce' ) . '<a href="%1$s" id="clear-sfwp-cache">%2$s</a>' . esc_html__( ' to see the field listed here', 'object-sync-for-salesforce' ),
-								esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=clear_cache' ) ),
-								esc_html__( 'clear the plugin cache', 'object-sync-for-salesforce' )
+							echo sprintf('<strong>' . esc_html__('Note:', 'object-sync-for-salesforce') . '</strong>' . esc_html__(' to map a custom meta field (such as wp_postmeta, wp_usermeta, wp_termmeta, etc.), WordPress must have at least one value for that field. If you add a new meta field and want to map it, make sure to add a value for it and ', 'object-sync-for-salesforce') . '<a href="%1$s" id="clear-sfwp-cache">%2$s</a>' . esc_html__(' to see the field listed here', 'object-sync-for-salesforce'),
+								esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=clear_cache')),
+								esc_html__('clear the plugin cache', 'object-sync-for-salesforce')
 							);
 							?>
 						</small></p>
@@ -197,26 +197,26 @@ 
 			</tfoot>
 			<tbody>
 				<?php
-				if ( isset( $fieldmap_fields ) && null !== $fieldmap_fields && is_array( $fieldmap_fields ) ) {
-					foreach ( $fieldmap_fields as $key => $value ) {
-						$key = md5( $key . time() );
+				if (isset($fieldmap_fields) && null !== $fieldmap_fields && is_array($fieldmap_fields)) {
+					foreach ($fieldmap_fields as $key => $value) {
+						$key = md5($key . time());
 				?>
 				<tr>
 					<td class="column-wordpress_field">
-						<select name="wordpress_field[<?php echo esc_attr( $key ); ?>]" id="wordpress_field-<?php echo esc_attr( $key ); ?>">
-							<option value="">- <?php echo esc_html__( 'Select WordPress field', 'object-sync-for-salesforce' ); ?> -</option>
+						<select name="wordpress_field[<?php echo esc_attr($key); ?>]" id="wordpress_field-<?php echo esc_attr($key); ?>">
+							<option value="">- <?php echo esc_html__('Select WordPress field', 'object-sync-for-salesforce'); ?> -</option>
 							<?php
-							$wordpress_fields = $this->get_wordpress_object_fields( $wordpress_object );
-							foreach ( $wordpress_fields as $wordpress_field ) {
-								if ( isset( $value['wordpress_field']['label'] ) && $value['wordpress_field']['label'] === $wordpress_field['key'] ) {
+							$wordpress_fields = $this->get_wordpress_object_fields($wordpress_object);
+							foreach ($wordpress_fields as $wordpress_field) {
+								if (isset($value['wordpress_field']['label']) && $value['wordpress_field']['label'] === $wordpress_field['key']) {
 									$selected = ' selected';
 								} else {
 									$selected = '';
 								}
-								echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-									esc_attr( $wordpress_field['key'] ),
-									esc_attr( $selected ),
-									esc_html( $wordpress_field['key'] )
+								echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+									esc_attr($wordpress_field['key']),
+									esc_attr($selected),
+									esc_html($wordpress_field['key'])
 								);
 							}
 							?>
@@ -224,8 +224,8 @@ 
 
 					</td>
 					<td class="column-salesforce_field">
-						<select name="salesforce_field[<?php echo esc_attr( $key ); ?>]" id="salesforce_field-<?php echo esc_attr( $key ); ?>">
-							<option value="">- <?php echo esc_html__( 'Select Salesforce field', 'object-sync-for-salesforce' ); ?> -</option>
+						<select name="salesforce_field[<?php echo esc_attr($key); ?>]" id="salesforce_field-<?php echo esc_attr($key); ?>">
+							<option value="">- <?php echo esc_html__('Select Salesforce field', 'object-sync-for-salesforce'); ?> -</option>
 							<?php
 							$salesforce_fields = $this->get_salesforce_object_fields(
 								array(
@@ -233,25 +233,25 @@ 
 								)
 							);
 							// allow for api name or field label to be the display value in the <select>
-							$display_value = get_option( $this->option_prefix . 'salesforce_field_display_value', 'field_label' );
-							foreach ( $salesforce_fields as $salesforce_field ) {
-								if ( isset( $value['salesforce_field']['name'] ) && $value['salesforce_field']['name'] === $salesforce_field['name'] ) {
+							$display_value = get_option($this->option_prefix . 'salesforce_field_display_value', 'field_label');
+							foreach ($salesforce_fields as $salesforce_field) {
+								if (isset($value['salesforce_field']['name']) && $value['salesforce_field']['name'] === $salesforce_field['name']) {
 									$selected = ' selected';
-								} elseif ( isset( $value['salesforce_field']['label'] ) && $value['salesforce_field']['label'] === $salesforce_field['name'] ) {
+								} elseif (isset($value['salesforce_field']['label']) && $value['salesforce_field']['label'] === $salesforce_field['name']) {
 									// this conditional is for versions up to 1.1.2, but i think it's fine to leave it for now. if we remove it, people's fieldmaps will not show correctly in the admin.
 									$selected = ' selected';
 								} else {
 									$selected = '';
 								}
 
-								if ( 'api_name' === $display_value ) {
+								if ('api_name' === $display_value) {
 									$salesforce_field['label'] = $salesforce_field['name'];
 								}
 
-								echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-									esc_attr( $salesforce_field['name'] ),
-									esc_attr( $selected ),
-									esc_html( $salesforce_field['label'] )
+								echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+									esc_attr($salesforce_field['name']),
+									esc_attr($selected),
+									esc_html($salesforce_field['label'])
 								);
 							}
 							?>
@@ -260,32 +260,32 @@ 
 					</td>
 					<td class="column-is_prematch">
 						<?php
-						if ( isset( $value['is_prematch'] ) && '1' === $value['is_prematch'] ) {
+						if (isset($value['is_prematch']) && '1' === $value['is_prematch']) {
 							$checked = ' checked';
 						} else {
 							$checked = '';
 						}
 						?>
-						<input type="checkbox" name="is_prematch[<?php echo esc_attr( $key ); ?>]" id="is_prematch-<?php echo esc_attr( $key ); ?>" value="1" <?php echo esc_attr( $checked ); ?> title="<?php echo esc_html__( 'This pair should be checked for existing matches in Salesforce before adding', 'object-sync-for-salesforce' ); ?>" />
+						<input type="checkbox" name="is_prematch[<?php echo esc_attr($key); ?>]" id="is_prematch-<?php echo esc_attr($key); ?>" value="1" <?php echo esc_attr($checked); ?> title="<?php echo esc_html__('This pair should be checked for existing matches in Salesforce before adding', 'object-sync-for-salesforce'); ?>" />
 					</td>
 					<td class="column-is_key">
 						<?php
-						if ( isset( $value['is_key'] ) && '1' === $value['is_key'] ) {
+						if (isset($value['is_key']) && '1' === $value['is_key']) {
 							$checked = ' checked';
 						} else {
 							$checked = '';
 						}
 						?>
-						<input type="checkbox" name="is_key[<?php echo esc_attr( $key ); ?>]" id="is_key-<?php echo esc_attr( $key ); ?>" value="1" <?php echo esc_attr( $checked ); ?> title="<?php echo esc_html__( 'This Salesforce field is an External ID in Salesforce', 'object-sync-for-salesforce' ); ?>" />
+						<input type="checkbox" name="is_key[<?php echo esc_attr($key); ?>]" id="is_key-<?php echo esc_attr($key); ?>" value="1" <?php echo esc_attr($checked); ?> title="<?php echo esc_html__('This Salesforce field is an External ID in Salesforce', 'object-sync-for-salesforce'); ?>" />
 					</td>
 					<td class="column-direction">
 						<?php
-						if ( isset( $value['direction'] ) ) {
-							if ( 'sf_wp' === $value['direction'] ) {
+						if (isset($value['direction'])) {
+							if ('sf_wp' === $value['direction']) {
 								$checked_sf_wp = ' checked';
 								$checked_wp_sf = '';
 								$checked_sync  = '';
-							} elseif ( 'wp_sf' === $value['direction'] ) {
+							} elseif ('wp_sf' === $value['direction']) {
 								$checked_sf_wp = '';
 								$checked_wp_sf = ' checked';
 								$checked_sync  = '';
@@ -301,29 +301,29 @@ 
 						}
 						?>
 						<div class="radios">
-							<label><input type="radio" value="sf_wp" name="direction[<?php echo esc_attr( $key ); ?>]" id="direction-<?php echo esc_attr( $key ); ?>-sf-wp" <?php echo esc_attr( $checked_sf_wp ); ?> required> <?php echo esc_html__( 'Salesforce to WordPress', 'object-sync-for-salesforce' ); ?></label>
-							<label><input type="radio" value="wp_sf" name="direction[<?php echo esc_attr( $key ); ?>]" id="direction-<?php echo esc_attr( $key ); ?>-wp-sf" <?php echo esc_attr( $checked_wp_sf ); ?> required> <?php echo esc_html__( 'WordPress to Salesforce', 'object-sync-for-salesforce' ); ?></label>
-							<label><input type="radio" value="sync" name="direction[<?php echo esc_attr( $key ); ?>]" id="direction-<?php echo esc_attr( $key ); ?>-sync" <?php echo esc_attr( $checked_sync ); ?> required> <?php echo esc_html__( 'Sync', 'object-sync-for-salesforce' ); ?></label>
+							<label><input type="radio" value="sf_wp" name="direction[<?php echo esc_attr($key); ?>]" id="direction-<?php echo esc_attr($key); ?>-sf-wp" <?php echo esc_attr($checked_sf_wp); ?> required> <?php echo esc_html__('Salesforce to WordPress', 'object-sync-for-salesforce'); ?></label>
+							<label><input type="radio" value="wp_sf" name="direction[<?php echo esc_attr($key); ?>]" id="direction-<?php echo esc_attr($key); ?>-wp-sf" <?php echo esc_attr($checked_wp_sf); ?> required> <?php echo esc_html__('WordPress to Salesforce', 'object-sync-for-salesforce'); ?></label>
+							<label><input type="radio" value="sync" name="direction[<?php echo esc_attr($key); ?>]" id="direction-<?php echo esc_attr($key); ?>-sync" <?php echo esc_attr($checked_sync); ?> required> <?php echo esc_html__('Sync', 'object-sync-for-salesforce'); ?></label>
 						</div>
 					</td>
 					<td class="column-is_delete">
-						<input type="checkbox" name="is_delete[<?php echo esc_attr( $key ); ?>]" id="is_delete-<?php echo esc_attr( $key ); ?>" value="1" />
+						<input type="checkbox" name="is_delete[<?php echo esc_attr($key); ?>]" id="is_delete-<?php echo esc_attr($key); ?>" value="1" />
 					</td>
 				</tr>
 				<?php
 					} // End foreach().
-				} elseif ( isset( $wordpress_object ) && isset( $salesforce_object ) ) {
+				} elseif (isset($wordpress_object) && isset($salesforce_object)) {
 				?>
 				<tr>
 					<td class="column-wordpress_field">
 						<select name="wordpress_field[0]" id="wordpress_field-0">
-							<option value="">- <?php echo esc_html__( 'Select WordPress field', 'object-sync-for-salesforce' ); ?> -</option>
+							<option value="">- <?php echo esc_html__('Select WordPress field', 'object-sync-for-salesforce'); ?> -</option>
 							<?php
-							$wordpress_fields = $this->get_wordpress_object_fields( $wordpress_object );
-							foreach ( $wordpress_fields as $wordpress_field ) {
-								echo sprintf( '<option value="%1$s">%2$s</option>',
-									esc_attr( $wordpress_field['key'] ),
-									esc_html( $wordpress_field['key'] )
+							$wordpress_fields = $this->get_wordpress_object_fields($wordpress_object);
+							foreach ($wordpress_fields as $wordpress_field) {
+								echo sprintf('<option value="%1$s">%2$s</option>',
+									esc_attr($wordpress_field['key']),
+									esc_html($wordpress_field['key'])
 								);
 							}
 							?>
@@ -331,17 +331,17 @@ 
 					</td>
 					<td class="column-salesforce_field">
 						<select name="salesforce_field[0]" id="salesforce_field-0">
-							<option value="">- <?php echo esc_html__( 'Select Salesforce field', 'object-sync-for-salesforce' ); ?> -</option>
+							<option value="">- <?php echo esc_html__('Select Salesforce field', 'object-sync-for-salesforce'); ?> -</option>
 							<?php
 							$salesforce_fields = $this->get_salesforce_object_fields(
 								array(
 									'salesforce_object' => $salesforce_object,
 								)
 							);
-							foreach ( $salesforce_fields as $salesforce_field ) {
-								echo sprintf( '<option value="%1$s">%2$s</option>',
-									esc_attr( $salesforce_field['name'] ),
-									esc_html( $salesforce_field['label'] )
+							foreach ($salesforce_fields as $salesforce_field) {
+								echo sprintf('<option value="%1$s">%2$s</option>',
+									esc_attr($salesforce_field['name']),
+									esc_html($salesforce_field['label'])
 								);
 							}
 							?>
@@ -355,9 +355,9 @@ 
 					</td>
 					<td class="column-direction">
 						<div class="radios">
-							<label><input type="radio" value="sf_wp" name="direction[0]" id="direction-0-sf-wp" required> <?php echo esc_html__( 'Salesforce to WordPress', 'object-sync-for-salesforce' ); ?></label>
-							<label><input type="radio" value="wp_sf" name="direction[0]" id="direction-0-wp-sf" required> <?php echo esc_html__( 'WordPress to Salesforce', 'object-sync-for-salesforce' ); ?></label>
-							<label><input type="radio" value="sync" name="direction[0]" id="direction-0-sync" required checked> <?php echo esc_html__( 'Sync', 'object-sync-for-salesforce' ); ?></label>
+							<label><input type="radio" value="sf_wp" name="direction[0]" id="direction-0-sf-wp" required> <?php echo esc_html__('Salesforce to WordPress', 'object-sync-for-salesforce'); ?></label>
+							<label><input type="radio" value="wp_sf" name="direction[0]" id="direction-0-wp-sf" required> <?php echo esc_html__('WordPress to Salesforce', 'object-sync-for-salesforce'); ?></label>
+							<label><input type="radio" value="sync" name="direction[0]" id="direction-0-sync" required checked> <?php echo esc_html__('Sync', 'object-sync-for-salesforce'); ?></label>
 						</div>
 					</td>
 					<td class="column-is_delete">
@@ -371,17 +371,17 @@ 
 		</table>
 		<!--<div class="spinner"></div>-->
 		<?php
-		if ( isset( $fieldmap_fields ) && null !== $fieldmap_fields ) {
-			$add_button_label = esc_html__( 'Add another field mapping', 'object-sync-for-salesforce' );
+		if (isset($fieldmap_fields) && null !== $fieldmap_fields) {
+			$add_button_label = esc_html__('Add another field mapping', 'object-sync-for-salesforce');
 		} else {
-			$add_button_label = esc_html__( 'Add field mapping', 'object-sync-for-salesforce' );
+			$add_button_label = esc_html__('Add field mapping', 'object-sync-for-salesforce');
 		}
 		?>
 		<p><button type="button" id="add-field-mapping" class="button button-secondary"><?php echo $add_button_label; ?></button></p>
-		<p class="description"><?php echo esc_html__( 'Prematch tells the plugin to match records that have the same value before sending data to Salesforce. Salesforce Key indicates the Salesforce field is an External ID. If either of these is checked, the plugin will do an UPSERT to avoid duplicate data when possible.', 'object-sync-for-salesforce' ); ?></p>
+		<p class="description"><?php echo esc_html__('Prematch tells the plugin to match records that have the same value before sending data to Salesforce. Salesforce Key indicates the Salesforce field is an External ID. If either of these is checked, the plugin will do an UPSERT to avoid duplicate data when possible.', 'object-sync-for-salesforce'); ?></p>
 	</fieldset>
 	<fieldset class="sync_triggers">
-		<legend><?php echo esc_html__( 'Action triggers', 'object-sync-for-salesforce' ); ?></legend>
+		<legend><?php echo esc_html__('Action triggers', 'object-sync-for-salesforce'); ?></legend>
 		<div class="checkboxes">
 			<?php
 			$wordpress_create_checked  = '';
@@ -390,9 +390,9 @@ 
 			$salesforce_create_checked = '';
 			$salesforce_update_checked = '';
 			$salesforce_delete_checked = '';
-			if ( isset( $sync_triggers ) && is_array( $sync_triggers ) ) {
-				foreach ( $sync_triggers as $trigger ) {
-					switch ( $trigger ) {
+			if (isset($sync_triggers) && is_array($sync_triggers)) {
+				foreach ($sync_triggers as $trigger) {
+					switch ($trigger) {
 						case $this->mappings->sync_wordpress_create:
 							$wordpress_create_checked = ' checked';
 							break;
@@ -415,31 +415,31 @@ 
 				}
 			}
 			?>
-			<label><input type="checkbox" value="<?php echo esc_html( $this->mappings->sync_wordpress_create ); ?>" name="sync_triggers[]" id="sync_triggers-wordpress-create" <?php echo esc_attr( $wordpress_create_checked ); ?>><?php echo esc_html__( 'WordPress create', 'object-sync-for-salesforce' ); ?></label>
-			<label><input type="checkbox" value="<?php echo esc_html( $this->mappings->sync_wordpress_update ); ?>" name="sync_triggers[]" id="sync_triggers-wordpress-update" <?php echo esc_attr( $wordpress_update_checked ); ?>><?php echo esc_html__( 'WordPress update', 'object-sync-for-salesforce' ); ?></label>
-			<label><input type="checkbox" value="<?php echo esc_html( $this->mappings->sync_wordpress_delete ); ?>" name="sync_triggers[]" id="sync_triggers-wordpress-delete" <?php echo esc_attr( $wordpress_delete_checked ); ?>><?php echo esc_html__( 'WordPress delete', 'object-sync-for-salesforce' ); ?></label>
-			<label><input type="checkbox" value="<?php echo esc_html( $this->mappings->sync_sf_create ); ?>" name="sync_triggers[]" id="sync_triggers-salesforce-create" <?php echo esc_attr( $salesforce_create_checked ); ?>><?php echo esc_html__( 'Salesforce create', 'object-sync-for-salesforce' ); ?></label>
-			<label><input type="checkbox" value="<?php echo esc_html( $this->mappings->sync_sf_update ); ?>" name="sync_triggers[]" id="sync_triggers-salesforce-update" <?php echo esc_attr( $salesforce_update_checked ); ?>><?php echo esc_html__( 'Salesforce update', 'object-sync-for-salesforce' ); ?></label>
-			<label><input type="checkbox" value="<?php echo esc_html( $this->mappings->sync_sf_delete ); ?>" name="sync_triggers[]" id="sync_triggers-salesforce-delete" <?php echo esc_attr( $salesforce_delete_checked ); ?>><?php echo esc_html__( 'Salesforce delete', 'object-sync-for-salesforce' ); ?></label>
+			<label><input type="checkbox" value="<?php echo esc_html($this->mappings->sync_wordpress_create); ?>" name="sync_triggers[]" id="sync_triggers-wordpress-create" <?php echo esc_attr($wordpress_create_checked); ?>><?php echo esc_html__('WordPress create', 'object-sync-for-salesforce'); ?></label>
+			<label><input type="checkbox" value="<?php echo esc_html($this->mappings->sync_wordpress_update); ?>" name="sync_triggers[]" id="sync_triggers-wordpress-update" <?php echo esc_attr($wordpress_update_checked); ?>><?php echo esc_html__('WordPress update', 'object-sync-for-salesforce'); ?></label>
+			<label><input type="checkbox" value="<?php echo esc_html($this->mappings->sync_wordpress_delete); ?>" name="sync_triggers[]" id="sync_triggers-wordpress-delete" <?php echo esc_attr($wordpress_delete_checked); ?>><?php echo esc_html__('WordPress delete', 'object-sync-for-salesforce'); ?></label>
+			<label><input type="checkbox" value="<?php echo esc_html($this->mappings->sync_sf_create); ?>" name="sync_triggers[]" id="sync_triggers-salesforce-create" <?php echo esc_attr($salesforce_create_checked); ?>><?php echo esc_html__('Salesforce create', 'object-sync-for-salesforce'); ?></label>
+			<label><input type="checkbox" value="<?php echo esc_html($this->mappings->sync_sf_update); ?>" name="sync_triggers[]" id="sync_triggers-salesforce-update" <?php echo esc_attr($salesforce_update_checked); ?>><?php echo esc_html__('Salesforce update', 'object-sync-for-salesforce'); ?></label>
+			<label><input type="checkbox" value="<?php echo esc_html($this->mappings->sync_sf_delete); ?>" name="sync_triggers[]" id="sync_triggers-salesforce-delete" <?php echo esc_attr($salesforce_delete_checked); ?>><?php echo esc_html__('Salesforce delete', 'object-sync-for-salesforce'); ?></label>
 			<p class="description">
 				<?php
 				// translators: placeholders are for the class names: salesforce_push and salesforce_pull
-				echo sprintf( esc_html__( 'Select which actions on WordPress objects and Salesforce objects should trigger a synchronization. These settings are used by the %1$s and %2$s classes respectively.', 'object-sync-for-salesforce' ), '<code>salesforce_push</code>', '<code>salesforce_pull</code>' );
+				echo sprintf(esc_html__('Select which actions on WordPress objects and Salesforce objects should trigger a synchronization. These settings are used by the %1$s and %2$s classes respectively.', 'object-sync-for-salesforce'), '<code>salesforce_push</code>', '<code>salesforce_pull</code>');
 				?>
 			</p>
 		</div>
 		<div class="checkboxes">
-			<label><input type="checkbox" name="push_async" id="process-async" value="1" <?php echo isset( $push_async ) && '1' === $push_async ? ' checked' : ''; ?>><?php echo esc_html__( 'Process asynchronously', 'object-sync-for-salesforce' ); ?></label>
+			<label><input type="checkbox" name="push_async" id="process-async" value="1" <?php echo isset($push_async) && '1' === $push_async ? ' checked' : ''; ?>><?php echo esc_html__('Process asynchronously', 'object-sync-for-salesforce'); ?></label>
 			<p class="description">
 				<?php
 				// translators: placeholder is for WordPress cron method name
-				echo sprintf( esc_html__( 'If selected, push data will be queued for processing and synchronized when %s is run. This may increase site performance, but changes will not be reflected in real time.', 'object-sync-for-salesforce' ), '<code>wp_cron</code>' );
+				echo sprintf(esc_html__('If selected, push data will be queued for processing and synchronized when %s is run. This may increase site performance, but changes will not be reflected in real time.', 'object-sync-for-salesforce'), '<code>wp_cron</code>');
 				?>
 			</p>
 		</div>
 		<div class="checkboxes">
-			<label><input type="checkbox" name="push_drafts" id="push-drafts" value="1" <?php echo isset( $push_drafts ) && '1' === $push_drafts ? ' checked' : ''; ?>><?php echo esc_html__( 'Push drafts', 'object-sync-for-salesforce' ); ?></label>
-			<p class="description"><?php echo esc_html__( 'If selected, WordPress will send drafts of this object type (if it creates drafts for it) to Salesforce.', 'object-sync-for-salesforce' ); ?></p>
+			<label><input type="checkbox" name="push_drafts" id="push-drafts" value="1" <?php echo isset($push_drafts) && '1' === $push_drafts ? ' checked' : ''; ?>><?php echo esc_html__('Push drafts', 'object-sync-for-salesforce'); ?></label>
+			<p class="description"><?php echo esc_html__('If selected, WordPress will send drafts of this object type (if it creates drafts for it) to Salesforce.', 'object-sync-for-salesforce'); ?></p>
 		</div>
 		<?php
 		/*
@@ -458,7 +458,7 @@ 
 	<?php
 		submit_button(
 			// translators: the placeholder refers to the currently selected method (add, edit, or clone)
-			sprintf( esc_html__( '%1$s fieldmap', 'object-sync-for-salesforce' ), ucfirst( $method ) )
+			sprintf(esc_html__('%1$s fieldmap', 'object-sync-for-salesforce'), ucfirst($method))
 		);
 	?>
 </form>