MinnPost / object-sync-for-salesforce

templates/admin/fieldmaps-list.php

Spacing +19 added lines, -19 removed lines

@@ -1,11 +1,11 @@ 
-<h3><?php echo esc_html__( 'Fieldmaps', 'object-sync-for-salesforce' ); ?> <a class="page-title-action" href="<?php echo esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=add' ) ); ?>"><?php echo esc_html__( 'Add New', 'object-sync-for-salesforce' ); ?></a></h3>
+<h3><?php echo esc_html__('Fieldmaps', 'object-sync-for-salesforce'); ?> <a class="page-title-action" href="<?php echo esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=add')); ?>"><?php echo esc_html__('Add New', 'object-sync-for-salesforce'); ?></a></h3>
 <table class="widefat striped">
 	<thead>
 		<tr>
-			<th><?php echo esc_html__( 'Label', 'object-sync-for-salesforce' ); ?></th>
-			<th><?php echo esc_html__( 'WordPress Object', 'object-sync-for-salesforce' ); ?></th>
-			<th><?php echo esc_html__( 'Salesforce Object', 'object-sync-for-salesforce' ); ?></th>
-			<th colspan="3"><?php echo esc_html__( 'Actions', 'object-sync-for-salesforce' ); ?></th>
+			<th><?php echo esc_html__('Label', 'object-sync-for-salesforce'); ?></th>
+			<th><?php echo esc_html__('WordPress Object', 'object-sync-for-salesforce'); ?></th>
+			<th><?php echo esc_html__('Salesforce Object', 'object-sync-for-salesforce'); ?></th>
+			<th colspan="3"><?php echo esc_html__('Actions', 'object-sync-for-salesforce'); ?></th>
 		</tr>
 	</thead>
 	<tfoot>
@@ -14,9 +14,9 @@ 
 				<p><small>
 					<?php
 					// translators: the placeholders refer to: 1) the cache clear link, 2) the cache clear link text
-					echo sprintf( esc_html__( 'Has your WordPress or Salesforce data structure changed? ', 'object-sync-for-salesforce' ) . '<a href="%1$s" id="clear-sfwp-cache">%2$s</a>' . esc_html__( ' to make sure you can map the most recent data structures.', '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' )
+					echo sprintf(esc_html__('Has your WordPress or Salesforce data structure changed? ', 'object-sync-for-salesforce') . '<a href="%1$s" id="clear-sfwp-cache">%2$s</a>' . esc_html__(' to make sure you can map the most recent data structures.', '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')
 					);
 					?>
 				</small></p>
@@ -24,20 +24,20 @@ 
 		</tr>
 	</tfoot>
 	<tbody>
-		<?php if ( count( $fieldmaps ) > 0 ) : ?>
-			<?php foreach ( $fieldmaps as $record ) { ?>
+		<?php if (count($fieldmaps) > 0) : ?>
+			<?php foreach ($fieldmaps as $record) { ?>
 		<tr>
-			<td><?php echo esc_html( $record['label'] ); ?></td>
-			<td><?php echo esc_html( $record['wordpress_object'] ); ?></td>
-			<td><?php echo esc_html( $record['salesforce_object'] ); ?></td>
+			<td><?php echo esc_html($record['label']); ?></td>
+			<td><?php echo esc_html($record['wordpress_object']); ?></td>
+			<td><?php echo esc_html($record['salesforce_object']); ?></td>
 			<td>
-				<a href="<?php echo esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=edit&id=' . $record['id'] ) ); ?>"><?php echo esc_html__( 'Edit', 'object-sync-for-salesforce' ); ?></a>
+				<a href="<?php echo esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=edit&id=' . $record['id'])); ?>"><?php echo esc_html__('Edit', 'object-sync-for-salesforce'); ?></a>
 			</td>
 			<td>
-				<a href="<?php echo esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=clone&id=' . $record['id'] ) ); ?>"><?php echo esc_html__( 'Clone', 'object-sync-for-salesforce' ); ?></a>
+				<a href="<?php echo esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=clone&id=' . $record['id'])); ?>"><?php echo esc_html__('Clone', 'object-sync-for-salesforce'); ?></a>
 			</td>
 			<td>
-				<a href="<?php echo esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=delete&id=' . $record['id'] ) ); ?>"><?php echo esc_html__( 'Delete', 'object-sync-for-salesforce' ); ?></a>
+				<a href="<?php echo esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=delete&id=' . $record['id'])); ?>"><?php echo esc_html__('Delete', 'object-sync-for-salesforce'); ?></a>
 			</td>
 		</tr>
 			<?php } ?>
@@ -47,9 +47,9 @@ 
 				<p>
 				<?php
 					// translators: the placeholders refer to: 1) the fieldmap label, 2) the saleforce object name, and 3) the WordPress object name
-					echo sprintf( esc_html__( 'No fieldmaps exist yet. You can ', 'object-sync-for-salesforce' ) . '<a href="%1$s">%2$s</a>.',
-						esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=add' ) ),
-						esc_html__( 'add one' )
+					echo sprintf(esc_html__('No fieldmaps exist yet. You can ', 'object-sync-for-salesforce') . '<a href="%1$s">%2$s</a>.',
+						esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=add')),
+						esc_html__('add one')
 					);
 				?>
 				</p>

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,8 @@ 
 			</td>
 		</tr>
 			<?php } ?>
-		<?php else : ?>
+		<?php else {
+	: ?>
 		<tr>
 			<td colspan="4">
 				<p>
@@ -51,6 +52,7 @@ 
 						esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=add' ) ),
 						esc_html__( 'add one' )
 					);
+}
 				?>
 				</p>
 			</td>

templates/admin/settings.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <form method="post" action="options.php">
 	<?php
-		settings_fields( $tab ) . do_settings_sections( $tab );
-		submit_button( esc_html__( 'Save settings', 'object-sync-for-salesforce' ) );
+		settings_fields($tab) . do_settings_sections($tab);
+		submit_button(esc_html__('Save settings', 'object-sync-for-salesforce'));
 	?>
 </form>

templates/admin/notice.php

Spacing +2 added lines, -2 removed lines

@@ -1,3 +1,3 @@
-<div class="notice<?php echo esc_attr( $class ); ?><?php echo esc_attr( $dismissible ); ?>">
-	<p><?php echo esc_html( $message ); ?></p>
+<div class="notice<?php echo esc_attr($class); ?><?php echo esc_attr($dismissible); ?>">
+	<p><?php echo esc_html($message); ?></p>
 </div>

templates/admin/fieldmaps-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['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['id']); ?>" />
 	<input type="hidden" name="action" value="delete_fieldmap">
-	<h2><?php echo esc_html__( 'Are you sure you want to delete this fieldmap?', 'object-sync-for-salesforce' ); ?></h2>
+	<h2><?php echo esc_html__('Are you sure you want to delete this fieldmap?', 'object-sync-for-salesforce'); ?></h2>
 	<p>
 	<?php
 		// translators: the placeholders refer to: 1) the fieldmap label, 2) the saleforce object name, and 3) the WordPress object name
-		echo sprintf( esc_html__( 'This fieldmap is called %1$s and it maps the Salesforce %2$s object to the WordPress %3$s object.', 'object-sync-for-salesforce' ),
-			'<strong> ' . esc_html( $map['label'] ) . '</strong>',
-			esc_html( $map['salesforce_object'] ),
-			esc_html( $map['wordpress_object'] )
+		echo sprintf(esc_html__('This fieldmap is called %1$s and it maps the Salesforce %2$s object to the WordPress %3$s object.', 'object-sync-for-salesforce'),
+			'<strong> ' . esc_html($map['label']) . '</strong>',
+			esc_html($map['salesforce_object']),
+			esc_html($map['wordpress_object'])
 		);
 	?>
 	</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/mapping-errors-edit.php

Spacing +13 added lines, -13 removed lines

@@ -1,26 +1,26 @@
-<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_object_map" >
-	<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_row['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_row['id']); ?>" />
 	<?php } ?>
 	<div class="wordpress_id">
-		<label for="wordpress_id"><?php echo esc_html__( 'WordPress Id', 'object-sync-for-salesforce' ); ?>: </label>
-		<input type="text" id="wordpress_id" name="wordpress_id" required value="<?php echo isset( $wordpress_id ) ? esc_html( $wordpress_id ) : ''; ?>" />
+		<label for="wordpress_id"><?php echo esc_html__('WordPress Id', 'object-sync-for-salesforce'); ?>: </label>
+		<input type="text" id="wordpress_id" name="wordpress_id" required value="<?php echo isset($wordpress_id) ? esc_html($wordpress_id) : ''; ?>" />
 	</div>
 	<div class="salesforce_id">
-		<label for="salesforce_id"><?php echo esc_html__( 'Salesforce Id', 'object-sync-for-salesforce' ); ?>: </label>
-		<input type="text" id="salesforce_id" name="salesforce_id" required value="<?php echo isset( $salesforce_id ) ? esc_html( $salesforce_id ) : ''; ?>" />
+		<label for="salesforce_id"><?php echo esc_html__('Salesforce Id', 'object-sync-for-salesforce'); ?>: </label>
+		<input type="text" id="salesforce_id" name="salesforce_id" required value="<?php echo isset($salesforce_id) ? esc_html($salesforce_id) : ''; ?>" />
 	</div>
 	<?php
 		submit_button(
 			// translators: the placeholder refers to the currently selected method (edit or delete)
-			sprintf( esc_html__( '%1$s object map', 'object-sync-for-salesforce' ), ucfirst( $method ) )
+			sprintf(esc_html__('%1$s object map', 'object-sync-for-salesforce'), ucfirst($method))
 		);
 	?>
 </form>

templates/admin/mapping-errors.php

Spacing +22 added lines, -22 removed lines

@@ -1,50 +1,50 @@
-<h2><?php echo esc_html__( 'Mapping Errors', 'object-sync-for-salesforce' ); ?></h2>
-<p><?php echo esc_html__( 'When this tab is present, it means one or more mapping errors have occurred when the plugin has tried to save a new mapping object, either based on data pulled in from Salesforce or data that was sent to Salesforce. The plugin creates a temporary flag for WordPress (if it is a pull action) or for Salesforce (if it is a push action), and if it fails the temporary flag remains.', 'object-sync-for-salesforce' ); ?></p>
-<p><?php echo esc_html__( 'For any mapping object error, you can edit (if, for example, you know the ID of the item that should be in place) or delete each database row, or you can try to track down what the plugin was doing based on the other data displayed here.', 'object-sync-for-salesforce' ); ?></p>
-<p><?php echo esc_html__( 'If you edit one of these items, and it correctly maps data between the two systems, the sync for those items will behave as normal going forward, so any edits you do after that will sync as they should.', 'object-sync-for-salesforce' ); ?></p>
+<h2><?php echo esc_html__('Mapping Errors', 'object-sync-for-salesforce'); ?></h2>
+<p><?php echo esc_html__('When this tab is present, it means one or more mapping errors have occurred when the plugin has tried to save a new mapping object, either based on data pulled in from Salesforce or data that was sent to Salesforce. The plugin creates a temporary flag for WordPress (if it is a pull action) or for Salesforce (if it is a push action), and if it fails the temporary flag remains.', 'object-sync-for-salesforce'); ?></p>
+<p><?php echo esc_html__('For any mapping object error, you can edit (if, for example, you know the ID of the item that should be in place) or delete each database row, or you can try to track down what the plugin was doing based on the other data displayed here.', 'object-sync-for-salesforce'); ?></p>
+<p><?php echo esc_html__('If you edit one of these items, and it correctly maps data between the two systems, the sync for those items will behave as normal going forward, so any edits you do after that will sync as they should.', 'object-sync-for-salesforce'); ?></p>
 
 <table class="widefat striped">
 	<thead>
 		<tr>
-			<th><?php echo esc_html__( 'Type', 'object-sync-for-salesforce' ); ?></th>
-			<th><?php echo esc_html__( 'WordPress ID', 'object-sync-for-salesforce' ); ?></th>
-			<th><?php echo esc_html__( 'WordPress Object Type', 'object-sync-for-salesforce' ); ?></th>
-			<th><?php echo esc_html__( 'Salesforce ID', 'object-sync-for-salesforce' ); ?></th>
-			<th><?php echo esc_html__( 'Created Date/Time', 'object-sync-for-salesforce' ); ?></th>
-			<th colspan="2"><?php echo esc_html__( 'Actions', 'object-sync-for-salesforce' ); ?></th>
+			<th><?php echo esc_html__('Type', 'object-sync-for-salesforce'); ?></th>
+			<th><?php echo esc_html__('WordPress ID', 'object-sync-for-salesforce'); ?></th>
+			<th><?php echo esc_html__('WordPress Object Type', 'object-sync-for-salesforce'); ?></th>
+			<th><?php echo esc_html__('Salesforce ID', 'object-sync-for-salesforce'); ?></th>
+			<th><?php echo esc_html__('Created Date/Time', 'object-sync-for-salesforce'); ?></th>
+			<th colspan="2"><?php echo esc_html__('Actions', 'object-sync-for-salesforce'); ?></th>
 		</tr>
 	</thead>
 	<tbody>
-		<?php if ( ! empty( $mapping_errors['pull_errors'] ) ) : ?>
-			<?php foreach ( $mapping_errors['pull_errors'] as $error ) { ?>
+		<?php if ( ! empty($mapping_errors['pull_errors'])) : ?>
+			<?php foreach ($mapping_errors['pull_errors'] as $error) { ?>
 		<tr>
-			<td><?php echo esc_html__( 'Pull from Salesforce', 'object-sync-for-salesforce' ); ?></td>
+			<td><?php echo esc_html__('Pull from Salesforce', 'object-sync-for-salesforce'); ?></td>
 			<td><?php echo $error['wordpress_id']; ?></td>
 			<td><?php echo $error['wordpress_object']; ?></td>
 			<td><?php echo $error['salesforce_id']; ?></td>
-			<td><?php echo date_i18n( 'Y-m-d g:i:sa', strtotime( $error['created'] ) ); ?></td>
+			<td><?php echo date_i18n('Y-m-d g:i:sa', strtotime($error['created'])); ?></td>
 			<td>
-				<a href="<?php echo esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors&method=edit&id=' . $error['id'] ) ); ?>"><?php echo esc_html__( 'Edit', 'object-sync-for-salesforce' ); ?></a>
+				<a href="<?php echo esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors&method=edit&id=' . $error['id'])); ?>"><?php echo esc_html__('Edit', 'object-sync-for-salesforce'); ?></a>
 			</td>
 			<td>
-				<a href="<?php echo esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors&method=delete&id=' . $error['id'] ) ); ?>"><?php echo esc_html__( 'Delete', 'object-sync-for-salesforce' ); ?></a>
+				<a href="<?php echo esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors&method=delete&id=' . $error['id'])); ?>"><?php echo esc_html__('Delete', 'object-sync-for-salesforce'); ?></a>
 			</td>
 		</tr>
 			<?php } ?>
 		<?php endif; ?>
-		<?php if ( ! empty( $mapping_errors['push_errors'] ) ) : ?>
-			<?php foreach ( $mapping_errors['push_errors'] as $error ) { ?>
+		<?php if ( ! empty($mapping_errors['push_errors'])) : ?>
+			<?php foreach ($mapping_errors['push_errors'] as $error) { ?>
 		<tr>
-			<td><?php echo esc_html__( 'Push to Salesforce', 'object-sync-for-salesforce' ); ?></td>
+			<td><?php echo esc_html__('Push to Salesforce', 'object-sync-for-salesforce'); ?></td>
 			<td><?php echo $error['wordpress_id']; ?></td>
 			<td><?php echo $error['wordpress_object']; ?></td>
 			<td><?php echo $error['salesforce_id']; ?></td>
-			<td><?php echo date_i18n( 'Y-m-d g:i:sa', strtotime( $error['created'] ) ); ?></td>
+			<td><?php echo date_i18n('Y-m-d g:i:sa', strtotime($error['created'])); ?></td>
 			<td>
-				<a href="<?php echo esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors&method=edit&id=' . $error['id'] ) ); ?>"><?php echo esc_html__( 'Edit', 'object-sync-for-salesforce' ); ?></a>
+				<a href="<?php echo esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors&method=edit&id=' . $error['id'])); ?>"><?php echo esc_html__('Edit', 'object-sync-for-salesforce'); ?></a>
 			</td>
 			<td>
-				<a href="<?php echo esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors&method=delete&id=' . $error['id'] ) ); ?>"><?php echo esc_html__( 'Delete', 'object-sync-for-salesforce' ); ?></a>
+				<a href="<?php echo esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors&method=delete&id=' . $error['id'])); ?>"><?php echo esc_html__('Delete', 'object-sync-for-salesforce'); ?></a>
 			</td>
 		</tr>
 			<?php } ?>

templates/admin/import-export.php

Spacing +13 added lines, -13 removed lines

@@ -1,33 +1,33 @@
-<h3><?php echo esc_html__( 'Import', 'object-sync-for-salesforce' ); ?></h3>
-<form method="post" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>" enctype="multipart/form-data" class="import">
+<h3><?php echo esc_html__('Import', 'object-sync-for-salesforce'); ?></h3>
+<form method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>" enctype="multipart/form-data" class="import">
 	<input type="hidden" name="action" value="object_sync_for_salesforce_import">
-	<?php wp_nonce_field( 'object_sync_for_salesforce_nonce_import', 'object_sync_for_salesforce_nonce_import' ); ?>
-	<p><?php _e( 'Import the plugin data from a .json file. You can use the Export options below to get this file.', 'object-sync-for-salesforce' ); ?></p>
+	<?php wp_nonce_field('object_sync_for_salesforce_nonce_import', 'object_sync_for_salesforce_nonce_import'); ?>
+	<p><?php _e('Import the plugin data from a .json file. You can use the Export options below to get this file.', 'object-sync-for-salesforce'); ?></p>
 	<p>
 		<input type="file" name="import_file" id="object-sync-for-salesforce-import" required>
 	</p>
 	<p>
 		<input type="checkbox" value="1" name="overwrite" id="object-sync-for-salesforce-import-overwrite">
-		<label for="object-sync-for-salesforce-import-overwrite"><?php _e( 'Overwrite existing data', 'object-sync-for-salesforce' ); ?></label>
+		<label for="object-sync-for-salesforce-import-overwrite"><?php _e('Overwrite existing data', 'object-sync-for-salesforce'); ?></label>
 	</p>
-	<input type="submit" class="button button-primary" value="<?php _e( 'Import', 'object-sync-for-salesforce' ); ?>" />
+	<input type="submit" class="button button-primary" value="<?php _e('Import', 'object-sync-for-salesforce'); ?>" />
 </form>
 
-<h3><?php echo esc_html__( 'Export', 'object-sync-for-salesforce' ); ?></h3>
-<form method="post" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>" class="export">
+<h3><?php echo esc_html__('Export', 'object-sync-for-salesforce'); ?></h3>
+<form method="post" action="<?php echo esc_url(admin_url('admin-post.php')); ?>" class="export">
 	<input type="hidden" name="action" value="object_sync_for_salesforce_export">
-	<?php wp_nonce_field( 'object_sync_for_salesforce_nonce_export', 'object_sync_for_salesforce_nonce_export' ); ?>
+	<?php wp_nonce_field('object_sync_for_salesforce_nonce_export', 'object_sync_for_salesforce_nonce_export'); ?>
 	<p>
 		<input type="checkbox" value="fieldmaps" name="export[]" id="object-sync-for-salesforce-export-fieldmaps">
-		<label for="object-sync-for-salesforce-export-fieldmaps"><?php _e( 'Include Fieldmaps', 'object-sync-for-salesforce' ); ?></label>
+		<label for="object-sync-for-salesforce-export-fieldmaps"><?php _e('Include Fieldmaps', 'object-sync-for-salesforce'); ?></label>
 	</p>
 	<p>
 		<input type="checkbox" value="object_maps" name="export[]" id="object-sync-for-salesforce-export-object-maps" />
-		<label for="object-sync-for-salesforce-export-object-maps"><?php _e( 'Include Object Maps', 'object-sync-for-salesforce' ); ?></label>
+		<label for="object-sync-for-salesforce-export-object-maps"><?php _e('Include Object Maps', 'object-sync-for-salesforce'); ?></label>
 	</p>
 	<p>
 		<input type="checkbox" value="plugin_settings" name="export[]" id="object-sync-for-salesforce-export-plugin-settings" />
-		<label for="object-sync-for-salesforce-export-plugin-settings"><?php _e( 'Include Plugin Settings', 'object-sync-for-salesforce' ); ?></label>
+		<label for="object-sync-for-salesforce-export-plugin-settings"><?php _e('Include Plugin Settings', 'object-sync-for-salesforce'); ?></label>
 	</p>
-	<input type="submit" class="button button-primary" value="<?php _e( 'Export', 'object-sync-for-salesforce' ); ?>" />
+	<input type="submit" class="button button-primary" value="<?php _e('Export', 'object-sync-for-salesforce'); ?>" />
 </form>

templates/admin/user-profile-salesforce.php

Spacing +20 added lines, -20 removed lines

@@ -1,41 +1,41 @@
-<input type="hidden" name="mapping_id" id="mapping_id_ajax" value="<?php echo absint( $mapping['id'] ); ?>" />
-<input type="hidden" name="salesforce_id" id="salesforce_id_ajax" value="<?php echo esc_attr( $mapping['salesforce_id'] ); ?>" />
-<input type="hidden" name="wordpress_id" id="wordpress_id_ajax" value="<?php echo absint( $mapping['wordpress_id'] ); ?>" />
-<input type="hidden" name="wordpress_object" id="wordpress_object_ajax" value="<?php echo esc_attr( $mapping['wordpress_object'] ); ?>" />
-<h2><?php echo esc_html__( 'Salesforce', 'object-sync-for-salesforce' ); ?></h2>
+<input type="hidden" name="mapping_id" id="mapping_id_ajax" value="<?php echo absint($mapping['id']); ?>" />
+<input type="hidden" name="salesforce_id" id="salesforce_id_ajax" value="<?php echo esc_attr($mapping['salesforce_id']); ?>" />
+<input type="hidden" name="wordpress_id" id="wordpress_id_ajax" value="<?php echo absint($mapping['wordpress_id']); ?>" />
+<input type="hidden" name="wordpress_object" id="wordpress_object_ajax" value="<?php echo esc_attr($mapping['wordpress_object']); ?>" />
+<h2><?php echo esc_html__('Salesforce', 'object-sync-for-salesforce'); ?></h2>
 <table class="wp-list-table widefat striped mapped-salesforce-user">
-	<caption><?php echo esc_html__( 'This user is mapped to a Salesforce object', 'object-sync-for-salesforce' ); ?></caption>
+	<caption><?php echo esc_html__('This user is mapped to a Salesforce object', 'object-sync-for-salesforce'); ?></caption>
 	<tbody>
 		<tr>
-			<th><?php echo esc_html__( 'Salesforce Id', 'object-sync-for-salesforce' ); ?></th>
-			<td><a href="<?php echo esc_url( $this->salesforce['sfapi']->get_instance_url() . '/' . $mapping['salesforce_id'] ); ?>"><?php echo esc_attr( $mapping['salesforce_id'] ); ?></a></td>
-			<td><a href="<?php echo esc_url( get_admin_url( null, 'user-edit.php?user_id=' . $user->ID ) . '&amp;edit_salesforce_mapping=true' ); ?>" class="edit-salesforce-mapping"><?php echo esc_html__( 'Edit', 'object-sync-for-salesforce' ); ?></a></td>
+			<th><?php echo esc_html__('Salesforce Id', 'object-sync-for-salesforce'); ?></th>
+			<td><a href="<?php echo esc_url($this->salesforce['sfapi']->get_instance_url() . '/' . $mapping['salesforce_id']); ?>"><?php echo esc_attr($mapping['salesforce_id']); ?></a></td>
+			<td><a href="<?php echo esc_url(get_admin_url(null, 'user-edit.php?user_id=' . $user->ID) . '&amp;edit_salesforce_mapping=true'); ?>" class="edit-salesforce-mapping"><?php echo esc_html__('Edit', 'object-sync-for-salesforce'); ?></a></td>
 		</tr>
 		<tr>
-			<th><?php echo esc_html__( 'Last Sync Message', 'object-sync-for-salesforce' ); ?></th>
-			<td class="last_sync_message"><?php echo isset( $mapping['last_sync_message'] ) ? esc_html( $mapping['last_sync_message'] ) : ''; ?></td>
+			<th><?php echo esc_html__('Last Sync Message', 'object-sync-for-salesforce'); ?></th>
+			<td class="last_sync_message"><?php echo isset($mapping['last_sync_message']) ? esc_html($mapping['last_sync_message']) : ''; ?></td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<th><?php echo esc_html__( 'Last Sync Action', 'object-sync-for-salesforce' ); ?></th>
-			<td class="last_sync_action"><?php echo isset( $mapping['last_sync_action'] ) ? esc_html( $mapping['last_sync_action'] ) : ''; ?></td>
+			<th><?php echo esc_html__('Last Sync Action', 'object-sync-for-salesforce'); ?></th>
+			<td class="last_sync_action"><?php echo isset($mapping['last_sync_action']) ? esc_html($mapping['last_sync_action']) : ''; ?></td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<th><?php echo esc_html__( 'Last Sync Status', 'object-sync-for-salesforce' ); ?></th>
-			<td class="last_sync_status"><?php echo ( isset( $mapping['last_sync_status'] ) && '1' === $mapping['last_sync_status'] ) ? esc_html__( 'success', 'object-sync-for-salesforce' ) : esc_html__( 'error', 'object-sync-for-salesforce' ); ?></td>
+			<th><?php echo esc_html__('Last Sync Status', 'object-sync-for-salesforce'); ?></th>
+			<td class="last_sync_status"><?php echo (isset($mapping['last_sync_status']) && '1' === $mapping['last_sync_status']) ? esc_html__('success', 'object-sync-for-salesforce') : esc_html__('error', 'object-sync-for-salesforce'); ?></td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<th><?php echo esc_html__( 'Last Sync', 'object-sync-for-salesforce' ); ?></th>
-			<td class="last_sync"><?php echo isset( $mapping['last_sync'] ) ? esc_html( $mapping['last_sync'] ) : ''; ?></td>
+			<th><?php echo esc_html__('Last Sync', 'object-sync-for-salesforce'); ?></th>
+			<td class="last_sync"><?php echo isset($mapping['last_sync']) ? esc_html($mapping['last_sync']) : ''; ?></td>
 			<td>&nbsp;</td>
 		</tr>
 		<tr>
-			<th><?php echo esc_html__( 'Actions', 'object-sync-for-salesforce' ); ?></th>
+			<th><?php echo esc_html__('Actions', 'object-sync-for-salesforce'); ?></th>
 			<td>
-				<a href="#" class="button button-secondary push_to_salesforce_button"><?php echo esc_html__( 'Push to Salesforce', 'object-sync-for-salesforce' ); ?></a>
-				<a href="#" class="button button-secondary pull_from_salesforce_button"><?php echo esc_html__( 'Pull from Salesforce', 'object-sync-for-salesforce' ); ?></a>
+				<a href="#" class="button button-secondary push_to_salesforce_button"><?php echo esc_html__('Push to Salesforce', 'object-sync-for-salesforce'); ?></a>
+				<a href="#" class="button button-secondary pull_from_salesforce_button"><?php echo esc_html__('Pull from Salesforce', 'object-sync-for-salesforce'); ?></a>
 			</td>
 		</tr>
 	</tbody>

templates/admin/status.php

Spacing +17 added lines, -17 removed lines

@@ -1,9 +1,9 @@ 
-<h3><?php echo esc_html__( 'Salesforce Status', 'object-sync-for-salesforce' ); ?></h3>
+<h3><?php echo esc_html__('Salesforce Status', 'object-sync-for-salesforce'); ?></h3>
 <p>
 <?php
 	// translators: placeholder is for the version number of the Salesforce REST API
-	echo sprintf( esc_html__( 'Currently, we are using version %1$s of the Salesforce REST API. Available versions are displayed below.', 'object-sync-for-salesforce' ),
-		esc_html( $this->login_credentials['rest_api_version'] )
+	echo sprintf(esc_html__('Currently, we are using version %1$s of the Salesforce REST API. Available versions are displayed below.', 'object-sync-for-salesforce'),
+		esc_html($this->login_credentials['rest_api_version'])
 	);
 ?>
 </p>
@@ -13,23 +13,23 @@ 
 			<h4><?php echo $versions_apicall_summary; ?></h4>
 		</summary>
 		<tr>
-			<th><?php echo esc_html__( 'Label', 'object-sync-for-salesforce' ); ?></th>
-			<th><?php echo esc_html__( 'URL', 'object-sync-for-salesforce' ); ?></th>
-			<th><?php echo esc_html__( 'Version', 'object-sync-for-salesforce' ); ?></th>
+			<th><?php echo esc_html__('Label', 'object-sync-for-salesforce'); ?></th>
+			<th><?php echo esc_html__('URL', 'object-sync-for-salesforce'); ?></th>
+			<th><?php echo esc_html__('Version', 'object-sync-for-salesforce'); ?></th>
 		</tr>
 	</thead>
 	<tbody>
-		<?php foreach ( $versions['data'] as $version ) { ?>
+		<?php foreach ($versions['data'] as $version) { ?>
 			<?php
 			$class = '';
-			if ( $version['version'] === $this->login_credentials['rest_api_version'] ) {
+			if ($version['version'] === $this->login_credentials['rest_api_version']) {
 				$class = ' class="current"';
 			}
 			?>
-			<tr<?php echo esc_attr( $class ); ?>>
-				<td><?php echo esc_html( $version['label'] ); ?></td>
-				<td><?php echo esc_html( $version['url'] ); ?></td>
-				<td><?php echo esc_html( $version['version'] ); ?></td>
+			<tr<?php echo esc_attr($class); ?>>
+				<td><?php echo esc_html($version['label']); ?></td>
+				<td><?php echo esc_html($version['url']); ?></td>
+				<td><?php echo esc_html($version['version']); ?></td>
 			</tr>
 		<?php } ?>
 	</tbody>
@@ -41,15 +41,15 @@ 
 			<h4><?php echo $contacts_apicall_summary; ?></h4>
 		</summary>
 		<tr>
-			<th><?php echo esc_html__( 'Contact ID' ); ?></th>
-			<th><?php echo esc_html__( 'Name' ); ?></th>
+			<th><?php echo esc_html__('Contact ID'); ?></th>
+			<th><?php echo esc_html__('Name'); ?></th>
 		</tr>
 	</thead>
 	<tbody>
-		<?php foreach ( $contacts['data']['records'] as $contact ) { ?>
+		<?php foreach ($contacts['data']['records'] as $contact) { ?>
 			<tr>
-				<td><?php echo esc_html( $contact['Id'] ); ?></td>
-				<td><?php echo esc_html( $contact['Name'] ); ?></td>
+				<td><?php echo esc_html($contact['Id']); ?></td>
+				<td><?php echo esc_html($contact['Name']); ?></td>
 			</tr>
 		<?php } ?>
 	</tbody>