MinnPost / object-sync-for-salesforce

templates/admin/mapping-errors-delete.php

Spacing +10 added lines, -10 removed lines

@@ -1,18 +1,18 @@
-<form method="post" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
-	<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 ); ?>" />
-	<input type="hidden" name="id" value="<?php echo absint( $map_row['id'] ); ?>" />
+<form method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>">
+	<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); ?>" />
+	<input type="hidden" name="id" value="<?php echo absint($map_row['id']); ?>" />
 	<input type="hidden" name="action" value="delete_object_map">
-	<h2><?php echo esc_html__( 'Are you sure you want to delete this mapping object?', 'object-sync-for-salesforce' ); ?></h2>
+	<h2><?php echo esc_html__('Are you sure you want to delete this mapping object?', 'object-sync-for-salesforce'); ?></h2>
 	<p>
 	<?php
 		// translators: the placeholders refer to: 1) the WordPress object name, 2) the WordPress object Id, and 3) the Salesforce object Id
-		echo sprintf( esc_html__( 'This object map maps the WordPress %1$s with an id value of %2$s to the Salesforce object with Id of %3$s.', 'object-sync-for-salesforce' ),
-			'<strong> ' . esc_html( $map_row['wordpress_object'] ) . '</strong>',
-			'<strong> ' . esc_html( $map_row['wordpress_id'] ) . '</strong>',
-			'<strong> ' . esc_html( $map_row['salesforce_id'] ) . '</strong>'
+		echo sprintf(esc_html__('This object map maps the WordPress %1$s with an id value of %2$s to the Salesforce object with Id of %3$s.', 'object-sync-for-salesforce'),
+			'<strong> ' . esc_html($map_row['wordpress_object']) . '</strong>',
+			'<strong> ' . esc_html($map_row['wordpress_id']) . '</strong>',
+			'<strong> ' . esc_html($map_row['salesforce_id']) . '</strong>'
 		);
 	?>
 	</p>
-	<?php submit_button( esc_html__( 'Confirm deletion', 'object-sync-for-salesforce' ) ); ?>
+	<?php submit_button(esc_html__('Confirm deletion', 'object-sync-for-salesforce')); ?>
 </form>

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>

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

Spacing +137 added lines, -137 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,16 +149,16 @@ 
 				?>
 				<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'])
 					);
 				}
 				?>
@@ -167,16 +167,16 @@ 
 		</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>
@@ -185,9 +185,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>
@@ -196,26 +196,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'])
 								);
 							}
 							?>
@@ -223,27 +223,27 @@ 
 
 					</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(
 									'salesforce_object' => $salesforce_object,
 								)
 							);
-							foreach ( $salesforce_fields as $salesforce_field ) {
-								if ( isset( $value['salesforce_field']['name'] ) && $value['salesforce_field']['name'] === $salesforce_field['name'] ) {
+							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 = '';
 								}
-								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'])
 								);
 							}
 							?>
@@ -252,32 +252,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  = '';
@@ -293,29 +293,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'])
 								);
 							}
 							?>
@@ -323,17 +323,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'])
 								);
 							}
 							?>
@@ -347,9 +347,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">
@@ -363,17 +363,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  = '';
@@ -382,9 +382,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;
@@ -407,31 +407,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
 		/*
@@ -450,7 +450,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>

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',
 			)
 		);