MinnPost / object-sync-for-salesforce

object-sync-for-salesforce.php

Indentation +97 added lines, -97 removed lines

@@ -16,75 +16,75 @@ 
 class Object_Sync_Salesforce {
 
 	/**
-	* @var object
-	* Global object of `$wpdb`, the WordPress database
-	*/
+	 * @var object
+	 * Global object of `$wpdb`, the WordPress database
+	 */
 	private $wpdb;
 
 	/**
-	* @var array
-	* Login credentials for the Salesforce API; comes from wp-config or from the plugin settings
-	*/
+	 * @var array
+	 * Login credentials for the Salesforce API; comes from wp-config or from the plugin settings
+	 */
 	private $login_credentials;
 
 	/**
-	* @var string
-	* The plugin's slug so we can include it when necessary
-	*/
+	 * @var string
+	 * The plugin's slug so we can include it when necessary
+	 */
 	private $slug;
 
 	/**
-	* @var array
-	* Array of what classes in the plugin can be scheduled to occur with `wp_cron` events
-	*/
+	 * @var array
+	 * Array of what classes in the plugin can be scheduled to occur with `wp_cron` events
+	 */
 	public $schedulable_classes;
 
 	/**
-	* @var string
-	* Current version of the plugin
-	*/
+	 * @var string
+	 * Current version of the plugin
+	 */
 	private $version;
 
 	/**
-	* @var object
-	*/
+	 * @var object
+	 */
 	private $activated;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Logging class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Logging class
+	 */
 	private $logging;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Mapping class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Mapping class
+	 */
 	private $mappings;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_WordPress class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_WordPress class
+	 */
 	private $wordpress;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Salesforce class.
-	* This contains the Salesforce API methods
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Salesforce class.
+	 * This contains the Salesforce API methods
+	 */
 	public $salesforce;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Salesforce_Push class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Salesforce_Push class
+	 */
 	private $push;
 
 	/**
-	* @var object
-	* Load and initialize the Object_Sync_Sf_Salesforce_Pull class
-	*/
+	 * @var object
+	 * Load and initialize the Object_Sync_Sf_Salesforce_Pull class
+	 */
 	private $pull;
 
 	/**
@@ -95,13 +95,13 @@ 
 	static $instance = null;
 
 	/**
-	* Load the static $instance property that holds the instance of the class.
-	* This instance makes the class reusable by other plugins
-	*
-	* @return object
-	*   The sfapi object if it is authenticated (empty, otherwise)
-	*
-	*/
+	 * Load the static $instance property that holds the instance of the class.
+	 * This instance makes the class reusable by other plugins
+	 *
+	 * @return object
+	 *   The sfapi object if it is authenticated (empty, otherwise)
+	 *
+	 */
 	static public function get_instance() {
 		if ( null === self::$instance ) {
 			self::$instance = new Object_Sync_Salesforce();
@@ -222,17 +222,17 @@ 
 	}
 
 	/**
-	* Private helper to load methods for manipulating core WordPress data across the plugin
-	*
-	* @param object $wpdb
-	* @param string $version
-	* @param string $slug
-	* @param object $mappings
-	* @param object $logging
-	*
-	* @return object
-	*   Instance of Object_Sync_Sf_WordPress
-	*/
+	 * Private helper to load methods for manipulating core WordPress data across the plugin
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param string $slug
+	 * @param object $mappings
+	 * @param object $logging
+	 *
+	 * @return object
+	 *   Instance of Object_Sync_Sf_WordPress
+	 */
 	private function wordpress( $wpdb, $version, $slug, $mappings, $logging ) {
 		require_once plugin_dir_path( __FILE__ ) . 'classes/wordpress.php';
 		$wordpress = new Object_Sync_Sf_WordPress( $wpdb, $version, $slug, $mappings, $logging );
@@ -240,13 +240,13 @@ 
 	}
 
 	/**
-	* Public helper to load the Salesforce API and see if it is authenticated.
-	* This is public so other plugins can access the same SF API instance
-	*
-	* @return array
-	*   Whether Salesforce is authenticated (boolean)
-	*   The sfapi object if it is authenticated (empty, otherwise)
-	*/
+	 * Public helper to load the Salesforce API and see if it is authenticated.
+	 * This is public so other plugins can access the same SF API instance
+	 *
+	 * @return array
+	 *   Whether Salesforce is authenticated (boolean)
+	 *   The sfapi object if it is authenticated (empty, otherwise)
+	 */
 	public function salesforce_get_api() {
 		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce.php' );
 		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce_query.php' ); // this can be used to generate soql queries, but we don't often need it so it gets initialized whenever it's needed
@@ -352,24 +352,24 @@ 
 	}
 
 	/**
-	* Load the admin class.
-	* This also creates admin menu, unless the plugin that calls this library has indicated that it has its own menu
-	*
-	* @param object $wpdb
-	* @param string $version
-	* @param array $login_credentials
-	* @param string $slug
-	* @param object $wordpress
-	* @param object $salesforce
-	* @param object $mappings
-	* @param object $push
-	* @param object $pull
-	* @param object $logging
-	* @param array $schedulable_classes
-	* @return object $admin
-	*   Instance of Object_Sync_Sf_Admin
-	*
-	*/
+	 * Load the admin class.
+	 * This also creates admin menu, unless the plugin that calls this library has indicated that it has its own menu
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param array $login_credentials
+	 * @param string $slug
+	 * @param object $wordpress
+	 * @param object $salesforce
+	 * @param object $mappings
+	 * @param object $push
+	 * @param object $pull
+	 * @param object $logging
+	 * @param array $schedulable_classes
+	 * @return object $admin
+	 *   Instance of Object_Sync_Sf_Admin
+	 *
+	 */
 	private function load_admin( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes ) {
 		require_once( plugin_dir_path( __FILE__ ) . 'classes/admin.php' );
 		$admin = new Object_Sync_Sf_Admin( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes );
@@ -381,13 +381,13 @@ 
 	}
 
 	/**
-	* Display a Settings link on the main Plugins page
-	*
-	* @param array $links
-	* @param string $file
-	* @return array $links
-	*   These are the links that go with this plugin's entry
-	*/
+	 * Display a Settings link on the main Plugins page
+	 *
+	 * @param array $links
+	 * @param string $file
+	 * @return array $links
+	 *   These are the links that go with this plugin's entry
+	 */
 	public function plugin_action_links( $links, $file ) {
 		if ( plugin_basename( __FILE__ ) === $file ) {
 			$settings = '<a href="' . get_admin_url() . 'options-general.php?page=object-sync-salesforce-admin">' . __( 'Settings', 'object-sync-for-salesforce' ) . '</a>';
@@ -399,10 +399,10 @@ 
 
 
 	/**
-	* Admin styles. Load the CSS and JavaScript for the plugin's settings
-	*
-	* @return void
-	*/
+	 * Admin styles. Load the CSS and JavaScript for the plugin's settings
+	 *
+	 * @return void
+	 */
 	public function admin_scripts_and_styles() {
 		wp_enqueue_script( $this->slug . '-admin', plugins_url( 'assets/js/object-sync-for-salesforce-admin.min.js', __FILE__ ), array( 'jquery' ), filemtime( plugin_dir_path( __FILE__ ) . 'assets/js/object-sync-for-salesforce-admin.js' ), true );
 		wp_enqueue_style( $this->slug . '-admin', plugins_url( 'assets/css/object-sync-for-salesforce-admin.min.css', __FILE__ ), array(), filemtime( plugin_dir_path( __FILE__ ) . 'assets/css/object-sync-for-salesforce-admin.css' ), 'all' );
@@ -418,13 +418,13 @@ 
 	}
 
 	/**
-	* Get the pre-login Salesforce credentials.
-	* These depend on the plugin's settings or constants defined in wp-config.php.
-	*
-	* @return array $login_credentials
-	*   Includes all settings necessary to log into the Salesforce API.
-	*   Replaces settings options with wp-config.php values if they exist.
-	*/
+	 * Get the pre-login Salesforce credentials.
+	 * These depend on the plugin's settings or constants defined in wp-config.php.
+	 *
+	 * @return array $login_credentials
+	 *   Includes all settings necessary to log into the Salesforce API.
+	 *   Replaces settings options with wp-config.php values if they exist.
+	 */
 	private function get_login_credentials() {
 
 		$consumer_key = defined( 'OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY' ) ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY : get_option( 'object_sync_for_salesforce_consumer_key', '' );

Spacing +59 added lines, -59 removed lines

@@ -103,7 +103,7 @@ 
 	*
 	*/
 	static public function get_instance() {
-		if ( null === self::$instance ) {
+		if (null === self::$instance) {
 			self::$instance = new Object_Sync_Salesforce();
 		}
 		return self::$instance;
@@ -142,7 +142,7 @@ 
 		);
 
 		// users can modify the list of schedulable classes
-		$this->schedulable_classes = apply_filters( 'object_sync_for_salesforce_modify_schedulable_classes', $this->schedulable_classes );
+		$this->schedulable_classes = apply_filters('object_sync_for_salesforce_modify_schedulable_classes', $this->schedulable_classes);
 
 		/*
 		 * example to modify the array of classes by adding one and removing one
@@ -167,21 +167,21 @@ 
 		 * }
 		*/
 
-		$this->activated = $this->activate( $this->wpdb, $this->version, $this->slug );
-		$this->deactivate( $this->wpdb, $this->version, $this->slug, $this->schedulable_classes );
+		$this->activated = $this->activate($this->wpdb, $this->version, $this->slug);
+		$this->deactivate($this->wpdb, $this->version, $this->slug, $this->schedulable_classes);
 
-		$this->logging = $this->logging( $this->wpdb, $this->version );
+		$this->logging = $this->logging($this->wpdb, $this->version);
 
-		$this->mappings = $this->mappings( $this->wpdb, $this->version, $this->slug, $this->logging );
+		$this->mappings = $this->mappings($this->wpdb, $this->version, $this->slug, $this->logging);
 
-		$this->wordpress = $this->wordpress( $this->wpdb, $this->version, $this->slug, $this->mappings, $this->logging );
+		$this->wordpress = $this->wordpress($this->wpdb, $this->version, $this->slug, $this->mappings, $this->logging);
 		$this->salesforce = $this->salesforce_get_api();
 
-		$this->push = $this->push( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes );
+		$this->push = $this->push($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes);
 
-		$this->pull = $this->pull( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes );
+		$this->pull = $this->pull($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->logging, $this->schedulable_classes);
 
-		$this->load_admin( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->push, $this->pull, $this->logging, $this->schedulable_classes );
+		$this->load_admin($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $this->push, $this->pull, $this->logging, $this->schedulable_classes);
 
 	}
 
@@ -195,12 +195,12 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Logging
 	 */
-	private function logging( $wpdb, $version ) {
-		if ( ! class_exists( 'WP_Logging' ) && 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/logging.php';
+	private function logging($wpdb, $version) {
+		if ( ! class_exists('WP_Logging') && 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/logging.php';
 		}
-		$logging = new Object_Sync_Sf_Logging( $wpdb, $version );
+		$logging = new Object_Sync_Sf_Logging($wpdb, $version);
 		return $logging;
 	}
 
@@ -215,9 +215,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Mapping
 	 */
-	private function mappings( $wpdb, $version, $slug, $logging ) {
-		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce_mapping.php' );
-		$mappings = new Object_Sync_Sf_Mapping( $wpdb, $version, $slug, $logging );
+	private function mappings($wpdb, $version, $slug, $logging) {
+		require_once(plugin_dir_path(__FILE__) . 'classes/salesforce_mapping.php');
+		$mappings = new Object_Sync_Sf_Mapping($wpdb, $version, $slug, $logging);
 		return $mappings;
 	}
 
@@ -233,9 +233,9 @@ 
 	* @return object
 	*   Instance of Object_Sync_Sf_WordPress
 	*/
-	private function wordpress( $wpdb, $version, $slug, $mappings, $logging ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/wordpress.php';
-		$wordpress = new Object_Sync_Sf_WordPress( $wpdb, $version, $slug, $mappings, $logging );
+	private function wordpress($wpdb, $version, $slug, $mappings, $logging) {
+		require_once plugin_dir_path(__FILE__) . 'classes/wordpress.php';
+		$wordpress = new Object_Sync_Sf_WordPress($wpdb, $version, $slug, $mappings, $logging);
 		return $wordpress;
 	}
 
@@ -248,8 +248,8 @@ 
 	*   The sfapi object if it is authenticated (empty, otherwise)
 	*/
 	public function salesforce_get_api() {
-		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce.php' );
-		require_once( plugin_dir_path( __FILE__ ) . 'classes/salesforce_query.php' ); // this can be used to generate soql queries, but we don't often need it so it gets initialized whenever it's needed
+		require_once(plugin_dir_path(__FILE__) . 'classes/salesforce.php');
+		require_once(plugin_dir_path(__FILE__) . 'classes/salesforce_query.php'); // this can be used to generate soql queries, but we don't often need it so it gets initialized whenever it's needed
 		$consumer_key = $this->login_credentials['consumer_key'];
 		$consumer_secret = $this->login_credentials['consumer_secret'];
 		$login_url = $this->login_credentials['login_url'];
@@ -263,9 +263,9 @@ 
 		$schedulable_classes = $this->schedulable_classes;
 		$is_authorized = false;
 		$sfapi = '';
-		if ( $consumer_key && $consumer_secret ) {
-			$sfapi = new Object_Sync_Sf_Salesforce( $consumer_key, $consumer_secret, $login_url, $callback_url, $authorize_path, $token_path, $rest_api_version, $wordpress, $slug, $logging, $schedulable_classes );
-			if ( $sfapi->is_authorized() === true ) {
+		if ($consumer_key && $consumer_secret) {
+			$sfapi = new Object_Sync_Sf_Salesforce($consumer_key, $consumer_secret, $login_url, $callback_url, $authorize_path, $token_path, $rest_api_version, $wordpress, $slug, $logging, $schedulable_classes);
+			if ($sfapi->is_authorized() === true) {
 				$is_authorized = true;
 			}
 		}
@@ -285,9 +285,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Activate
 	 */
-	private function activate( $wpdb, $version, $slug ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/activate.php';
-		$activate = new Object_Sync_Sf_Activate( $wpdb, $version, $slug );
+	private function activate($wpdb, $version, $slug) {
+		require_once plugin_dir_path(__FILE__) . 'classes/activate.php';
+		$activate = new Object_Sync_Sf_Activate($wpdb, $version, $slug);
 		return $activate;
 	}
 
@@ -302,9 +302,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Deactivate
 	 */
-	private function deactivate( $wpdb, $version, $slug, $schedulable_classes ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/deactivate.php';
-		$deactivate = new Object_Sync_Sf_Deactivate( $wpdb, $version, $slug, $schedulable_classes );
+	private function deactivate($wpdb, $version, $slug, $schedulable_classes) {
+		require_once plugin_dir_path(__FILE__) . 'classes/deactivate.php';
+		$deactivate = new Object_Sync_Sf_Deactivate($wpdb, $version, $slug, $schedulable_classes);
 	}
 
 
@@ -324,9 +324,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Salesforce_Push
 	 */
-	private function push( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/salesforce_push.php';
-		$push = new Object_Sync_Sf_Salesforce_Push( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes );
+	private function push($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes) {
+		require_once plugin_dir_path(__FILE__) . 'classes/salesforce_push.php';
+		$push = new Object_Sync_Sf_Salesforce_Push($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes);
 		return $push;
 	}
 
@@ -345,9 +345,9 @@ 
 	 * @return object
 	 *   Instance of Object_Sync_Sf_Salesforce_Pull
 	 */
-	private function pull( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes ) {
-		require_once plugin_dir_path( __FILE__ ) . 'classes/salesforce_pull.php';
-		$pull = new Object_Sync_Sf_Salesforce_Pull( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes );
+	private function pull($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes) {
+		require_once plugin_dir_path(__FILE__) . 'classes/salesforce_pull.php';
+		$pull = new Object_Sync_Sf_Salesforce_Pull($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $logging, $schedulable_classes);
 		return $pull;
 	}
 
@@ -370,13 +370,13 @@ 
 	*   Instance of Object_Sync_Sf_Admin
 	*
 	*/
-	private function load_admin( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes ) {
-		require_once( plugin_dir_path( __FILE__ ) . 'classes/admin.php' );
-		$admin = new Object_Sync_Sf_Admin( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes );
-		add_action( 'admin_menu', array( $admin, 'create_admin_menu' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_scripts_and_styles' ) );
-		add_action( 'plugins_loaded', array( $this, 'textdomain' ) );
-		add_filter( 'plugin_action_links', array( $this, 'plugin_action_links' ), 10, 5 );
+	private function load_admin($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes) {
+		require_once(plugin_dir_path(__FILE__) . 'classes/admin.php');
+		$admin = new Object_Sync_Sf_Admin($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes);
+		add_action('admin_menu', array($admin, 'create_admin_menu'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_scripts_and_styles'));
+		add_action('plugins_loaded', array($this, 'textdomain'));
+		add_filter('plugin_action_links', array($this, 'plugin_action_links'), 10, 5);
 		return $admin;
 	}
 
@@ -388,11 +388,11 @@ 
 	* @return array $links
 	*   These are the links that go with this plugin's entry
 	*/
-	public function plugin_action_links( $links, $file ) {
-		if ( plugin_basename( __FILE__ ) === $file ) {
-			$settings = '<a href="' . get_admin_url() . 'options-general.php?page=object-sync-salesforce-admin">' . __( 'Settings', 'object-sync-for-salesforce' ) . '</a>';
+	public function plugin_action_links($links, $file) {
+		if (plugin_basename(__FILE__) === $file) {
+			$settings = '<a href="' . get_admin_url() . 'options-general.php?page=object-sync-salesforce-admin">' . __('Settings', 'object-sync-for-salesforce') . '</a>';
 			// make the 'Settings' link appear first
-			array_unshift( $links, $settings );
+			array_unshift($links, $settings);
 		}
 		return $links;
 	}
@@ -404,8 +404,8 @@ 
 	* @return void
 	*/
 	public function admin_scripts_and_styles() {
-		wp_enqueue_script( $this->slug . '-admin', plugins_url( 'assets/js/object-sync-for-salesforce-admin.min.js', __FILE__ ), array( 'jquery' ), filemtime( plugin_dir_path( __FILE__ ) . 'assets/js/object-sync-for-salesforce-admin.js' ), true );
-		wp_enqueue_style( $this->slug . '-admin', plugins_url( 'assets/css/object-sync-for-salesforce-admin.min.css', __FILE__ ), array(), filemtime( plugin_dir_path( __FILE__ ) . 'assets/css/object-sync-for-salesforce-admin.css' ), 'all' );
+		wp_enqueue_script($this->slug . '-admin', plugins_url('assets/js/object-sync-for-salesforce-admin.min.js', __FILE__), array('jquery'), filemtime(plugin_dir_path(__FILE__) . 'assets/js/object-sync-for-salesforce-admin.js'), true);
+		wp_enqueue_style($this->slug . '-admin', plugins_url('assets/css/object-sync-for-salesforce-admin.min.css', __FILE__), array(), filemtime(plugin_dir_path(__FILE__) . 'assets/css/object-sync-for-salesforce-admin.css'), 'all');
 	}
 
 	/**
@@ -414,7 +414,7 @@ 
 	 * @return void
 	 */
 	public function textdomain() {
-		load_plugin_textdomain( 'object-sync-for-salesforce', false, dirname( plugin_basename( __FILE__ ) ) . '/languages/' );
+		load_plugin_textdomain('object-sync-for-salesforce', false, dirname(plugin_basename(__FILE__)) . '/languages/');
 	}
 
 	/**
@@ -427,13 +427,13 @@ 
 	*/
 	private function get_login_credentials() {
 
-		$consumer_key = defined( 'OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY' ) ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY : get_option( 'object_sync_for_salesforce_consumer_key', '' );
-		$consumer_secret = defined( 'OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET' ) ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET : get_option( 'object_sync_for_salesforce_consumer_secret', '' );
-		$callback_url = defined( 'OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL' ) ? OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL : get_option( 'object_sync_for_salesforce_callback_url', '' );
-		$login_base_url = defined( 'OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL' ) ? OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL : get_option( 'object_sync_for_salesforce_login_base_url', '' );
-		$authorize_url_path = defined( 'OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH' ) ? OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH : get_option( 'object_sync_for_salesforce_authorize_url_path', '' );
-		$token_url_path = defined( 'OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH' ) ? OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH : get_option( 'object_sync_for_salesforce_token_url_path', '' );
-		$api_version = defined( 'OBJECT_SYNC_SF_SALESFORCE_API_VERSION' ) ? OBJECT_SYNC_SF_SALESFORCE_API_VERSION : get_option( 'object_sync_for_salesforce_api_version', '' );
+		$consumer_key = defined('OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY') ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_KEY : get_option('object_sync_for_salesforce_consumer_key', '');
+		$consumer_secret = defined('OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET') ? OBJECT_SYNC_SF_SALESFORCE_CONSUMER_SECRET : get_option('object_sync_for_salesforce_consumer_secret', '');
+		$callback_url = defined('OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL') ? OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL : get_option('object_sync_for_salesforce_callback_url', '');
+		$login_base_url = defined('OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL') ? OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL : get_option('object_sync_for_salesforce_login_base_url', '');
+		$authorize_url_path = defined('OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH') ? OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH : get_option('object_sync_for_salesforce_authorize_url_path', '');
+		$token_url_path = defined('OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH') ? OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH : get_option('object_sync_for_salesforce_token_url_path', '');
+		$api_version = defined('OBJECT_SYNC_SF_SALESFORCE_API_VERSION') ? OBJECT_SYNC_SF_SALESFORCE_API_VERSION : get_option('object_sync_for_salesforce_api_version', '');
 
 		$login_credentials = array(
 			'consumer_key' => $consumer_key,

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>