MinnPost / object-sync-for-salesforce

vendor/developerforce/force.com-toolkit-for-php/unit_test/runTest.php

Indentation +13 added lines, -13 removed lines

@@ -6,30 +6,30 @@
 
 // Define path to application directory
 defined('APP_PATH')
-    || define('APP_PATH', realpath(dirname(__FILE__)));
+	|| define('APP_PATH', realpath(dirname(__FILE__)));
 defined('LIB_PATH')
-    || define('LIB_PATH', realpath(dirname(__FILE__) . '/Lib'));
+	|| define('LIB_PATH', realpath(dirname(__FILE__) . '/Lib'));
     
 define('SOAP_BASEDIR', realpath(dirname(__FILE__) . '/..'));
 
 set_include_path(implode(PATH_SEPARATOR, array(
-    LIB_PATH,
-    SOAP_BASEDIR,
-    get_include_path(),
+	LIB_PATH,
+	SOAP_BASEDIR,
+	get_include_path(),
 )));
 
 function __autoload($className) {
-    $fullclasspath = "";
-    // get separated directories
-    $pathchunks=explode("_",$className);
+	$fullclasspath = "";
+	// get separated directories
+	$pathchunks=explode("_",$className);
 
-    //re-build path without last item
-    for($i=0; $i<(count($pathchunks)-1); $i++) {
-	    $fullclasspath .= $pathchunks[$i].'/';
-    }
+	//re-build path without last item
+	for($i=0; $i<(count($pathchunks)-1); $i++) {
+		$fullclasspath .= $pathchunks[$i].'/';
+	}
 
 //    require_once realpath(APP_PATH . '/' . $fullclasspath . $className . '.php');
-    require_once realpath(APP_PATH . '/' . $fullclasspath . '/' . substr($className, (strrpos($className, '_') + 1)) . '.php');
+	require_once realpath(APP_PATH . '/' . $fullclasspath . '/' . substr($className, (strrpos($className, '_') + 1)) . '.php');
 }
 
 $type = (int)$_GET['type'];

Spacing +4 added lines, -4 removed lines

@@ -21,18 +21,18 @@
 function __autoload($className) {
     $fullclasspath = "";
     // get separated directories
-    $pathchunks=explode("_",$className);
+    $pathchunks = explode("_", $className);
 
     //re-build path without last item
-    for($i=0; $i<(count($pathchunks)-1); $i++) {
-	    $fullclasspath .= $pathchunks[$i].'/';
+    for ($i = 0; $i < (count($pathchunks) - 1); $i++) {
+	    $fullclasspath .= $pathchunks[$i] . '/';
     }
 
 //    require_once realpath(APP_PATH . '/' . $fullclasspath . $className . '.php');
     require_once realpath(APP_PATH . '/' . $fullclasspath . '/' . substr($className, (strrpos($className, '_') + 1)) . '.php');
 }
 
-$type = (int)$_GET['type'];
+$type = (int) $_GET['type'];
 $target = $_GET['target'];
 $testFactory = new Lib_Test_TestFactory(SOAP_BASEDIR, APP_PATH . '/test.log');
 $testFactory->run($type, $target);

vendor/composer/autoload_static.php

Indentation +40 added lines, -40 removed lines

@@ -6,47 +6,47 @@
 
 class ComposerStaticInit9c397e0930797621ed4c4fa10b188a3a
 {
-    public static $files = array (
-        '712263cd6b22ec9ea795d59ae1ebda80' => __DIR__ . '/..' . '/prospress/action-scheduler/action-scheduler.php',
-    );
+	public static $files = array (
+		'712263cd6b22ec9ea795d59ae1ebda80' => __DIR__ . '/..' . '/prospress/action-scheduler/action-scheduler.php',
+	);
 
-    public static $classMap = array (
-        'AllowFieldTruncationHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-        'AssignmentRuleHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-        'CallOptions' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-        'Email' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEmail.php',
-        'EmailHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-        'LocaleOptions' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-        'LoginScopeHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-        'MassEmailMessage' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEmail.php',
-        'MruHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-        'PackageVersion' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-        'PackageVersionHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-        'ProcessRequest' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceProcessRequest.php',
-        'ProcessSubmitRequest' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceProcessRequest.php',
-        'ProcessWorkitemRequest' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceProcessRequest.php',
-        'ProxySettings' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/ProxySettings.php',
-        'QueryOptions' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-        'QueryResult' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
-        'SObject' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
-        'SforceBaseClient' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
-        'SforceCustomField' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceMetaObject.php',
-        'SforceCustomObject' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceMetaObject.php',
-        'SforceEnterpriseClient' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEnterpriseClient.php',
-        'SforceMetadataClient' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceMetadataClient.php',
-        'SforcePartnerClient' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php',
-        'SforceSearchResult' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
-        'SforceSoapClient' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php',
-        'SingleEmailMessage' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEmail.php',
-        'UserTerritoryDeleteHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-        'WP_Logging' => __DIR__ . '/..' . '/pippinsplugins/wp-logging/WP_Logging.php',
-    );
+	public static $classMap = array (
+		'AllowFieldTruncationHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+		'AssignmentRuleHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+		'CallOptions' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+		'Email' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEmail.php',
+		'EmailHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+		'LocaleOptions' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+		'LoginScopeHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+		'MassEmailMessage' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEmail.php',
+		'MruHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+		'PackageVersion' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+		'PackageVersionHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+		'ProcessRequest' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceProcessRequest.php',
+		'ProcessSubmitRequest' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceProcessRequest.php',
+		'ProcessWorkitemRequest' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceProcessRequest.php',
+		'ProxySettings' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/ProxySettings.php',
+		'QueryOptions' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+		'QueryResult' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
+		'SObject' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
+		'SforceBaseClient' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
+		'SforceCustomField' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceMetaObject.php',
+		'SforceCustomObject' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceMetaObject.php',
+		'SforceEnterpriseClient' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEnterpriseClient.php',
+		'SforceMetadataClient' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceMetadataClient.php',
+		'SforcePartnerClient' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php',
+		'SforceSearchResult' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
+		'SforceSoapClient' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php',
+		'SingleEmailMessage' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEmail.php',
+		'UserTerritoryDeleteHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+		'WP_Logging' => __DIR__ . '/..' . '/pippinsplugins/wp-logging/WP_Logging.php',
+	);
 
-    public static function getInitializer(ClassLoader $loader)
-    {
-        return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInit9c397e0930797621ed4c4fa10b188a3a::$classMap;
+	public static function getInitializer(ClassLoader $loader)
+	{
+		return \Closure::bind(function () use ($loader) {
+			$loader->classMap = ComposerStaticInit9c397e0930797621ed4c4fa10b188a3a::$classMap;
 
-        }, null, ClassLoader::class);
-    }
+		}, null, ClassLoader::class);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -6,11 +6,11 @@ 
 
 class ComposerStaticInit9c397e0930797621ed4c4fa10b188a3a
 {
-    public static $files = array (
+    public static $files = array(
         '712263cd6b22ec9ea795d59ae1ebda80' => __DIR__ . '/..' . '/prospress/action-scheduler/action-scheduler.php',
     );
 
-    public static $classMap = array (
+    public static $classMap = array(
         'AllowFieldTruncationHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
         'AssignmentRuleHeader' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
         'CallOptions' => __DIR__ . '/..' . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
@@ -44,7 +44,7 @@ 
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->classMap = ComposerStaticInit9c397e0930797621ed4c4fa10b188a3a::$classMap;
 
         }, null, ClassLoader::class);

vendor/composer/autoload_files.php

Indentation +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    '712263cd6b22ec9ea795d59ae1ebda80' => $vendorDir . '/prospress/action-scheduler/action-scheduler.php',
+	'712263cd6b22ec9ea795d59ae1ebda80' => $vendorDir . '/prospress/action-scheduler/action-scheduler.php',
 );

vendor/composer/autoload_real.php

Indentation +48 added lines, -48 removed lines

@@ -4,67 +4,67 @@
 
 class ComposerAutoloaderInit9c397e0930797621ed4c4fa10b188a3a
 {
-    private static $loader;
+	private static $loader;
 
-    public static function loadClassLoader($class)
-    {
-        if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
-        }
-    }
+	public static function loadClassLoader($class)
+	{
+		if ('Composer\Autoload\ClassLoader' === $class) {
+			require __DIR__ . '/ClassLoader.php';
+		}
+	}
 
-    public static function getLoader()
-    {
-        if (null !== self::$loader) {
-            return self::$loader;
-        }
+	public static function getLoader()
+	{
+		if (null !== self::$loader) {
+			return self::$loader;
+		}
 
-        spl_autoload_register(array('ComposerAutoloaderInit9c397e0930797621ed4c4fa10b188a3a', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit9c397e0930797621ed4c4fa10b188a3a', 'loadClassLoader'));
+		spl_autoload_register(array('ComposerAutoloaderInit9c397e0930797621ed4c4fa10b188a3a', 'loadClassLoader'), true, true);
+		self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+		spl_autoload_unregister(array('ComposerAutoloaderInit9c397e0930797621ed4c4fa10b188a3a', 'loadClassLoader'));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+		$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+		if ($useStaticLoader) {
+			require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit9c397e0930797621ed4c4fa10b188a3a::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
+			call_user_func(\Composer\Autoload\ComposerStaticInit9c397e0930797621ed4c4fa10b188a3a::getInitializer($loader));
+		} else {
+			$map = require __DIR__ . '/autoload_namespaces.php';
+			foreach ($map as $namespace => $path) {
+				$loader->set($namespace, $path);
+			}
 
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
+			$map = require __DIR__ . '/autoload_psr4.php';
+			foreach ($map as $namespace => $path) {
+				$loader->setPsr4($namespace, $path);
+			}
 
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
+			$classMap = require __DIR__ . '/autoload_classmap.php';
+			if ($classMap) {
+				$loader->addClassMap($classMap);
+			}
+		}
 
-        $loader->register(true);
+		$loader->register(true);
 
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit9c397e0930797621ed4c4fa10b188a3a::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire9c397e0930797621ed4c4fa10b188a3a($fileIdentifier, $file);
-        }
+		if ($useStaticLoader) {
+			$includeFiles = Composer\Autoload\ComposerStaticInit9c397e0930797621ed4c4fa10b188a3a::$files;
+		} else {
+			$includeFiles = require __DIR__ . '/autoload_files.php';
+		}
+		foreach ($includeFiles as $fileIdentifier => $file) {
+			composerRequire9c397e0930797621ed4c4fa10b188a3a($fileIdentifier, $file);
+		}
 
-        return $loader;
-    }
+		return $loader;
+	}
 }
 
 function composerRequire9c397e0930797621ed4c4fa10b188a3a($fileIdentifier, $file)
 {
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
+	if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+		require $file;
 
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-    }
+		$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInit9c397e0930797621ed4c4fa10b188a3a', 'loadClassLoader'));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && ! defined('HHVM_VERSION') && ( ! function_exists('zend_loader_file_encoded') || ! zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 

vendor/composer/ClassLoader.php

Indentation +391 added lines, -391 removed lines

@@ -42,396 +42,396 @@ 
  */
 class ClassLoader
 {
-    // PSR-4
-    private $prefixLengthsPsr4 = array();
-    private $prefixDirsPsr4 = array();
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    private $prefixesPsr0 = array();
-    private $fallbackDirsPsr0 = array();
-
-    private $useIncludePath = false;
-    private $classMap = array();
-    private $classMapAuthoritative = false;
-    private $missingClasses = array();
-    private $apcuPrefix;
-
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
-        }
-
-        return array();
-    }
-
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
-     *
-     * @param string|null $apcuPrefix
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
-    }
-
-    /**
-     * The APCu prefix in use, or null if APCu caching is not enabled.
-     *
-     * @return string|null
-     */
-    public function getApcuPrefix()
-    {
-        return $this->apcuPrefix;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
-            return false;
-        }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
-                return $file;
-            }
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
-        }
-
-        if (false === $file) {
-            // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
-                $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-
-        return false;
-    }
+	// PSR-4
+	private $prefixLengthsPsr4 = array();
+	private $prefixDirsPsr4 = array();
+	private $fallbackDirsPsr4 = array();
+
+	// PSR-0
+	private $prefixesPsr0 = array();
+	private $fallbackDirsPsr0 = array();
+
+	private $useIncludePath = false;
+	private $classMap = array();
+	private $classMapAuthoritative = false;
+	private $missingClasses = array();
+	private $apcuPrefix;
+
+	public function getPrefixes()
+	{
+		if (!empty($this->prefixesPsr0)) {
+			return call_user_func_array('array_merge', $this->prefixesPsr0);
+		}
+
+		return array();
+	}
+
+	public function getPrefixesPsr4()
+	{
+		return $this->prefixDirsPsr4;
+	}
+
+	public function getFallbackDirs()
+	{
+		return $this->fallbackDirsPsr0;
+	}
+
+	public function getFallbackDirsPsr4()
+	{
+		return $this->fallbackDirsPsr4;
+	}
+
+	public function getClassMap()
+	{
+		return $this->classMap;
+	}
+
+	/**
+	 * @param array $classMap Class to filename map
+	 */
+	public function addClassMap(array $classMap)
+	{
+		if ($this->classMap) {
+			$this->classMap = array_merge($this->classMap, $classMap);
+		} else {
+			$this->classMap = $classMap;
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-0 directories for a given prefix, either
+	 * appending or prepending to the ones previously set for this prefix.
+	 *
+	 * @param string       $prefix  The prefix
+	 * @param array|string $paths   The PSR-0 root directories
+	 * @param bool         $prepend Whether to prepend the directories
+	 */
+	public function add($prefix, $paths, $prepend = false)
+	{
+		if (!$prefix) {
+			if ($prepend) {
+				$this->fallbackDirsPsr0 = array_merge(
+					(array) $paths,
+					$this->fallbackDirsPsr0
+				);
+			} else {
+				$this->fallbackDirsPsr0 = array_merge(
+					$this->fallbackDirsPsr0,
+					(array) $paths
+				);
+			}
+
+			return;
+		}
+
+		$first = $prefix[0];
+		if (!isset($this->prefixesPsr0[$first][$prefix])) {
+			$this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+			return;
+		}
+		if ($prepend) {
+			$this->prefixesPsr0[$first][$prefix] = array_merge(
+				(array) $paths,
+				$this->prefixesPsr0[$first][$prefix]
+			);
+		} else {
+			$this->prefixesPsr0[$first][$prefix] = array_merge(
+				$this->prefixesPsr0[$first][$prefix],
+				(array) $paths
+			);
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-4 directories for a given namespace, either
+	 * appending or prepending to the ones previously set for this namespace.
+	 *
+	 * @param string       $prefix  The prefix/namespace, with trailing '\\'
+	 * @param array|string $paths   The PSR-4 base directories
+	 * @param bool         $prepend Whether to prepend the directories
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function addPsr4($prefix, $paths, $prepend = false)
+	{
+		if (!$prefix) {
+			// Register directories for the root namespace.
+			if ($prepend) {
+				$this->fallbackDirsPsr4 = array_merge(
+					(array) $paths,
+					$this->fallbackDirsPsr4
+				);
+			} else {
+				$this->fallbackDirsPsr4 = array_merge(
+					$this->fallbackDirsPsr4,
+					(array) $paths
+				);
+			}
+		} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+			// Register directories for a new namespace.
+			$length = strlen($prefix);
+			if ('\\' !== $prefix[$length - 1]) {
+				throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+			}
+			$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+			$this->prefixDirsPsr4[$prefix] = (array) $paths;
+		} elseif ($prepend) {
+			// Prepend directories for an already registered namespace.
+			$this->prefixDirsPsr4[$prefix] = array_merge(
+				(array) $paths,
+				$this->prefixDirsPsr4[$prefix]
+			);
+		} else {
+			// Append directories for an already registered namespace.
+			$this->prefixDirsPsr4[$prefix] = array_merge(
+				$this->prefixDirsPsr4[$prefix],
+				(array) $paths
+			);
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-0 directories for a given prefix,
+	 * replacing any others previously set for this prefix.
+	 *
+	 * @param string       $prefix The prefix
+	 * @param array|string $paths  The PSR-0 base directories
+	 */
+	public function set($prefix, $paths)
+	{
+		if (!$prefix) {
+			$this->fallbackDirsPsr0 = (array) $paths;
+		} else {
+			$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-4 directories for a given namespace,
+	 * replacing any others previously set for this namespace.
+	 *
+	 * @param string       $prefix The prefix/namespace, with trailing '\\'
+	 * @param array|string $paths  The PSR-4 base directories
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function setPsr4($prefix, $paths)
+	{
+		if (!$prefix) {
+			$this->fallbackDirsPsr4 = (array) $paths;
+		} else {
+			$length = strlen($prefix);
+			if ('\\' !== $prefix[$length - 1]) {
+				throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+			}
+			$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+			$this->prefixDirsPsr4[$prefix] = (array) $paths;
+		}
+	}
+
+	/**
+	 * Turns on searching the include path for class files.
+	 *
+	 * @param bool $useIncludePath
+	 */
+	public function setUseIncludePath($useIncludePath)
+	{
+		$this->useIncludePath = $useIncludePath;
+	}
+
+	/**
+	 * Can be used to check if the autoloader uses the include path to check
+	 * for classes.
+	 *
+	 * @return bool
+	 */
+	public function getUseIncludePath()
+	{
+		return $this->useIncludePath;
+	}
+
+	/**
+	 * Turns off searching the prefix and fallback directories for classes
+	 * that have not been registered with the class map.
+	 *
+	 * @param bool $classMapAuthoritative
+	 */
+	public function setClassMapAuthoritative($classMapAuthoritative)
+	{
+		$this->classMapAuthoritative = $classMapAuthoritative;
+	}
+
+	/**
+	 * Should class lookup fail if not found in the current class map?
+	 *
+	 * @return bool
+	 */
+	public function isClassMapAuthoritative()
+	{
+		return $this->classMapAuthoritative;
+	}
+
+	/**
+	 * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+	 *
+	 * @param string|null $apcuPrefix
+	 */
+	public function setApcuPrefix($apcuPrefix)
+	{
+		$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+	}
+
+	/**
+	 * The APCu prefix in use, or null if APCu caching is not enabled.
+	 *
+	 * @return string|null
+	 */
+	public function getApcuPrefix()
+	{
+		return $this->apcuPrefix;
+	}
+
+	/**
+	 * Registers this instance as an autoloader.
+	 *
+	 * @param bool $prepend Whether to prepend the autoloader or not
+	 */
+	public function register($prepend = false)
+	{
+		spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+	}
+
+	/**
+	 * Unregisters this instance as an autoloader.
+	 */
+	public function unregister()
+	{
+		spl_autoload_unregister(array($this, 'loadClass'));
+	}
+
+	/**
+	 * Loads the given class or interface.
+	 *
+	 * @param  string    $class The name of the class
+	 * @return bool|null True if loaded, null otherwise
+	 */
+	public function loadClass($class)
+	{
+		if ($file = $this->findFile($class)) {
+			includeFile($file);
+
+			return true;
+		}
+	}
+
+	/**
+	 * Finds the path to the file where the class is defined.
+	 *
+	 * @param string $class The name of the class
+	 *
+	 * @return string|false The path if found, false otherwise
+	 */
+	public function findFile($class)
+	{
+		// class map lookup
+		if (isset($this->classMap[$class])) {
+			return $this->classMap[$class];
+		}
+		if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+			return false;
+		}
+		if (null !== $this->apcuPrefix) {
+			$file = apcu_fetch($this->apcuPrefix.$class, $hit);
+			if ($hit) {
+				return $file;
+			}
+		}
+
+		$file = $this->findFileWithExtension($class, '.php');
+
+		// Search for Hack files if we are running on HHVM
+		if (false === $file && defined('HHVM_VERSION')) {
+			$file = $this->findFileWithExtension($class, '.hh');
+		}
+
+		if (null !== $this->apcuPrefix) {
+			apcu_add($this->apcuPrefix.$class, $file);
+		}
+
+		if (false === $file) {
+			// Remember that this class does not exist.
+			$this->missingClasses[$class] = true;
+		}
+
+		return $file;
+	}
+
+	private function findFileWithExtension($class, $ext)
+	{
+		// PSR-4 lookup
+		$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+		$first = $class[0];
+		if (isset($this->prefixLengthsPsr4[$first])) {
+			$subPath = $class;
+			while (false !== $lastPos = strrpos($subPath, '\\')) {
+				$subPath = substr($subPath, 0, $lastPos);
+				$search = $subPath . '\\';
+				if (isset($this->prefixDirsPsr4[$search])) {
+					$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+					foreach ($this->prefixDirsPsr4[$search] as $dir) {
+						if (file_exists($file = $dir . $pathEnd)) {
+							return $file;
+						}
+					}
+				}
+			}
+		}
+
+		// PSR-4 fallback dirs
+		foreach ($this->fallbackDirsPsr4 as $dir) {
+			if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+				return $file;
+			}
+		}
+
+		// PSR-0 lookup
+		if (false !== $pos = strrpos($class, '\\')) {
+			// namespaced class name
+			$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+				. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+		} else {
+			// PEAR-like class name
+			$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+		}
+
+		if (isset($this->prefixesPsr0[$first])) {
+			foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+				if (0 === strpos($class, $prefix)) {
+					foreach ($dirs as $dir) {
+						if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+							return $file;
+						}
+					}
+				}
+			}
+		}
+
+		// PSR-0 fallback dirs
+		foreach ($this->fallbackDirsPsr0 as $dir) {
+			if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+				return $file;
+			}
+		}
+
+		// PSR-0 include paths.
+		if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+			return $file;
+		}
+
+		return false;
+	}
 }
 
 /**
@@ -441,5 +441,5 @@ 
  */
 function includeFile($file)
 {
-    include $file;
+	include $file;
 }

Spacing +9 added lines, -9 removed lines

@@ -59,7 +59,7 @@ 
 
     public function getPrefixes()
     {
-        if (!empty($this->prefixesPsr0)) {
+        if ( ! empty($this->prefixesPsr0)) {
             return call_user_func_array('array_merge', $this->prefixesPsr0);
         }
 
@@ -108,7 +108,7 @@ 
      */
     public function add($prefix, $paths, $prepend = false)
     {
-        if (!$prefix) {
+        if ( ! $prefix) {
             if ($prepend) {
                 $this->fallbackDirsPsr0 = array_merge(
                     (array) $paths,
@@ -125,7 +125,7 @@ 
         }
 
         $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+        if ( ! isset($this->prefixesPsr0[$first][$prefix])) {
             $this->prefixesPsr0[$first][$prefix] = (array) $paths;
 
             return;
@@ -155,7 +155,7 @@ 
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
-        if (!$prefix) {
+        if ( ! $prefix) {
             // Register directories for the root namespace.
             if ($prepend) {
                 $this->fallbackDirsPsr4 = array_merge(
@@ -168,7 +168,7 @@ 
                     (array) $paths
                 );
             }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+        } elseif ( ! isset($this->prefixDirsPsr4[$prefix])) {
             // Register directories for a new namespace.
             $length = strlen($prefix);
             if ('\\' !== $prefix[$length - 1]) {
@@ -200,7 +200,7 @@ 
      */
     public function set($prefix, $paths)
     {
-        if (!$prefix) {
+        if ( ! $prefix) {
             $this->fallbackDirsPsr0 = (array) $paths;
         } else {
             $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
@@ -218,7 +218,7 @@ 
      */
     public function setPsr4($prefix, $paths)
     {
-        if (!$prefix) {
+        if ( ! $prefix) {
             $this->fallbackDirsPsr4 = (array) $paths;
         } else {
             $length = strlen($prefix);
@@ -342,7 +342,7 @@ 
             return false;
         }
         if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            $file = apcu_fetch($this->apcuPrefix . $class, $hit);
             if ($hit) {
                 return $file;
             }
@@ -356,7 +356,7 @@ 
         }
 
         if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
+            apcu_add($this->apcuPrefix . $class, $file);
         }
 
         if (false === $file) {

vendor/composer/autoload_classmap.php

Indentation +29 added lines, -29 removed lines

@@ -6,33 +6,33 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'AllowFieldTruncationHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-    'AssignmentRuleHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-    'CallOptions' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-    'Email' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEmail.php',
-    'EmailHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-    'LocaleOptions' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-    'LoginScopeHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-    'MassEmailMessage' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEmail.php',
-    'MruHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-    'PackageVersion' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-    'PackageVersionHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-    'ProcessRequest' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceProcessRequest.php',
-    'ProcessSubmitRequest' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceProcessRequest.php',
-    'ProcessWorkitemRequest' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceProcessRequest.php',
-    'ProxySettings' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/ProxySettings.php',
-    'QueryOptions' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-    'QueryResult' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
-    'SObject' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
-    'SforceBaseClient' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
-    'SforceCustomField' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceMetaObject.php',
-    'SforceCustomObject' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceMetaObject.php',
-    'SforceEnterpriseClient' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEnterpriseClient.php',
-    'SforceMetadataClient' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceMetadataClient.php',
-    'SforcePartnerClient' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php',
-    'SforceSearchResult' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
-    'SforceSoapClient' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php',
-    'SingleEmailMessage' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEmail.php',
-    'UserTerritoryDeleteHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
-    'WP_Logging' => $vendorDir . '/pippinsplugins/wp-logging/WP_Logging.php',
+	'AllowFieldTruncationHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+	'AssignmentRuleHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+	'CallOptions' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+	'Email' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEmail.php',
+	'EmailHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+	'LocaleOptions' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+	'LoginScopeHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+	'MassEmailMessage' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEmail.php',
+	'MruHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+	'PackageVersion' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+	'PackageVersionHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+	'ProcessRequest' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceProcessRequest.php',
+	'ProcessSubmitRequest' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceProcessRequest.php',
+	'ProcessWorkitemRequest' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceProcessRequest.php',
+	'ProxySettings' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/ProxySettings.php',
+	'QueryOptions' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+	'QueryResult' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
+	'SObject' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
+	'SforceBaseClient' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
+	'SforceCustomField' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceMetaObject.php',
+	'SforceCustomObject' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceMetaObject.php',
+	'SforceEnterpriseClient' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEnterpriseClient.php',
+	'SforceMetadataClient' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceMetadataClient.php',
+	'SforcePartnerClient' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php',
+	'SforceSearchResult' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceBaseClient.php',
+	'SforceSoapClient' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforcePartnerClient.php',
+	'SingleEmailMessage' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceEmail.php',
+	'UserTerritoryDeleteHeader' => $vendorDir . '/developerforce/force.com-toolkit-for-php/soapclient/SforceHeaderOptions.php',
+	'WP_Logging' => $vendorDir . '/pippinsplugins/wp-logging/WP_Logging.php',
 );

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

Spacing +140 added lines, -140 removed lines

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

classes/admin.php

Indentation +240 added lines, -240 removed lines

@@ -27,63 +27,63 @@ 
 	protected $queue;
 
 	/**
-	* @var string
-	* Default path for the Salesforce authorize URL
-	*/
+	 * @var string
+	 * Default path for the Salesforce authorize URL
+	 */
 	public $default_authorize_url_path;
 
 	/**
-	* @var string
-	* Default path for the Salesforce token URL
-	*/
+	 * @var string
+	 * Default path for the Salesforce token URL
+	 */
 	public $default_token_url_path;
 
 	/**
-	* @var string
-	* What version of the Salesforce API should be the default on the settings screen.
-	* Users can edit this, but they won't see a correct list of all their available versions until WordPress has
-	* been authenticated with Salesforce.
-	*/
+	 * @var string
+	 * What version of the Salesforce API should be the default on the settings screen.
+	 * Users can edit this, but they won't see a correct list of all their available versions until WordPress has
+	 * been authenticated with Salesforce.
+	 */
 	public $default_api_version;
 
 	/**
-	* @var bool
-	* Default for whether to limit to triggerable items
-	* Users can edit this
-	*/
+	 * @var bool
+	 * Default for whether to limit to triggerable items
+	 * Users can edit this
+	 */
 	public $default_triggerable;
 
 	/**
-	* @var bool
-	* Default for whether to limit to updateable items
-	* Users can edit this
-	*/
+	 * @var bool
+	 * Default for whether to limit to updateable items
+	 * Users can edit this
+	 */
 	public $default_updateable;
 
 	/**
-	* @var int
-	* Default pull throttle for how often Salesforce can pull
-	* Users can edit this
-	*/
+	 * @var int
+	 * Default pull throttle for how often Salesforce can pull
+	 * Users can edit this
+	 */
 	public $default_pull_throttle;
 
 	/**
-	* Constructor which sets up admin pages
-	*
-	* @param object $wpdb
-	* @param string $version
-	* @param array $login_credentials
-	* @param string $slug
-	* @param object $wordpress
-	* @param object $salesforce
-	* @param object $mappings
-	* @param object $push
-	* @param object $pull
-	* @param object $logging
-	* @param array $schedulable_classes
-	* @param object $queue
-	* @throws \Exception
-	*/
+	 * Constructor which sets up admin pages
+	 *
+	 * @param object $wpdb
+	 * @param string $version
+	 * @param array $login_credentials
+	 * @param string $slug
+	 * @param object $wordpress
+	 * @param object $salesforce
+	 * @param object $mappings
+	 * @param object $push
+	 * @param object $pull
+	 * @param object $logging
+	 * @param array $schedulable_classes
+	 * @param object $queue
+	 * @throws \Exception
+	 */
 	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes, $queue ) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
@@ -120,9 +120,9 @@ 
 	}
 
 	/**
-	* Create the action hooks to create the admin page(s)
-	*
-	*/
+	 * Create the action hooks to create the admin page(s)
+	 *
+	 */
 	public function add_actions() {
 		add_action( 'admin_init', array( $this, 'salesforce_settings_forms' ) );
 		add_action( 'admin_init', array( $this, 'notices' ) );
@@ -157,9 +157,9 @@ 
 	}
 
 	/**
-	* Recurring task to check Salesforce for data
-	*
-	*/
+	 * Recurring task to check Salesforce for data
+	 *
+	 */
 	public function change_action_schedule( $old_schedule, $new_schedule, $option_name ) {
 
 		// exit if nothing changed
@@ -195,21 +195,21 @@ 
 	}
 
 	/**
-	* Create WordPress admin options page
-	*
-	*/
+	 * Create WordPress admin options page
+	 *
+	 */
 	public function create_admin_menu() {
 		$title = __( 'Salesforce', 'object-sync-for-salesforce' );
 		add_options_page( $title, $title, 'configure_salesforce', 'object-sync-salesforce-admin', array( $this, 'show_admin_page' ) );
 	}
 
 	/**
-	* Render full admin pages in WordPress
-	* This allows other plugins to add tabs to the Salesforce settings screen
-	*
-	* todo: better front end: html, organization of html into templates, css, js
-	*
-	*/
+	 * Render full admin pages in WordPress
+	 * This allows other plugins to add tabs to the Salesforce settings screen
+	 *
+	 * todo: better front end: html, organization of html into templates, css, js
+	 *
+	 */
 	public function show_admin_page() {
 		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
 		echo '<div class="wrap">';
@@ -419,10 +419,10 @@ 
 	}
 
 	/**
-	* Create default WordPress admin settings form for salesforce
-	* This is for the Settings page/tab
-	*
-	*/
+	 * Create default WordPress admin settings form for salesforce
+	 * This is for the Settings page/tab
+	 *
+	 */
 	public function salesforce_settings_forms() {
 		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
 		$page     = isset( $get_data['tab'] ) ? sanitize_key( $get_data['tab'] ) : 'settings';
@@ -447,13 +447,13 @@ 
 	}
 
 	/**
-	* Fields for the Settings tab
-	* This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
-	*
-	* @param string $page
-	* @param string $section
-	* @param string $input_callback
-	*/
+	 * Fields for the Settings tab
+	 * This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
+	 *
+	 * @param string $page
+	 * @param string $section
+	 * @param string $input_callback
+	 */
 	private function fields_settings( $page, $section, $callbacks ) {
 		add_settings_section( $page, ucwords( $page ), null, $page );
 		$salesforce_settings = array(
@@ -687,25 +687,25 @@ 
 	}
 
 	/**
-	* Fields for the Fieldmaps tab
-	* This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
-	*
-	* @param string $page
-	* @param string $section
-	* @param string $input_callback
-	*/
+	 * Fields for the Fieldmaps tab
+	 * This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
+	 *
+	 * @param string $page
+	 * @param string $section
+	 * @param string $input_callback
+	 */
 	private function fields_fieldmaps( $page, $section, $input_callback = '' ) {
 		add_settings_section( $page, ucwords( $page ), null, $page );
 	}
 
 	/**
-	* Fields for the Scheduling tab
-	* This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
-	*
-	* @param string $page
-	* @param string $section
-	* @param string $input_callback
-	*/
+	 * Fields for the Scheduling tab
+	 * This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
+	 *
+	 * @param string $page
+	 * @param string $section
+	 * @param string $input_callback
+	 */
 	private function fields_scheduling( $page, $section, $callbacks ) {
 		foreach ( $this->schedulable_classes as $key => $value ) {
 			add_settings_section( $key, $value['label'], null, $page );
@@ -784,13 +784,13 @@ 
 	}
 
 	/**
-	* Fields for the Log Settings tab
-	* This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
-	*
-	* @param string $page
-	* @param string $section
-	* @param array $callbacks
-	*/
+	 * Fields for the Log Settings tab
+	 * This runs add_settings_section once, as well as add_settings_field and register_setting methods for each option
+	 *
+	 * @param string $page
+	 * @param string $section
+	 * @param array $callbacks
+	 */
 	private function fields_log_settings( $page, $section, $callbacks ) {
 		add_settings_section( $page, ucwords( str_replace( '_', ' ', $page ) ), null, $page );
 		$log_settings = array(
@@ -968,9 +968,9 @@ 
 	}
 
 	/**
-	* Create the notices, settings, and conditions by which admin notices should appear
-	*
-	*/
+	 * Create the notices, settings, and conditions by which admin notices should appear
+	 *
+	 */
 	public function notices() {
 
 		// before a notice is displayed, we should make sure we are on a page related to this plugin
@@ -1043,14 +1043,14 @@ 
 	}
 
 	/**
-	* Get all the Salesforce object settings for fieldmapping
-	* This takes either the $_POST array via ajax, or can be directly called with a $data array
-	*
-	* @param array $data
-	* data must contain a salesforce_object
-	* can optionally contain a type
-	* @return array $object_settings
-	*/
+	 * Get all the Salesforce object settings for fieldmapping
+	 * This takes either the $_POST array via ajax, or can be directly called with a $data array
+	 *
+	 * @param array $data
+	 * data must contain a salesforce_object
+	 * can optionally contain a type
+	 * @return array $object_settings
+	 */
 	public function get_salesforce_object_description( $data = array() ) {
 		$ajax = false;
 		if ( empty( $data ) ) {
@@ -1098,13 +1098,13 @@ 
 	}
 
 	/**
-	* Get Salesforce object fields for fieldmapping
-	*
-	* @param array $data
-	* data must contain a salesforce_object
-	* can optionally contain a type for the field
-	* @return array $object_fields
-	*/
+	 * Get Salesforce object fields for fieldmapping
+	 *
+	 * @param array $data
+	 * data must contain a salesforce_object
+	 * can optionally contain a type for the field
+	 * @return array $object_fields
+	 */
 	public function get_salesforce_object_fields( $data = array() ) {
 
 		if ( ! empty( $data['salesforce_object'] ) ) {
@@ -1132,12 +1132,12 @@ 
 	}
 
 	/**
-	* Get WordPress object fields for fieldmapping
-	* This takes either the $_POST array via ajax, or can be directly called with a $wordpress_object field
-	*
-	* @param string $wordpress_object
-	* @return array $object_fields
-	*/
+	 * Get WordPress object fields for fieldmapping
+	 * This takes either the $_POST array via ajax, or can be directly called with a $wordpress_object field
+	 *
+	 * @param string $wordpress_object
+	 * @return array $object_fields
+	 */
 	public function get_wordpress_object_fields( $wordpress_object = '' ) {
 		$ajax      = false;
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
@@ -1156,13 +1156,13 @@ 
 	}
 
 	/**
-	* Get WordPress and Salesforce object fields together for fieldmapping
-	* This takes either the $_POST array via ajax, or can be directly called with $wordpress_object and $salesforce_object fields
-	*
-	* @param string $wordpress_object
-	* @param string $salesforce_object
-	* @return array $object_fields
-	*/
+	 * Get WordPress and Salesforce object fields together for fieldmapping
+	 * This takes either the $_POST array via ajax, or can be directly called with $wordpress_object and $salesforce_object fields
+	 *
+	 * @param string $wordpress_object
+	 * @param string $salesforce_object
+	 * @return array $object_fields
+	 */
 	public function get_wp_sf_object_fields( $wordpress_object = '', $salesforce = '' ) {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( empty( $wordpress_object ) ) {
@@ -1187,12 +1187,12 @@ 
 	}
 
 	/**
-	* Manually push the WordPress object to Salesforce
-	* This takes either the $_POST array via ajax, or can be directly called with $wordpress_object and $wordpress_id fields
-	*
-	* @param string $wordpress_object
-	* @param int $wordpress_id
-	*/
+	 * Manually push the WordPress object to Salesforce
+	 * This takes either the $_POST array via ajax, or can be directly called with $wordpress_object and $wordpress_id fields
+	 *
+	 * @param string $wordpress_object
+	 * @param int $wordpress_id
+	 */
 	public function push_to_salesforce( $wordpress_object = '', $wordpress_id = '' ) {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( empty( $wordpress_object ) && empty( $wordpress_id ) ) {
@@ -1211,12 +1211,12 @@ 
 	}
 
 	/**
-	* Manually pull the Salesforce object into WordPress
-	* This takes either the $_POST array via ajax, or can be directly called with $salesforce_id fields
-	*
-	* @param string $salesforce_id
-	* @param string $wordpress_object
-	*/
+	 * Manually pull the Salesforce object into WordPress
+	 * This takes either the $_POST array via ajax, or can be directly called with $salesforce_id fields
+	 *
+	 * @param string $salesforce_id
+	 * @param string $wordpress_object
+	 */
 	public function pull_from_salesforce( $salesforce_id = '', $wordpress_object = '' ) {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( empty( $wordpress_object ) && empty( $salesforce_id ) ) {
@@ -1233,11 +1233,11 @@ 
 	}
 
 	/**
-	* Manually pull the Salesforce object into WordPress
-	* This takes an id for a mapping object row
-	*
-	* @param int $mapping_id
-	*/
+	 * Manually pull the Salesforce object into WordPress
+	 * This takes an id for a mapping object row
+	 *
+	 * @param int $mapping_id
+	 */
 	public function refresh_mapped_data( $mapping_id = '' ) {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( empty( $mapping_id ) ) {
@@ -1256,13 +1256,13 @@ 
 	}
 
 	/**
-	* Prepare fieldmap data and redirect after processing
-	* This runs when the create or update forms are submitted
-	* It is public because it depends on an admin hook
-	* It then calls the Object_Sync_Sf_Mapping class and sends prepared data over to it, then redirects to the correct page
-	* This method does include error handling, by loading the submission in a transient if there is an error, and then deleting it upon success
-	*
-	*/
+	 * Prepare fieldmap data and redirect after processing
+	 * This runs when the create or update forms are submitted
+	 * It is public because it depends on an admin hook
+	 * It then calls the Object_Sync_Sf_Mapping class and sends prepared data over to it, then redirects to the correct page
+	 * This method does include error handling, by loading the submission in a transient if there is an error, and then deleting it upon success
+	 *
+	 */
 	public function prepare_fieldmap_data() {
 		$error     = false;
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
@@ -1310,12 +1310,12 @@ 
 	}
 
 	/**
-	* Delete fieldmap data and redirect after processing
-	* This runs when the delete link is clicked, after the user confirms
-	* It is public because it depends on an admin hook
-	* It then calls the Object_Sync_Sf_Mapping class and the delete method
-	*
-	*/
+	 * Delete fieldmap data and redirect after processing
+	 * This runs when the delete link is clicked, after the user confirms
+	 * It is public because it depends on an admin hook
+	 * It then calls the Object_Sync_Sf_Mapping class and the delete method
+	 *
+	 */
 	public function delete_fieldmap() {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( $post_data['id'] ) {
@@ -1331,13 +1331,13 @@ 
 	}
 
 	/**
-	* Prepare object data and redirect after processing
-	* This runs when the update form is submitted
-	* It is public because it depends on an admin hook
-	* It then calls the Object_Sync_Sf_Mapping class and sends prepared data over to it, then redirects to the correct page
-	* This method does include error handling, by loading the submission in a transient if there is an error, and then deleting it upon success
-	*
-	*/
+	 * Prepare object data and redirect after processing
+	 * This runs when the update form is submitted
+	 * It is public because it depends on an admin hook
+	 * It then calls the Object_Sync_Sf_Mapping class and sends prepared data over to it, then redirects to the correct page
+	 * This method does include error handling, by loading the submission in a transient if there is an error, and then deleting it upon success
+	 *
+	 */
 	public function prepare_object_map_data() {
 		$error     = false;
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
@@ -1376,12 +1376,12 @@ 
 	}
 
 	/**
-	* Delete object map data and redirect after processing
-	* This runs when the delete link is clicked on an error row, after the user confirms
-	* It is public because it depends on an admin hook
-	* It then calls the Object_Sync_Sf_Mapping class and the delete method
-	*
-	*/
+	 * Delete object map data and redirect after processing
+	 * This runs when the delete link is clicked on an error row, after the user confirms
+	 * It is public because it depends on an admin hook
+	 * It then calls the Object_Sync_Sf_Mapping class and the delete method
+	 *
+	 */
 	public function delete_object_map() {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( $post_data['id'] ) {
@@ -1397,9 +1397,9 @@ 
 	}
 
 	/**
-	* Import a json file and use it for plugin data
-	*
-	*/
+	 * Import a json file and use it for plugin data
+	 *
+	 */
 	public function import_json_file() {
 
 		if ( ! wp_verify_nonce( $_POST['object_sync_for_salesforce_nonce_import'], 'object_sync_for_salesforce_nonce_import' ) ) {
@@ -1497,9 +1497,9 @@ 
 	}
 
 	/**
-	* Create a json file for exporting
-	*
-	*/
+	 * Create a json file for exporting
+	 *
+	 */
 	public function export_json_file() {
 
 		if ( ! wp_verify_nonce( $_POST['object_sync_for_salesforce_nonce_export'], 'object_sync_for_salesforce_nonce_export' ) ) {
@@ -1528,10 +1528,10 @@ 
 	}
 
 	/**
-	* Default display for <input> fields
-	*
-	* @param array $args
-	*/
+	 * Default display for <input> fields
+	 *
+	 * @param array $args
+	 */
 	public function display_input_field( $args ) {
 		$type    = $args['type'];
 		$id      = $args['label_for'];
@@ -1578,11 +1578,11 @@ 
 	}
 
 	/**
-	* Display for multiple checkboxes
-	* Above method can handle a single checkbox as it is
-	*
-	* @param array $args
-	*/
+	 * Display for multiple checkboxes
+	 * Above method can handle a single checkbox as it is
+	 *
+	 * @param array $args
+	 */
 	public function display_checkboxes( $args ) {
 		$type    = 'checkbox';
 		$name    = $args['name'];
@@ -1616,10 +1616,10 @@ 
 	}
 
 	/**
-	* Display for a dropdown
-	*
-	* @param array $args
-	*/
+	 * Display for a dropdown
+	 *
+	 * @param array $args
+	 */
 	public function display_select( $args ) {
 		$type = $args['type'];
 		$id   = $args['label_for'];
@@ -1663,10 +1663,10 @@ 
 	}
 
 	/**
-	* Dropdown formatted list of Salesforce API versions
-	*
-	* @return array $args
-	*/
+	 * Dropdown formatted list of Salesforce API versions
+	 *
+	 * @return array $args
+	 */
 	private function version_options() {
 		$versions = $this->salesforce['sfapi']->get_api_versions();
 		$args     = array();
@@ -1680,10 +1680,10 @@ 
 	}
 
 	/**
-	* Default display for <a href> links
-	*
-	* @param array $args
-	*/
+	 * Default display for <a href> links
+	 *
+	 * @param array $args
+	 */
 	public function display_link( $args ) {
 		$label = $args['label'];
 		$desc  = $args['desc'];
@@ -1710,11 +1710,11 @@ 
 	}
 
 	/**
-	* Allow for a standard sanitize/validate method. We could use more specific ones if need be, but this one provides a baseline.
-	*
-	* @param string $option
-	* @return string $option
-	*/
+	 * Allow for a standard sanitize/validate method. We could use more specific ones if need be, but this one provides a baseline.
+	 *
+	 * @param string $option
+	 * @return string $option
+	 */
 	public function sanitize_validate_text( $option ) {
 		if ( is_array( $option ) ) {
 			$options = array();
@@ -1728,10 +1728,10 @@ 
 	}
 
 	/**
-	* Run a demo of Salesforce API call on the authenticate tab after WordPress has authenticated with it
-	*
-	* @param object $sfapi
-	*/
+	 * Run a demo of Salesforce API call on the authenticate tab after WordPress has authenticated with it
+	 *
+	 * @param object $sfapi
+	 */
 	private function status( $sfapi ) {
 
 		$versions = $sfapi->get_api_versions();
@@ -1790,10 +1790,10 @@ 
 	}
 
 	/**
-	* Deauthorize WordPress from Salesforce.
-	* This deletes the tokens from the database; it does not currently do anything in Salesforce
-	* For this plugin at this time, that is the decision we are making: don't do any kind of authorization stuff inside Salesforce
-	*/
+	 * Deauthorize WordPress from Salesforce.
+	 * This deletes the tokens from the database; it does not currently do anything in Salesforce
+	 * For this plugin at this time, that is the decision we are making: don't do any kind of authorization stuff inside Salesforce
+	 */
 	private function logout() {
 		$this->access_token  = delete_option( $this->option_prefix . 'access_token' );
 		$this->instance_url  = delete_option( $this->option_prefix . 'instance_url' );
@@ -1805,8 +1805,8 @@ 
 	}
 
 	/**
-	* Ajax call to clear the plugin cache.
-	*/
+	 * Ajax call to clear the plugin cache.
+	 */
 	public function clear_sfwp_cache() {
 		$result   = $this->clear_cache( true );
 		$response = array(
@@ -1817,9 +1817,9 @@ 
 	}
 
 	/**
-	* Clear the plugin's cache.
-	* This uses the flush method contained in the WordPress cache to clear all of this plugin's cached data.
-	*/
+	 * Clear the plugin's cache.
+	 * This uses the flush method contained in the WordPress cache to clear all of this plugin's cached data.
+	 */
 	private function clear_cache( $ajax = false ) {
 		$result = (bool) $this->wordpress->sfwp_transients->flush();
 		if ( true === $result ) {
@@ -1839,9 +1839,9 @@ 
 	}
 
 	/**
-	* Check WordPress Admin permissions
-	* Check if the current user is allowed to access the Salesforce plugin options
-	*/
+	 * Check WordPress Admin permissions
+	 * Check if the current user is allowed to access the Salesforce plugin options
+	 */
 	private function check_wordpress_admin_permissions() {
 
 		// one programmatic way to give this capability to additional user roles is the
@@ -1861,10 +1861,10 @@ 
 	}
 
 	/**
-	* Show what we know about this user's relationship to a Salesforce object, if any
-	* @param object $user
-	*
-	*/
+	 * Show what we know about this user's relationship to a Salesforce object, if any
+	 * @param object $user
+	 *
+	 */
 	public function show_salesforce_user_fields( $user ) {
 		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
 		if ( true === $this->check_wordpress_admin_permissions() ) {
@@ -1888,10 +1888,10 @@ 
 	}
 
 	/**
-	* If the user profile has been mapped to Salesforce, do it
-	* @param int $user_id
-	*
-	*/
+	 * If the user profile has been mapped to Salesforce, do it
+	 * @param int $user_id
+	 *
+	 */
 	public function save_salesforce_user_fields( $user_id ) {
 		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
 		if ( isset( $post_data['salesforce_update_mapped_user'] ) && '1' === rawurlencode( $post_data['salesforce_update_mapped_user'] ) ) {
@@ -1916,10 +1916,10 @@ 
 	}
 
 	/**
-	* Render tabs for settings pages in admin
-	* @param array $tabs
-	* @param string $tab
-	*/
+	 * Render tabs for settings pages in admin
+	 * @param array $tabs
+	 * @param string $tab
+	 */
 	private function tabs( $tabs, $tab = '' ) {
 
 		$get_data        = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
@@ -1949,9 +1949,9 @@ 
 	}
 
 	/**
-	* Clear schedule
-	* This clears the schedule if the user clicks the button
-	*/
+	 * Clear schedule
+	 * This clears the schedule if the user clicks the button
+	 */
 	private function clear_schedule( $schedule_name = '' ) {
 		if ( '' !== $schedule_name ) {
 			$schedule = $this->schedule( $schedule_name );
@@ -1973,8 +1973,8 @@ 
 	}
 
 	/**
-	* Load the schedule class
-	*/
+	 * Load the schedule class
+	 */
 	private function schedule( $schedule_name ) {
 		if ( ! class_exists( 'Object_Sync_Sf_Schedule' ) && file_exists( plugin_dir_path( __FILE__ ) . '../vendor/autoload.php' ) ) {
 			require_once plugin_dir_path( __FILE__ ) . '../vendor/autoload.php';
@@ -1986,21 +1986,21 @@ 
 	}
 
 	/**
-	* Create an object map between a WordPress object and a Salesforce object
-	*
-	* @param int $wordpress_id
-	*   Unique identifier for the WordPress object
-	* @param string $wordpress_object
-	*   What kind of object is it?
-	* @param string $salesforce_id
-	*   Unique identifier for the Salesforce object
-	* @param string $action
-	*   Did we push or pull?
-	*
-	* @return int $wpdb->insert_id
-	*   This is the database row for the map object
-	*
-	*/
+	 * Create an object map between a WordPress object and a Salesforce object
+	 *
+	 * @param int $wordpress_id
+	 *   Unique identifier for the WordPress object
+	 * @param string $wordpress_object
+	 *   What kind of object is it?
+	 * @param string $salesforce_id
+	 *   Unique identifier for the Salesforce object
+	 * @param string $action
+	 *   Did we push or pull?
+	 *
+	 * @return int $wpdb->insert_id
+	 *   This is the database row for the map object
+	 *
+	 */
 	private function create_object_map( $wordpress_id, $wordpress_object, $salesforce_id, $action = '' ) {
 		// Create object map and save it
 		$mapping_object = $this->mappings->create_object_map(

Spacing +570 added lines, -570 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -84,7 +84,7 @@ 
 	* @param object $queue
 	* @throws \Exception
 	*/
-	public function __construct( $wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes, $queue ) {
+	public function __construct($wpdb, $version, $login_credentials, $slug, $wordpress, $salesforce, $mappings, $push, $pull, $logging, $schedulable_classes, $queue) {
 		$this->wpdb                = $wpdb;
 		$this->version             = $version;
 		$this->login_credentials   = $login_credentials;
@@ -124,35 +124,35 @@ 
 	*
 	*/
 	public function add_actions() {
-		add_action( 'admin_init', array( $this, 'salesforce_settings_forms' ) );
-		add_action( 'admin_init', array( $this, 'notices' ) );
-		add_action( 'admin_post_post_fieldmap', array( $this, 'prepare_fieldmap_data' ) );
-
-		add_action( 'admin_post_delete_fieldmap', array( $this, 'delete_fieldmap' ) );
-		add_action( 'wp_ajax_get_salesforce_object_description', array( $this, 'get_salesforce_object_description' ) );
-		add_action( 'wp_ajax_get_wordpress_object_description', array( $this, 'get_wordpress_object_fields' ) );
-		add_action( 'wp_ajax_get_wp_sf_object_fields', array( $this, 'get_wp_sf_object_fields' ) );
-		add_action( 'wp_ajax_push_to_salesforce', array( $this, 'push_to_salesforce' ) );
-		add_action( 'wp_ajax_pull_from_salesforce', array( $this, 'pull_from_salesforce' ) );
-		add_action( 'wp_ajax_refresh_mapped_data', array( $this, 'refresh_mapped_data' ) );
-		add_action( 'wp_ajax_clear_sfwp_cache', array( $this, 'clear_sfwp_cache' ) );
-
-		add_action( 'edit_user_profile', array( $this, 'show_salesforce_user_fields' ) );
-		add_action( 'personal_options_update', array( $this, 'save_salesforce_user_fields' ) );
-		add_action( 'edit_user_profile_update', array( $this, 'save_salesforce_user_fields' ) );
+		add_action('admin_init', array($this, 'salesforce_settings_forms'));
+		add_action('admin_init', array($this, 'notices'));
+		add_action('admin_post_post_fieldmap', array($this, 'prepare_fieldmap_data'));
+
+		add_action('admin_post_delete_fieldmap', array($this, 'delete_fieldmap'));
+		add_action('wp_ajax_get_salesforce_object_description', array($this, 'get_salesforce_object_description'));
+		add_action('wp_ajax_get_wordpress_object_description', array($this, 'get_wordpress_object_fields'));
+		add_action('wp_ajax_get_wp_sf_object_fields', array($this, 'get_wp_sf_object_fields'));
+		add_action('wp_ajax_push_to_salesforce', array($this, 'push_to_salesforce'));
+		add_action('wp_ajax_pull_from_salesforce', array($this, 'pull_from_salesforce'));
+		add_action('wp_ajax_refresh_mapped_data', array($this, 'refresh_mapped_data'));
+		add_action('wp_ajax_clear_sfwp_cache', array($this, 'clear_sfwp_cache'));
+
+		add_action('edit_user_profile', array($this, 'show_salesforce_user_fields'));
+		add_action('personal_options_update', array($this, 'save_salesforce_user_fields'));
+		add_action('edit_user_profile_update', array($this, 'save_salesforce_user_fields'));
 
 		// when either field for schedule settings changes
-		foreach ( $this->schedulable_classes as $key => $value ) {
-			add_filter( 'update_option_' . $this->option_prefix . $key . '_schedule_number', array( $this, 'change_action_schedule' ), 10, 3 );
-			add_filter( 'update_option_' . $this->option_prefix . $key . '_schedule_unit', array( $this, 'change_action_schedule' ), 10, 3 );
+		foreach ($this->schedulable_classes as $key => $value) {
+			add_filter('update_option_' . $this->option_prefix . $key . '_schedule_number', array($this, 'change_action_schedule'), 10, 3);
+			add_filter('update_option_' . $this->option_prefix . $key . '_schedule_unit', array($this, 'change_action_schedule'), 10, 3);
 		}
 
-		add_action( 'admin_post_delete_object_map', array( $this, 'delete_object_map' ) );
-		add_action( 'admin_post_post_object_map', array( $this, 'prepare_object_map_data' ) );
+		add_action('admin_post_delete_object_map', array($this, 'delete_object_map'));
+		add_action('admin_post_post_object_map', array($this, 'prepare_object_map_data'));
 
 		// import and export plugin data
-		add_action( 'admin_post_object_sync_for_salesforce_import', array( $this, 'import_json_file' ) );
-		add_action( 'admin_post_object_sync_for_salesforce_export', array( $this, 'export_json_file' ) );
+		add_action('admin_post_object_sync_for_salesforce_import', array($this, 'import_json_file'));
+		add_action('admin_post_object_sync_for_salesforce_export', array($this, 'export_json_file'));
 
 	}
 
@@ -160,35 +160,35 @@ 
 	* Recurring task to check Salesforce for data
 	*
 	*/
-	public function change_action_schedule( $old_schedule, $new_schedule, $option_name ) {
+	public function change_action_schedule($old_schedule, $new_schedule, $option_name) {
 
 		// exit if nothing changed
-		if ( $old_schedule === $new_schedule ) {
+		if ($old_schedule === $new_schedule) {
 			return;
 		}
 
 		// get the current schedule name from the task, based on pattern in the foreach
-		preg_match( '/' . $this->option_prefix . '(.*)_schedule/', $option_name, $matches );
+		preg_match('/' . $this->option_prefix . '(.*)_schedule/', $option_name, $matches);
 		$schedule_name     = $matches[1];
 		$action_group_name = $schedule_name . '_check_records';
 
 		// exit if there is no initializer property on this schedule
-		if ( ! isset( $this->schedulable_classes[ $schedule_name ]['initializer'] ) ) {
+		if ( ! isset($this->schedulable_classes[$schedule_name]['initializer'])) {
 			return;
 		}
 
 		// cancel previous task
 		$this->queue->cancel(
-			$this->schedulable_classes[ $schedule_name ]['initializer'],
+			$this->schedulable_classes[$schedule_name]['initializer'],
 			array(),
 			$action_group_name
 		);
 
 		// create new recurring task for action-scheduler to check for data to pull from salesforce
 		$this->queue->schedule_recurring(
-			current_time( 'timestamp', true ), // plugin seems to expect UTC
-			$this->queue->get_frequency( $schedule_name, 'seconds' ),
-			$this->schedulable_classes[ $schedule_name ]['initializer'],
+			current_time('timestamp', true), // plugin seems to expect UTC
+			$this->queue->get_frequency($schedule_name, 'seconds'),
+			$this->schedulable_classes[$schedule_name]['initializer'],
 			array(),
 			$action_group_name
 		);
@@ -199,8 +199,8 @@ 
 	*
 	*/
 	public function create_admin_menu() {
-		$title = __( 'Salesforce', 'object-sync-for-salesforce' );
-		add_options_page( $title, $title, 'configure_salesforce', 'object-sync-salesforce-admin', array( $this, 'show_admin_page' ) );
+		$title = __('Salesforce', 'object-sync-for-salesforce');
+		add_options_page($title, $title, 'configure_salesforce', 'object-sync-salesforce-admin', array($this, 'show_admin_page'));
 	}
 
 	/**
@@ -211,114 +211,114 @@ 
 	*
 	*/
 	public function show_admin_page() {
-		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
+		$get_data = filter_input_array(INPUT_GET, FILTER_SANITIZE_STRING);
 		echo '<div class="wrap">';
-		echo '<h1>' . esc_html( get_admin_page_title() ) . '</h1>';
+		echo '<h1>' . esc_html(get_admin_page_title()) . '</h1>';
 		$allowed = $this->check_wordpress_admin_permissions();
-		if ( false === $allowed ) {
+		if (false === $allowed) {
 			return;
 		}
 		$tabs = array(
-			'settings'      => __( 'Settings', 'object-sync-for-salesforce' ),
-			'authorize'     => __( 'Authorize', 'object-sync-for-salesforce' ),
-			'fieldmaps'     => __( 'Fieldmaps', 'object-sync-for-salesforce' ),
-			'schedule'      => __( 'Scheduling', 'object-sync-for-salesforce' ),
-			'import-export' => __( 'Import &amp; Export', 'object-sync-for-salesforce' ),
+			'settings'      => __('Settings', 'object-sync-for-salesforce'),
+			'authorize'     => __('Authorize', 'object-sync-for-salesforce'),
+			'fieldmaps'     => __('Fieldmaps', 'object-sync-for-salesforce'),
+			'schedule'      => __('Scheduling', 'object-sync-for-salesforce'),
+			'import-export' => __('Import &amp; Export', 'object-sync-for-salesforce'),
 		); // this creates the tabs for the admin
 
 		// optionally make tab(s) for logging and log settings
-		$logging_enabled      = get_option( $this->option_prefix . 'enable_logging', false );
-		$tabs['log_settings'] = __( 'Log Settings', 'object-sync-for-salesforce' );
+		$logging_enabled      = get_option($this->option_prefix . 'enable_logging', false);
+		$tabs['log_settings'] = __('Log Settings', 'object-sync-for-salesforce');
 
 		$mapping_errors = $this->mappings->get_failed_object_maps();
-		if ( ! empty( $mapping_errors ) ) {
-			$tabs['mapping_errors'] = __( 'Mapping Errors', 'object-sync-for-salesforce' );
+		if ( ! empty($mapping_errors)) {
+			$tabs['mapping_errors'] = __('Mapping Errors', 'object-sync-for-salesforce');
 		}
 
 		// filter for extending the tabs available on the page
 		// currently it will go into the default switch case for $tab
-		$tabs = apply_filters( 'object_sync_for_salesforce_settings_tabs', $tabs );
+		$tabs = apply_filters('object_sync_for_salesforce_settings_tabs', $tabs);
 
-		$tab = isset( $get_data['tab'] ) ? sanitize_key( $get_data['tab'] ) : 'settings';
-		$this->tabs( $tabs, $tab );
+		$tab = isset($get_data['tab']) ? sanitize_key($get_data['tab']) : 'settings';
+		$this->tabs($tabs, $tab);
 
 		$consumer_key    = $this->login_credentials['consumer_key'];
 		$consumer_secret = $this->login_credentials['consumer_secret'];
 		$callback_url    = $this->login_credentials['callback_url'];
 
-		if ( true !== $this->salesforce['is_authorized'] ) {
-			$url     = esc_url( $callback_url );
-			$anchor  = esc_html__( 'Authorize tab', 'object-sync-for-salesforce' );
-			$message = sprintf( 'Salesforce needs to be authorized to connect to this website. Use the <a href="%s">%s</a> to connect.', $url, $anchor );
-			require( plugin_dir_path( __FILE__ ) . '/../templates/admin/error.php' );
+		if (true !== $this->salesforce['is_authorized']) {
+			$url     = esc_url($callback_url);
+			$anchor  = esc_html__('Authorize tab', 'object-sync-for-salesforce');
+			$message = sprintf('Salesforce needs to be authorized to connect to this website. Use the <a href="%s">%s</a> to connect.', $url, $anchor);
+			require(plugin_dir_path(__FILE__) . '/../templates/admin/error.php');
 		}
 
-		if ( 0 === count( $this->mappings->get_fieldmaps() ) ) {
-			$url     = esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps' ) );
-			$anchor  = esc_html__( 'Fieldmaps tab', 'object-sync-for-salesforce' );
-			$message = sprintf( 'No fieldmaps exist yet. Use the <a href="%s">%s</a> to map WordPress and Salesforce objects to each other.', $url, $anchor );
-			require( plugin_dir_path( __FILE__ ) . '/../templates/admin/error.php' );
+		if (0 === count($this->mappings->get_fieldmaps())) {
+			$url     = esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps'));
+			$anchor  = esc_html__('Fieldmaps tab', 'object-sync-for-salesforce');
+			$message = sprintf('No fieldmaps exist yet. Use the <a href="%s">%s</a> to map WordPress and Salesforce objects to each other.', $url, $anchor);
+			require(plugin_dir_path(__FILE__) . '/../templates/admin/error.php');
 		}
 
-		$push_schedule_number = get_option( $this->option_prefix . 'salesforce_push_schedule_number', '' );
-		$push_schedule_unit   = get_option( $this->option_prefix . 'salesforce_push_schedule_unit', '' );
-		$pull_schedule_number = get_option( $this->option_prefix . 'salesforce_pull_schedule_number', '' );
-		$pull_schedule_unit   = get_option( $this->option_prefix . 'salesforce_pull_schedule_unit', '' );
+		$push_schedule_number = get_option($this->option_prefix . 'salesforce_push_schedule_number', '');
+		$push_schedule_unit   = get_option($this->option_prefix . 'salesforce_push_schedule_unit', '');
+		$pull_schedule_number = get_option($this->option_prefix . 'salesforce_pull_schedule_number', '');
+		$pull_schedule_unit   = get_option($this->option_prefix . 'salesforce_pull_schedule_unit', '');
 
-		if ( '' === $push_schedule_number && '' === $push_schedule_unit && '' === $pull_schedule_number && '' === $pull_schedule_unit ) {
-			$url     = esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=schedule' ) );
-			$anchor  = esc_html__( 'Scheduling tab', 'object-sync-for-salesforce' );
-			$message = sprintf( 'Because the plugin schedule has not been saved, the plugin cannot run automatic operations. Use the <a href="%s">%s</a> to create schedules to run.', $url, $anchor );
-			require( plugin_dir_path( __FILE__ ) . '/../templates/admin/error.php' );
+		if ('' === $push_schedule_number && '' === $push_schedule_unit && '' === $pull_schedule_number && '' === $pull_schedule_unit) {
+			$url     = esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=schedule'));
+			$anchor  = esc_html__('Scheduling tab', 'object-sync-for-salesforce');
+			$message = sprintf('Because the plugin schedule has not been saved, the plugin cannot run automatic operations. Use the <a href="%s">%s</a> to create schedules to run.', $url, $anchor);
+			require(plugin_dir_path(__FILE__) . '/../templates/admin/error.php');
 		}
 
 		try {
-			switch ( $tab ) {
+			switch ($tab) {
 				case 'authorize':
-					if ( isset( $get_data['code'] ) ) {
+					if (isset($get_data['code'])) {
 						// this string is an oauth token
-						$data          = esc_html( wp_unslash( $get_data['code'] ) );
-						$is_authorized = $this->salesforce['sfapi']->request_token( $data );
+						$data          = esc_html(wp_unslash($get_data['code']));
+						$is_authorized = $this->salesforce['sfapi']->request_token($data);
 						?>
-						<script>window.location = '<?php echo esc_url_raw( $callback_url ); ?>'</script>
+						<script>window.location = '<?php echo esc_url_raw($callback_url); ?>'</script>
 						<?php
-					} elseif ( true === $this->salesforce['is_authorized'] ) {
-							require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/authorized.php' );
-							$this->status( $this->salesforce['sfapi'] );
-					} elseif ( true === is_object( $this->salesforce['sfapi'] ) && isset( $consumer_key ) && isset( $consumer_secret ) ) {
+					} elseif (true === $this->salesforce['is_authorized']) {
+							require_once(plugin_dir_path(__FILE__) . '/../templates/admin/authorized.php');
+							$this->status($this->salesforce['sfapi']);
+					} elseif (true === is_object($this->salesforce['sfapi']) && isset($consumer_key) && isset($consumer_secret)) {
 						?>
-						<p><a class="button button-primary" href="<?php echo esc_url( $this->salesforce['sfapi']->get_authorization_code() ); ?>"><?php echo esc_html__( 'Connect to Salesforce', 'object-sync-for-salesforce' ); ?></a></p>
+						<p><a class="button button-primary" href="<?php echo esc_url($this->salesforce['sfapi']->get_authorization_code()); ?>"><?php echo esc_html__('Connect to Salesforce', 'object-sync-for-salesforce'); ?></a></p>
 						<?php
 					} else {
-						$url    = esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=settings' ) );
-						$anchor = esc_html__( 'Settings', 'object-sync-for-salesforce' );
+						$url    = esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=settings'));
+						$anchor = esc_html__('Settings', 'object-sync-for-salesforce');
 						// translators: placeholders are for the settings tab link: 1) the url, and 2) the anchor text
-						$message = sprintf( esc_html__( 'Salesforce needs to be authorized to connect to this website but the credentials are missing. Use the <a href="%1$s">%2$s</a> tab to add them.', 'object-sync-salesforce' ), $url, $anchor );
-						require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/error.php' );
+						$message = sprintf(esc_html__('Salesforce needs to be authorized to connect to this website but the credentials are missing. Use the <a href="%1$s">%2$s</a> tab to add them.', 'object-sync-salesforce'), $url, $anchor);
+						require_once(plugin_dir_path(__FILE__) . '/../templates/admin/error.php');
 					}
 					break;
 				case 'fieldmaps':
-					if ( isset( $get_data['method'] ) ) {
+					if (isset($get_data['method'])) {
 
-						$method      = sanitize_key( $get_data['method'] );
-						$error_url   = get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=' . $method );
-						$success_url = get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps' );
+						$method      = sanitize_key($get_data['method']);
+						$error_url   = get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps&method=' . $method);
+						$success_url = get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=fieldmaps');
 
-						if ( isset( $get_data['transient'] ) ) {
-							$transient = sanitize_key( $get_data['transient'] );
-							$posted    = $this->sfwp_transients->get( $transient );
+						if (isset($get_data['transient'])) {
+							$transient = sanitize_key($get_data['transient']);
+							$posted    = $this->sfwp_transients->get($transient);
 						}
 
-						if ( isset( $posted ) && is_array( $posted ) ) {
+						if (isset($posted) && is_array($posted)) {
 							$map = $posted;
-						} elseif ( 'edit' === $method || 'clone' === $method || 'delete' === $method ) {
-							$map = $this->mappings->get_fieldmaps( isset( $get_data['id'] ) ? sanitize_key( $get_data['id'] ) : '' );
+						} elseif ('edit' === $method || 'clone' === $method || 'delete' === $method) {
+							$map = $this->mappings->get_fieldmaps(isset($get_data['id']) ? sanitize_key($get_data['id']) : '');
 						}
 
-						if ( isset( $map ) && is_array( $map ) ) {
+						if (isset($map) && is_array($map)) {
 							$label                           = $map['label'];
 							$salesforce_object               = $map['salesforce_object'];
-							$salesforce_record_types_allowed = maybe_unserialize( $map['salesforce_record_types_allowed'] );
+							$salesforce_record_types_allowed = maybe_unserialize($map['salesforce_record_types_allowed']);
 							$salesforce_record_type_default  = $map['salesforce_record_type_default'];
 							$wordpress_object                = $map['wordpress_object'];
 							$pull_trigger_field              = $map['pull_trigger_field'];
@@ -329,14 +329,14 @@ 
 							$weight                          = $map['weight'];
 						}
 
-						if ( 'add' === $method || 'edit' === $method || 'clone' === $method ) {
-							require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/fieldmaps-add-edit-clone.php' );
-						} elseif ( 'delete' === $method ) {
-							require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/fieldmaps-delete.php' );
+						if ('add' === $method || 'edit' === $method || 'clone' === $method) {
+							require_once(plugin_dir_path(__FILE__) . '/../templates/admin/fieldmaps-add-edit-clone.php');
+						} elseif ('delete' === $method) {
+							require_once(plugin_dir_path(__FILE__) . '/../templates/admin/fieldmaps-delete.php');
 						}
 					} else {
 						$fieldmaps = $this->mappings->get_fieldmaps();
-						require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/fieldmaps-list.php' );
+						require_once(plugin_dir_path(__FILE__) . '/../templates/admin/fieldmaps-list.php');
 					} // End if().
 					break;
 				case 'logout':
@@ -346,73 +346,73 @@ 
 					$this->clear_cache();
 					break;
 				case 'clear_schedule':
-					if ( isset( $get_data['schedule_name'] ) ) {
-						$schedule_name = sanitize_key( $get_data['schedule_name'] );
+					if (isset($get_data['schedule_name'])) {
+						$schedule_name = sanitize_key($get_data['schedule_name']);
 					}
-					$this->clear_schedule( $schedule_name );
+					$this->clear_schedule($schedule_name);
 					break;
 				case 'settings':
-					require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/settings.php' );
+					require_once(plugin_dir_path(__FILE__) . '/../templates/admin/settings.php');
 					break;
 				case 'mapping_errors':
-					if ( isset( $get_data['method'] ) ) {
+					if (isset($get_data['method'])) {
 
-						$method      = sanitize_key( $get_data['method'] );
-						$error_url   = get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors&method=' . $method );
-						$success_url = get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors' );
+						$method      = sanitize_key($get_data['method']);
+						$error_url   = get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors&method=' . $method);
+						$success_url = get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=mapping_errors');
 
-						if ( isset( $get_data['map_transient'] ) ) {
-							$transient = sanitize_key( $get_data['map_transient'] );
-							$posted    = $this->sfwp_transients->get( $transient );
+						if (isset($get_data['map_transient'])) {
+							$transient = sanitize_key($get_data['map_transient']);
+							$posted    = $this->sfwp_transients->get($transient);
 						}
 
-						if ( isset( $posted ) && is_array( $posted ) ) {
+						if (isset($posted) && is_array($posted)) {
 							$map_row = $posted;
-						} elseif ( 'edit' === $method || 'delete' === $method ) {
-							$map_row = $this->mappings->get_failed_object_map( isset( $get_data['id'] ) ? sanitize_key( $get_data['id'] ) : '' );
+						} elseif ('edit' === $method || 'delete' === $method) {
+							$map_row = $this->mappings->get_failed_object_map(isset($get_data['id']) ? sanitize_key($get_data['id']) : '');
 						}
 
-						if ( isset( $map_row ) && is_array( $map_row ) ) {
+						if (isset($map_row) && is_array($map_row)) {
 							$salesforce_id = $map_row['salesforce_id'];
 							$wordpress_id  = $map_row['wordpress_id'];
 						}
 
-						if ( 'edit' === $method ) {
-							require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/mapping-errors-edit.php' );
-						} elseif ( 'delete' === $method ) {
-							require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/mapping-errors-delete.php' );
+						if ('edit' === $method) {
+							require_once(plugin_dir_path(__FILE__) . '/../templates/admin/mapping-errors-edit.php');
+						} elseif ('delete' === $method) {
+							require_once(plugin_dir_path(__FILE__) . '/../templates/admin/mapping-errors-delete.php');
 						}
 					} else {
-						require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/mapping-errors.php' );
+						require_once(plugin_dir_path(__FILE__) . '/../templates/admin/mapping-errors.php');
 					}
 					break;
 				case 'import-export':
-					require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/import-export.php' );
+					require_once(plugin_dir_path(__FILE__) . '/../templates/admin/import-export.php');
 					break;
 				default:
-					$include_settings = apply_filters( 'object_sync_for_salesforce_settings_tab_include_settings', true, $tab );
-					$content_before   = apply_filters( 'object_sync_for_salesforce_settings_tab_content_before', null, $tab );
-					$content_after    = apply_filters( 'object_sync_for_salesforce_settings_tab_content_after', null, $tab );
-					if ( null !== $content_before ) {
-						echo esc_html( $content_before );
+					$include_settings = apply_filters('object_sync_for_salesforce_settings_tab_include_settings', true, $tab);
+					$content_before   = apply_filters('object_sync_for_salesforce_settings_tab_content_before', null, $tab);
+					$content_after    = apply_filters('object_sync_for_salesforce_settings_tab_content_after', null, $tab);
+					if (null !== $content_before) {
+						echo esc_html($content_before);
 					}
-					if ( true === $include_settings ) {
-						require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/settings.php' );
+					if (true === $include_settings) {
+						require_once(plugin_dir_path(__FILE__) . '/../templates/admin/settings.php');
 					}
-					if ( null !== $content_after ) {
-						echo esc_html( $content_after );
+					if (null !== $content_after) {
+						echo esc_html($content_after);
 					}
 					break;
 			} // End switch().
-		} catch ( SalesforceApiException $ex ) {
-			echo sprintf( '<p>Error <strong>%1$s</strong>: %2$s</p>',
-				absint( $ex->getCode() ),
-				esc_html( $ex->getMessage() )
+		} catch (SalesforceApiException $ex) {
+			echo sprintf('<p>Error <strong>%1$s</strong>: %2$s</p>',
+				absint($ex->getCode()),
+				esc_html($ex->getMessage())
 			);
-		} catch ( Exception $ex ) {
-			echo sprintf( '<p>Error <strong>%1$s</strong>: %2$s</p>',
-				absint( $ex->getCode() ),
-				esc_html( $ex->getMessage() )
+		} catch (Exception $ex) {
+			echo sprintf('<p>Error <strong>%1$s</strong>: %2$s</p>',
+				absint($ex->getCode()),
+				esc_html($ex->getMessage())
 			);
 		} // End try().
 		echo '</div>';
@@ -424,14 +424,14 @@ 
 	*
 	*/
 	public function salesforce_settings_forms() {
-		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
-		$page     = isset( $get_data['tab'] ) ? sanitize_key( $get_data['tab'] ) : 'settings';
-		$section  = isset( $get_data['tab'] ) ? sanitize_key( $get_data['tab'] ) : 'settings';
+		$get_data = filter_input_array(INPUT_GET, FILTER_SANITIZE_STRING);
+		$page     = isset($get_data['tab']) ? sanitize_key($get_data['tab']) : 'settings';
+		$section  = isset($get_data['tab']) ? sanitize_key($get_data['tab']) : 'settings';
 
-		$input_callback_default   = array( $this, 'display_input_field' );
-		$input_checkboxes_default = array( $this, 'display_checkboxes' );
-		$input_select_default     = array( $this, 'display_select' );
-		$link_default             = array( $this, 'display_link' );
+		$input_callback_default   = array($this, 'display_input_field');
+		$input_checkboxes_default = array($this, 'display_checkboxes');
+		$input_select_default     = array($this, 'display_select');
+		$link_default             = array($this, 'display_link');
 
 		$all_field_callbacks = array(
 			'text'       => $input_callback_default,
@@ -440,10 +440,10 @@ 
 			'link'       => $link_default,
 		);
 
-		$this->fields_settings( 'settings', 'settings', $all_field_callbacks );
-		$this->fields_fieldmaps( 'fieldmaps', 'objects' );
-		$this->fields_scheduling( 'schedule', 'schedule', $all_field_callbacks );
-		$this->fields_log_settings( 'log_settings', 'log_settings', $all_field_callbacks );
+		$this->fields_settings('settings', 'settings', $all_field_callbacks);
+		$this->fields_fieldmaps('fieldmaps', 'objects');
+		$this->fields_scheduling('schedule', 'schedule', $all_field_callbacks);
+		$this->fields_log_settings('log_settings', 'log_settings', $all_field_callbacks);
 	}
 
 	/**
@@ -454,11 +454,11 @@ 
 	* @param string $section
 	* @param string $input_callback
 	*/
-	private function fields_settings( $page, $section, $callbacks ) {
-		add_settings_section( $page, ucwords( $page ), null, $page );
+	private function fields_settings($page, $section, $callbacks) {
+		add_settings_section($page, ucwords($page), null, $page);
 		$salesforce_settings = array(
 			'consumer_key'                   => array(
-				'title'    => __( 'Consumer Key', 'object-sync-for-salesforce' ),
+				'title'    => __('Consumer Key', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -471,7 +471,7 @@ 
 
 			),
 			'consumer_secret'                => array(
-				'title'    => __( 'Consumer Secret', 'object-sync-for-salesforce' ),
+				'title'    => __('Consumer Secret', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -483,7 +483,7 @@ 
 				),
 			),
 			'callback_url'                   => array(
-				'title'    => __( 'Callback URL', 'object-sync-for-salesforce' ),
+				'title'    => __('Callback URL', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -491,14 +491,14 @@ 
 					'type'     => 'url',
 					'validate' => 'sanitize_validate_text',
 					// translators: %1$s is the admin URL for the Authorize tab
-					'desc'     => sprintf( __( 'In most cases, you will want to use %1$s for this value.', 'object-sync-for-salesforce' ),
-						get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=authorize' )
+					'desc'     => sprintf(__('In most cases, you will want to use %1$s for this value.', 'object-sync-for-salesforce'),
+						get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=authorize')
 					),
 					'constant' => 'OBJECT_SYNC_SF_SALESFORCE_CALLBACK_URL',
 				),
 			),
 			'login_base_url'                 => array(
-				'title'    => __( 'Login Base URL', 'object-sync-for-salesforce' ),
+				'title'    => __('Login Base URL', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -506,22 +506,22 @@ 
 					'type'     => 'url',
 					'validate' => 'sanitize_validate_text',
 					// translators: 1) production salesforce login, 2) sandbox salesforce login
-					'desc'     => sprintf( __( 'For most Salesforce setups, you should use %1$s for production and %2$s for sandbox.', 'object-sync-for-salesforce' ),
-						esc_url( 'https://login.salesforce.com' ),
-						esc_url( 'https://test.salesforce.com' )
+					'desc'     => sprintf(__('For most Salesforce setups, you should use %1$s for production and %2$s for sandbox.', 'object-sync-for-salesforce'),
+						esc_url('https://login.salesforce.com'),
+						esc_url('https://test.salesforce.com')
 					),
 					'constant' => 'OBJECT_SYNC_SF_SALESFORCE_LOGIN_BASE_URL',
 				),
 			),
 			'authorize_url_path'             => array(
-				'title'    => __( 'Authorize URL Path', 'object-sync-for-salesforce' ),
+				'title'    => __('Authorize URL Path', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
 				'args'     => array(
 					'type'     => 'text',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'For most Salesforce installs, this should not be changed.', 'object-sync-for-salesforce' ),
+					'desc'     => __('For most Salesforce installs, this should not be changed.', 'object-sync-for-salesforce'),
 					'constant' => 'OBJECT_SYNC_SF_SALESFORCE_AUTHORIZE_URL_PATH',
 					'default'  => $this->default_authorize_url_path,
 				),
@@ -534,7 +534,7 @@ 
 				'args'     => array(
 					'type'     => 'text',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'For most Salesforce installs, this should not be changed.', 'object-sync-for-salesforce' ),
+					'desc'     => __('For most Salesforce installs, this should not be changed.', 'object-sync-for-salesforce'),
 					'constant' => 'OBJECT_SYNC_SF_SALESFORCE_TOKEN_URL_PATH',
 					'default'  => $this->default_token_url_path,
 				),
@@ -560,7 +560,7 @@ 
 				'args'     => array(
 					'type'     => 'checkboxes',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'Allows you to limit which Salesforce objects can be mapped', 'object-sync-for-salesforce' ),
+					'desc'     => __('Allows you to limit which Salesforce objects can be mapped', 'object-sync-for-salesforce'),
 					'items'    => array(
 						'triggerable' => array(
 							'text'    => 'Only Triggerable objects',
@@ -589,7 +589,7 @@ 
 					'constant' => '',
 					'items'    => array(
 						'field_label' => array(
-							'text'  => __( 'Field Label', 'object-sync-for-salesforce' ),
+							'text'  => __('Field Label', 'object-sync-for-salesforce'),
 							'value' => 'field_label',
 						),
 						/*'field_name'  => array(
@@ -597,7 +597,7 @@ 
 							'value' => 'field_name',
 						),*/
 						'api_name'    => array(
-							'text'  => __( 'API Name', 'object-sync-for-salesforce' ),
+							'text'  => __('API Name', 'object-sync-for-salesforce'),
 							'value' => 'api_name',
 						),
 					),
@@ -611,7 +611,7 @@ 
 				'args'     => array(
 					'type'     => 'number',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'Number of seconds to wait between repeated salesforce pulls. Prevents the webserver from becoming overloaded in case of too many cron runs, or webhook usage.', 'object-sync-for-salesforce' ),
+					'desc'     => __('Number of seconds to wait between repeated salesforce pulls. Prevents the webserver from becoming overloaded in case of too many cron runs, or webhook usage.', 'object-sync-for-salesforce'),
 					'constant' => '',
 					'default'  => $this->default_pull_throttle,
 				),
@@ -624,7 +624,7 @@ 
 				'args'     => array(
 					'type'     => 'checkbox',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'Debug mode can, combined with the Log Settings, log things like Salesforce API requests. It can create a lot of entries if enabled; it is not recommended to use it in a production environment.', 'object-sync-for-salesforce' ),
+					'desc'     => __('Debug mode can, combined with the Log Settings, log things like Salesforce API requests. It can create a lot of entries if enabled; it is not recommended to use it in a production environment.', 'object-sync-for-salesforce'),
 					'constant' => '',
 				),
 			),
@@ -636,13 +636,13 @@ 
 				'args'     => array(
 					'type'     => 'checkbox',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'If checked, the plugin will delete the tables and other data it creates when you uninstall it. Unchecking this field can be useful if you need to reactivate the plugin for any reason without losing data.', 'object-sync-for-salesforce' ),
+					'desc'     => __('If checked, the plugin will delete the tables and other data it creates when you uninstall it. Unchecking this field can be useful if you need to reactivate the plugin for any reason without losing data.', 'object-sync-for-salesforce'),
 					'constant' => '',
 				),
 			),
 		);
 
-		if ( true === is_object( $this->salesforce['sfapi'] ) && true === $this->salesforce['sfapi']->is_authorized() ) {
+		if (true === is_object($this->salesforce['sfapi']) && true === $this->salesforce['sfapi']->is_authorized()) {
 			$salesforce_settings['api_version'] = array(
 				'title'    => 'Salesforce API Version',
 				'callback' => $callbacks['select'],
@@ -658,7 +658,7 @@ 
 			);
 		}
 
-		foreach ( $salesforce_settings as $key => $attributes ) {
+		foreach ($salesforce_settings as $key => $attributes) {
 			$id       = $this->option_prefix . $key;
 			$name     = $this->option_prefix . $key;
 			$title    = $attributes['title'];
@@ -677,12 +677,12 @@ 
 			);
 
 			// if there is a constant and it is defined, don't run a validate function
-			if ( isset( $attributes['args']['constant'] ) && defined( $attributes['args']['constant'] ) ) {
+			if (isset($attributes['args']['constant']) && defined($attributes['args']['constant'])) {
 				$validate = '';
 			}
 
-			add_settings_field( $id, $title, $callback, $page, $section, $args );
-			register_setting( $page, $id, array( $this, $validate ) );
+			add_settings_field($id, $title, $callback, $page, $section, $args);
+			register_setting($page, $id, array($this, $validate));
 		}
 	}
 
@@ -694,8 +694,8 @@ 
 	* @param string $section
 	* @param string $input_callback
 	*/
-	private function fields_fieldmaps( $page, $section, $input_callback = '' ) {
-		add_settings_section( $page, ucwords( $page ), null, $page );
+	private function fields_fieldmaps($page, $section, $input_callback = '') {
+		add_settings_section($page, ucwords($page), null, $page);
 	}
 
 	/**
@@ -706,12 +706,12 @@ 
 	* @param string $section
 	* @param string $input_callback
 	*/
-	private function fields_scheduling( $page, $section, $callbacks ) {
-		foreach ( $this->schedulable_classes as $key => $value ) {
-			add_settings_section( $key, $value['label'], null, $page );
+	private function fields_scheduling($page, $section, $callbacks) {
+		foreach ($this->schedulable_classes as $key => $value) {
+			add_settings_section($key, $value['label'], null, $page);
 			$schedule_settings = array(
 				$key . '_schedule_number' => array(
-					'title'    => __( 'Run schedule every', 'object-sync-for-salesforce' ),
+					'title'    => __('Run schedule every', 'object-sync-for-salesforce'),
 					'callback' => $callbacks['text'],
 					'page'     => $page,
 					'section'  => $key,
@@ -723,7 +723,7 @@ 
 					),
 				),
 				$key . '_schedule_unit'   => array(
-					'title'    => __( 'Time unit', 'object-sync-for-salesforce' ),
+					'title'    => __('Time unit', 'object-sync-for-salesforce'),
 					'callback' => $callbacks['select'],
 					'page'     => $page,
 					'section'  => $key,
@@ -733,15 +733,15 @@ 
 						'desc'     => '',
 						'items'    => array(
 							'minutes' => array(
-								'text'  => __( 'Minutes', 'object-sync-for-salesforce' ),
+								'text'  => __('Minutes', 'object-sync-for-salesforce'),
 								'value' => 'minutes',
 							),
 							'hours'   => array(
-								'text'  => __( 'Hours', 'object-sync-for-salesforce' ),
+								'text'  => __('Hours', 'object-sync-for-salesforce'),
 								'value' => 'hours',
 							),
 							'days'    => array(
-								'text'  => __( 'Days', 'object-sync-for-salesforce' ),
+								'text'  => __('Days', 'object-sync-for-salesforce'),
 								'value' => 'days',
 							),
 						),
@@ -749,19 +749,19 @@ 
 				),
 				$key . '_clear_button'    => array(
 					// translators: $this->get_schedule_count is an integer showing how many items are in the current queue
-					'title'    => sprintf( 'This queue has ' . _n( '%s item', '%s items', $this->get_schedule_count( $key ), 'object-sync-for-salesforce' ), $this->get_schedule_count( $key ) ),
+					'title'    => sprintf('This queue has ' . _n('%s item', '%s items', $this->get_schedule_count($key), 'object-sync-for-salesforce'), $this->get_schedule_count($key)),
 					'callback' => $callbacks['link'],
 					'page'     => $page,
 					'section'  => $key,
 					'args'     => array(
-						'label'      => __( 'Clear this queue', 'object-sync-for-salesforce' ),
+						'label'      => __('Clear this queue', 'object-sync-for-salesforce'),
 						'desc'       => '',
-						'url'        => esc_url( '?page=object-sync-salesforce-admin&amp;tab=clear_schedule&amp;schedule_name=' . $key ),
+						'url'        => esc_url('?page=object-sync-salesforce-admin&amp;tab=clear_schedule&amp;schedule_name=' . $key),
 						'link_class' => 'button button-secondary',
 					),
 				),
 			);
-			foreach ( $schedule_settings as $key => $attributes ) {
+			foreach ($schedule_settings as $key => $attributes) {
 				$id       = $this->option_prefix . $key;
 				$name     = $this->option_prefix . $key;
 				$title    = $attributes['title'];
@@ -777,8 +777,8 @@ 
 						'name'      => $name,
 					)
 				);
-				add_settings_field( $id, $title, $callback, $page, $section, $args );
-				register_setting( $page, $id );
+				add_settings_field($id, $title, $callback, $page, $section, $args);
+				register_setting($page, $id);
 			}
 		} // End foreach().
 	}
@@ -791,11 +791,11 @@ 
 	* @param string $section
 	* @param array $callbacks
 	*/
-	private function fields_log_settings( $page, $section, $callbacks ) {
-		add_settings_section( $page, ucwords( str_replace( '_', ' ', $page ) ), null, $page );
+	private function fields_log_settings($page, $section, $callbacks) {
+		add_settings_section($page, ucwords(str_replace('_', ' ', $page)), null, $page);
 		$log_settings = array(
 			'enable_logging'        => array(
-				'title'    => __( 'Enable Logging?', 'object-sync-for-salesforce' ),
+				'title'    => __('Enable Logging?', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -807,32 +807,32 @@ 
 				),
 			),
 			'statuses_to_log'       => array(
-				'title'    => __( 'Statuses to log', 'object-sync-for-salesforce' ),
+				'title'    => __('Statuses to log', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['checkboxes'],
 				'page'     => $page,
 				'section'  => $section,
 				'args'     => array(
 					'type'     => 'checkboxes',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'these are the statuses to log', 'object-sync-for-salesforce' ),
+					'desc'     => __('these are the statuses to log', 'object-sync-for-salesforce'),
 					'items'    => array(
 						'error'   => array(
-							'text' => __( 'Error', 'object-sync-for-salesforce' ),
+							'text' => __('Error', 'object-sync-for-salesforce'),
 							'id'   => 'error',
 							'desc' => '',
 						),
 						'success' => array(
-							'text' => __( 'Success', 'object-sync-for-salesforce' ),
+							'text' => __('Success', 'object-sync-for-salesforce'),
 							'id'   => 'success',
 							'desc' => '',
 						),
 						'notice'  => array(
-							'text' => __( 'Notice', 'object-sync-for-salesforce' ),
+							'text' => __('Notice', 'object-sync-for-salesforce'),
 							'id'   => 'notice',
 							'desc' => '',
 						),
 						'debug'   => array(
-							'text' => __( 'Debug', 'object-sync-for-salesforce' ),
+							'text' => __('Debug', 'object-sync-for-salesforce'),
 							'id'   => 'debug',
 							'desc' => '',
 						),
@@ -840,7 +840,7 @@ 
 				),
 			),
 			'prune_logs'            => array(
-				'title'    => __( 'Automatically delete old log entries?', 'object-sync-for-salesforce' ),
+				'title'    => __('Automatically delete old log entries?', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -852,20 +852,20 @@ 
 				),
 			),
 			'logs_how_old'          => array(
-				'title'    => __( 'Age to delete log entries', 'object-sync-for-salesforce' ),
+				'title'    => __('Age to delete log entries', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
 				'args'     => array(
 					'type'     => 'text',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'If automatic deleting is enabled, it will affect logs this old.', 'object-sync-for-salesforce' ),
+					'desc'     => __('If automatic deleting is enabled, it will affect logs this old.', 'object-sync-for-salesforce'),
 					'default'  => '2 weeks',
 					'constant' => '',
 				),
 			),
 			'logs_how_often_number' => array(
-				'title'    => __( 'Check for old logs every', 'object-sync-for-salesforce' ),
+				'title'    => __('Check for old logs every', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['text'],
 				'page'     => $page,
 				'section'  => $section,
@@ -878,67 +878,67 @@ 
 				),
 			),
 			'logs_how_often_unit'   => array(
-				'title'    => __( 'Time unit', 'object-sync-for-salesforce' ),
+				'title'    => __('Time unit', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['select'],
 				'page'     => $page,
 				'section'  => $section,
 				'args'     => array(
 					'type'     => 'select',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'These two fields are how often the site will check for logs to delete.', 'object-sync-for-salesforce' ),
+					'desc'     => __('These two fields are how often the site will check for logs to delete.', 'object-sync-for-salesforce'),
 					'items'    => array(
 						'minutes' => array(
-							'text'  => __( 'Minutes', 'object-sync-for-salesforce' ),
+							'text'  => __('Minutes', 'object-sync-for-salesforce'),
 							'value' => 'minutes',
 						),
 						'hours'   => array(
-							'text'  => __( 'Hours', 'object-sync-for-salesforce' ),
+							'text'  => __('Hours', 'object-sync-for-salesforce'),
 							'value' => 'hours',
 						),
 						'days'    => array(
-							'text'  => __( 'Days', 'object-sync-for-salesforce' ),
+							'text'  => __('Days', 'object-sync-for-salesforce'),
 							'value' => 'days',
 						),
 					),
 				),
 			),
 			'triggers_to_log'       => array(
-				'title'    => __( 'Triggers to log', 'object-sync-for-salesforce' ),
+				'title'    => __('Triggers to log', 'object-sync-for-salesforce'),
 				'callback' => $callbacks['checkboxes'],
 				'page'     => $page,
 				'section'  => $section,
 				'args'     => array(
 					'type'     => 'checkboxes',
 					'validate' => 'sanitize_validate_text',
-					'desc'     => __( 'these are the triggers to log', 'object-sync-for-salesforce' ),
+					'desc'     => __('these are the triggers to log', 'object-sync-for-salesforce'),
 					'items'    => array(
 						$this->mappings->sync_wordpress_create => array(
-							'text' => __( 'WordPress create', 'object-sync-for-salesforce' ),
+							'text' => __('WordPress create', 'object-sync-for-salesforce'),
 							'id'   => 'wordpress_create',
 							'desc' => '',
 						),
 						$this->mappings->sync_wordpress_update => array(
-							'text' => __( 'WordPress update', 'object-sync-for-salesforce' ),
+							'text' => __('WordPress update', 'object-sync-for-salesforce'),
 							'id'   => 'wordpress_update',
 							'desc' => '',
 						),
 						$this->mappings->sync_wordpress_delete => array(
-							'text' => __( 'WordPress delete', 'object-sync-for-salesforce' ),
+							'text' => __('WordPress delete', 'object-sync-for-salesforce'),
 							'id'   => 'wordpress_delete',
 							'desc' => '',
 						),
 						$this->mappings->sync_sf_create => array(
-							'text' => __( 'Salesforce create', 'object-sync-for-salesforce' ),
+							'text' => __('Salesforce create', 'object-sync-for-salesforce'),
 							'id'   => 'sf_create',
 							'desc' => '',
 						),
 						$this->mappings->sync_sf_update => array(
-							'text' => __( 'Salesforce update', 'object-sync-for-salesforce' ),
+							'text' => __('Salesforce update', 'object-sync-for-salesforce'),
 							'id'   => 'sf_update',
 							'desc' => '',
 						),
 						$this->mappings->sync_sf_delete => array(
-							'text' => __( 'Salesforce delete', 'object-sync-for-salesforce' ),
+							'text' => __('Salesforce delete', 'object-sync-for-salesforce'),
 							'id'   => 'sf_delete',
 							'desc' => '',
 						),
@@ -946,7 +946,7 @@ 
 				),
 			),
 		);
-		foreach ( $log_settings as $key => $attributes ) {
+		foreach ($log_settings as $key => $attributes) {
 			$id       = $this->option_prefix . $key;
 			$name     = $this->option_prefix . $key;
 			$title    = $attributes['title'];
@@ -962,8 +962,8 @@ 
 					'name'      => $name,
 				)
 			);
-			add_settings_field( $id, $title, $callback, $page, $section, $args );
-			register_setting( $page, $id );
+			add_settings_field($id, $title, $callback, $page, $section, $args);
+			register_setting($page, $id);
 		}
 	}
 
@@ -974,69 +974,69 @@ 
 	public function notices() {
 
 		// before a notice is displayed, we should make sure we are on a page related to this plugin
-		if ( ! isset( $_GET['page'] ) || 'object-sync-salesforce-admin' !== $_GET['page'] ) {
+		if ( ! isset($_GET['page']) || 'object-sync-salesforce-admin' !== $_GET['page']) {
 			return;
 		}
 
-		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
-		require_once plugin_dir_path( __FILE__ ) . '../classes/admin-notice.php';
+		$get_data = filter_input_array(INPUT_GET, FILTER_SANITIZE_STRING);
+		require_once plugin_dir_path(__FILE__) . '../classes/admin-notice.php';
 
 		$notices = array(
 			'permission'      => array(
 				'condition'   => false === $this->check_wordpress_admin_permissions(),
-				'message'     => __( "Your account does not have permission to edit the Salesforce REST API plugin's settings.", 'object-sync-for-salesforce' ),
+				'message'     => __("Your account does not have permission to edit the Salesforce REST API plugin's settings.", 'object-sync-for-salesforce'),
 				'type'        => 'error',
 				'dismissible' => false,
 			),
 			'fieldmap'        => array(
-				'condition'   => isset( $get_data['transient'] ),
-				'message'     => __( 'Errors kept this fieldmap from being saved.', 'object-sync-for-salesforce' ),
+				'condition'   => isset($get_data['transient']),
+				'message'     => __('Errors kept this fieldmap from being saved.', 'object-sync-for-salesforce'),
 				'type'        => 'error',
 				'dismissible' => true,
 			),
 			'object_map'      => array(
-				'condition'   => isset( $get_data['map_transient'] ),
-				'message'     => __( 'Errors kept this object map from being saved.', 'object-sync-for-salesforce' ),
+				'condition'   => isset($get_data['map_transient']),
+				'message'     => __('Errors kept this object map from being saved.', 'object-sync-for-salesforce'),
 				'type'        => 'error',
 				'dismissible' => true,
 			),
 			'data_saved'      => array(
-				'condition'   => isset( $get_data['data_saved'] ) && 'true' === $get_data['data_saved'],
-				'message'     => __( 'This data was successfully saved.', 'object-sync-for-salesforce' ),
+				'condition'   => isset($get_data['data_saved']) && 'true' === $get_data['data_saved'],
+				'message'     => __('This data was successfully saved.', 'object-sync-for-salesforce'),
 				'type'        => 'success',
 				'dismissible' => true,
 			),
 			'data_save_error' => array(
-				'condition'   => isset( $get_data['data_saved'] ) && 'false' === $get_data['data_saved'],
-				'message'     => __( 'This data was not successfully saved. Try again.', 'object-sync-for-salesforce' ),
+				'condition'   => isset($get_data['data_saved']) && 'false' === $get_data['data_saved'],
+				'message'     => __('This data was not successfully saved. Try again.', 'object-sync-for-salesforce'),
 				'type'        => 'error',
 				'dismissible' => true,
 			),
 		);
 
-		foreach ( $notices as $key => $value ) {
+		foreach ($notices as $key => $value) {
 
 			$condition = $value['condition'];
 			$message   = $value['message'];
 
-			if ( isset( $value['dismissible'] ) ) {
+			if (isset($value['dismissible'])) {
 				$dismissible = $value['dismissible'];
 			} else {
 				$dismissible = false;
 			}
 
-			if ( isset( $value['type'] ) ) {
+			if (isset($value['type'])) {
 				$type = $value['type'];
 			} else {
 				$type = '';
 			}
 
-			if ( ! isset( $value['template'] ) ) {
+			if ( ! isset($value['template'])) {
 				$template = '';
 			}
 
-			if ( $condition ) {
-				new Object_Sync_Sf_Admin_Notice( $condition, $message, $dismissible, $type, $template );
+			if ($condition) {
+				new Object_Sync_Sf_Admin_Notice($condition, $message, $dismissible, $type, $template);
 			}
 		}
 
@@ -1051,47 +1051,47 @@ 
 	* can optionally contain a type
 	* @return array $object_settings
 	*/
-	public function get_salesforce_object_description( $data = array() ) {
+	public function get_salesforce_object_description($data = array()) {
 		$ajax = false;
-		if ( empty( $data ) ) {
-			$data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
+		if (empty($data)) {
+			$data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
 			$ajax = true;
 		}
 
 		$object_description = array();
 
-		if ( ! empty( $data['salesforce_object'] ) ) {
-			$object = $this->salesforce['sfapi']->object_describe( esc_attr( $data['salesforce_object'] ) );
+		if ( ! empty($data['salesforce_object'])) {
+			$object = $this->salesforce['sfapi']->object_describe(esc_attr($data['salesforce_object']));
 
 			$object_fields        = array();
 			$include_record_types = array();
 
 			// these can come from ajax
-			$include = isset( $data['include'] ) ? (array) $data['include'] : array();
-			$include = array_map( 'esc_attr', $include );
-
-			if ( in_array( 'fields', $include, true ) || empty( $include ) ) {
-				$type = isset( $data['field_type'] ) ? esc_attr( $data['field_type'] ) : ''; // can come from ajax
-				foreach ( $object['data']['fields'] as $key => $value ) {
-					if ( '' === $type || $type === $value['type'] ) {
-						$object_fields[ $key ] = $value;
+			$include = isset($data['include']) ? (array) $data['include'] : array();
+			$include = array_map('esc_attr', $include);
+
+			if (in_array('fields', $include, true) || empty($include)) {
+				$type = isset($data['field_type']) ? esc_attr($data['field_type']) : ''; // can come from ajax
+				foreach ($object['data']['fields'] as $key => $value) {
+					if ('' === $type || $type === $value['type']) {
+						$object_fields[$key] = $value;
 					}
 				}
 				$object_description['fields'] = $object_fields;
 			}
 
-			if ( in_array( 'recordTypeInfos', $include, true ) ) {
-				if ( isset( $object['data']['recordTypeInfos'] ) && count( $object['data']['recordTypeInfos'] ) > 1 ) {
-					foreach ( $object['data']['recordTypeInfos'] as $type ) {
-						$object_record_types[ $type['recordTypeId'] ] = $type['name'];
+			if (in_array('recordTypeInfos', $include, true)) {
+				if (isset($object['data']['recordTypeInfos']) && count($object['data']['recordTypeInfos']) > 1) {
+					foreach ($object['data']['recordTypeInfos'] as $type) {
+						$object_record_types[$type['recordTypeId']] = $type['name'];
 					}
 					$object_description['recordTypeInfos'] = $object_record_types;
 				}
 			}
 		}
 
-		if ( true === $ajax ) {
-			wp_send_json_success( $object_description );
+		if (true === $ajax) {
+			wp_send_json_success($object_description);
 		} else {
 			return $object_description;
 		}
@@ -1105,23 +1105,23 @@ 
 	* can optionally contain a type for the field
 	* @return array $object_fields
 	*/
-	public function get_salesforce_object_fields( $data = array() ) {
+	public function get_salesforce_object_fields($data = array()) {
 
-		if ( ! empty( $data['salesforce_object'] ) ) {
-			$object               = $this->salesforce['sfapi']->object_describe( esc_attr( $data['salesforce_object'] ) );
+		if ( ! empty($data['salesforce_object'])) {
+			$object               = $this->salesforce['sfapi']->object_describe(esc_attr($data['salesforce_object']));
 			$object_fields        = array();
-			$type                 = isset( $data['type'] ) ? esc_attr( $data['type'] ) : '';
-			$include_record_types = isset( $data['include_record_types'] ) ? esc_attr( $data['include_record_types'] ) : false;
-			foreach ( $object['data']['fields'] as $key => $value ) {
-				if ( '' === $type || $type === $value['type'] ) {
-					$object_fields[ $key ] = $value;
+			$type                 = isset($data['type']) ? esc_attr($data['type']) : '';
+			$include_record_types = isset($data['include_record_types']) ? esc_attr($data['include_record_types']) : false;
+			foreach ($object['data']['fields'] as $key => $value) {
+				if ('' === $type || $type === $value['type']) {
+					$object_fields[$key] = $value;
 				}
 			}
-			if ( true === $include_record_types ) {
+			if (true === $include_record_types) {
 				$object_record_types = array();
-				if ( isset( $object['data']['recordTypeInfos'] ) && count( $object['data']['recordTypeInfos'] ) > 1 ) {
-					foreach ( $object['data']['recordTypeInfos'] as $type ) {
-						$object_record_types[ $type['recordTypeId'] ] = $type['name'];
+				if (isset($object['data']['recordTypeInfos']) && count($object['data']['recordTypeInfos']) > 1) {
+					foreach ($object['data']['recordTypeInfos'] as $type) {
+						$object_record_types[$type['recordTypeId']] = $type['name'];
 					}
 				}
 			}
@@ -1138,18 +1138,18 @@ 
 	* @param string $wordpress_object
 	* @return array $object_fields
 	*/
-	public function get_wordpress_object_fields( $wordpress_object = '' ) {
+	public function get_wordpress_object_fields($wordpress_object = '') {
 		$ajax      = false;
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( empty( $wordpress_object ) ) {
-			$wordpress_object = isset( $post_data['wordpress_object'] ) ? sanitize_text_field( wp_unslash( $post_data['wordpress_object'] ) ) : '';
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if (empty($wordpress_object)) {
+			$wordpress_object = isset($post_data['wordpress_object']) ? sanitize_text_field(wp_unslash($post_data['wordpress_object'])) : '';
 			$ajax             = true;
 		}
 
-		$object_fields = $this->wordpress->get_wordpress_object_fields( $wordpress_object );
+		$object_fields = $this->wordpress->get_wordpress_object_fields($wordpress_object);
 
-		if ( true === $ajax ) {
-			wp_send_json_success( $object_fields );
+		if (true === $ajax) {
+			wp_send_json_success($object_fields);
 		} else {
 			return $object_fields;
 		}
@@ -1163,24 +1163,24 @@ 
 	* @param string $salesforce_object
 	* @return array $object_fields
 	*/
-	public function get_wp_sf_object_fields( $wordpress_object = '', $salesforce = '' ) {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( empty( $wordpress_object ) ) {
-			$wordpress_object = isset( $post_data['wordpress_object'] ) ? sanitize_text_field( wp_unslash( $post_data['wordpress_object'] ) ) : '';
+	public function get_wp_sf_object_fields($wordpress_object = '', $salesforce = '') {
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if (empty($wordpress_object)) {
+			$wordpress_object = isset($post_data['wordpress_object']) ? sanitize_text_field(wp_unslash($post_data['wordpress_object'])) : '';
 		}
-		if ( empty( $salesforce_object ) ) {
-			$salesforce_object = isset( $post_data['salesforce_object'] ) ? sanitize_text_field( wp_unslash( $post_data['salesforce_object'] ) ) : '';
+		if (empty($salesforce_object)) {
+			$salesforce_object = isset($post_data['salesforce_object']) ? sanitize_text_field(wp_unslash($post_data['salesforce_object'])) : '';
 		}
 
-		$object_fields['wordpress']  = $this->get_wordpress_object_fields( $wordpress_object );
+		$object_fields['wordpress']  = $this->get_wordpress_object_fields($wordpress_object);
 		$object_fields['salesforce'] = $this->get_salesforce_object_fields(
 			array(
 				'salesforce_object' => $salesforce_object,
 			)
 		);
 
-		if ( ! empty( $post_data ) ) {
-			wp_send_json_success( $object_fields );
+		if ( ! empty($post_data)) {
+			wp_send_json_success($object_fields);
 		} else {
 			return $object_fields;
 		}
@@ -1193,17 +1193,17 @@ 
 	* @param string $wordpress_object
 	* @param int $wordpress_id
 	*/
-	public function push_to_salesforce( $wordpress_object = '', $wordpress_id = '' ) {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( empty( $wordpress_object ) && empty( $wordpress_id ) ) {
-			$wordpress_object = isset( $post_data['wordpress_object'] ) ? sanitize_text_field( wp_unslash( $post_data['wordpress_object'] ) ) : '';
-			$wordpress_id     = isset( $post_data['wordpress_id'] ) ? absint( $post_data['wordpress_id'] ) : '';
+	public function push_to_salesforce($wordpress_object = '', $wordpress_id = '') {
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if (empty($wordpress_object) && empty($wordpress_id)) {
+			$wordpress_object = isset($post_data['wordpress_object']) ? sanitize_text_field(wp_unslash($post_data['wordpress_object'])) : '';
+			$wordpress_id     = isset($post_data['wordpress_id']) ? absint($post_data['wordpress_id']) : '';
 		}
-		$data   = $this->wordpress->get_wordpress_object_data( $wordpress_object, $wordpress_id );
-		$result = $this->push->manual_object_update( $data, $wordpress_object );
+		$data   = $this->wordpress->get_wordpress_object_data($wordpress_object, $wordpress_id);
+		$result = $this->push->manual_object_update($data, $wordpress_object);
 
-		if ( ! empty( $post_data['wordpress_object'] ) && ! empty( $post_data['wordpress_id'] ) ) {
-			wp_send_json_success( $result );
+		if ( ! empty($post_data['wordpress_object']) && ! empty($post_data['wordpress_id'])) {
+			wp_send_json_success($result);
 		} else {
 			return $result;
 		}
@@ -1217,16 +1217,16 @@ 
 	* @param string $salesforce_id
 	* @param string $wordpress_object
 	*/
-	public function pull_from_salesforce( $salesforce_id = '', $wordpress_object = '' ) {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( empty( $wordpress_object ) && empty( $salesforce_id ) ) {
-			$wordpress_object = isset( $post_data['wordpress_object'] ) ? sanitize_text_field( wp_unslash( $post_data['wordpress_object'] ) ) : '';
-			$salesforce_id    = isset( $post_data['salesforce_id'] ) ? sanitize_text_field( wp_unslash( $post_data['salesforce_id'] ) ) : '';
-		}
-		$type   = $this->salesforce['sfapi']->get_sobject_type( $salesforce_id );
-		$result = $this->pull->manual_pull( $type, $salesforce_id, $wordpress_object ); // we want the wp object to make sure we get the right fieldmap
-		if ( ! empty( $post_data ) ) {
-			wp_send_json_success( $result );
+	public function pull_from_salesforce($salesforce_id = '', $wordpress_object = '') {
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if (empty($wordpress_object) && empty($salesforce_id)) {
+			$wordpress_object = isset($post_data['wordpress_object']) ? sanitize_text_field(wp_unslash($post_data['wordpress_object'])) : '';
+			$salesforce_id    = isset($post_data['salesforce_id']) ? sanitize_text_field(wp_unslash($post_data['salesforce_id'])) : '';
+		}
+		$type   = $this->salesforce['sfapi']->get_sobject_type($salesforce_id);
+		$result = $this->pull->manual_pull($type, $salesforce_id, $wordpress_object); // we want the wp object to make sure we get the right fieldmap
+		if ( ! empty($post_data)) {
+			wp_send_json_success($result);
 		} else {
 			return $result;
 		}
@@ -1238,18 +1238,18 @@ 
 	*
 	* @param int $mapping_id
 	*/
-	public function refresh_mapped_data( $mapping_id = '' ) {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( empty( $mapping_id ) ) {
-			$mapping_id = isset( $post_data['mapping_id'] ) ? absint( $post_data['mapping_id'] ) : '';
+	public function refresh_mapped_data($mapping_id = '') {
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if (empty($mapping_id)) {
+			$mapping_id = isset($post_data['mapping_id']) ? absint($post_data['mapping_id']) : '';
 		}
 		$result = $this->mappings->get_object_maps(
 			array(
 				'id' => $mapping_id,
 			)
 		);
-		if ( ! empty( $post_data ) ) {
-			wp_send_json_success( $result );
+		if ( ! empty($post_data)) {
+			wp_send_json_success($result);
 		} else {
 			return $result;
 		}
@@ -1265,47 +1265,47 @@ 
 	*/
 	public function prepare_fieldmap_data() {
 		$error     = false;
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		$cachekey  = md5( wp_json_encode( $post_data ) );
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		$cachekey  = md5(wp_json_encode($post_data));
 
-		if ( ! isset( $post_data['label'] ) || ! isset( $post_data['salesforce_object'] ) || ! isset( $post_data['wordpress_object'] ) ) {
+		if ( ! isset($post_data['label']) || ! isset($post_data['salesforce_object']) || ! isset($post_data['wordpress_object'])) {
 			$error = true;
 		}
-		if ( true === $error ) {
-			$this->sfwp_transients->set( $cachekey, $post_data, $this->wordpress->options['cache_expiration'] );
-			if ( '' !== $cachekey ) {
-				$url = esc_url_raw( $post_data['redirect_url_error'] ) . '&transient=' . $cachekey;
+		if (true === $error) {
+			$this->sfwp_transients->set($cachekey, $post_data, $this->wordpress->options['cache_expiration']);
+			if ('' !== $cachekey) {
+				$url = esc_url_raw($post_data['redirect_url_error']) . '&transient=' . $cachekey;
 			}
 		} else { // there are no errors
 			// send the row to the fieldmap class
 			// if it is add or clone, use the create method
-			$method            = esc_attr( $post_data['method'] );
+			$method            = esc_attr($post_data['method']);
 			$salesforce_fields = $this->get_salesforce_object_fields(
 				array(
 					'salesforce_object' => $post_data['salesforce_object'],
 				)
 			);
-			$wordpress_fields  = $this->get_wordpress_object_fields( $post_data['wordpress_object'] );
-			if ( 'add' === $method || 'clone' === $method ) {
-				$result = $this->mappings->create_fieldmap( $post_data, $wordpress_fields, $salesforce_fields );
-			} elseif ( 'edit' === $method ) { // if it is edit, use the update method
-				$id     = esc_attr( $post_data['id'] );
-				$result = $this->mappings->update_fieldmap( $post_data, $wordpress_fields, $salesforce_fields, $id );
+			$wordpress_fields = $this->get_wordpress_object_fields($post_data['wordpress_object']);
+			if ('add' === $method || 'clone' === $method) {
+				$result = $this->mappings->create_fieldmap($post_data, $wordpress_fields, $salesforce_fields);
+			} elseif ('edit' === $method) { // if it is edit, use the update method
+				$id     = esc_attr($post_data['id']);
+				$result = $this->mappings->update_fieldmap($post_data, $wordpress_fields, $salesforce_fields, $id);
 			}
-			if ( false === $result ) { // if the database didn't save, it's still an error
-				$this->sfwp_transients->set( $cachekey, $post_data, $this->wordpress->options['cache_expiration'] );
-				if ( '' !== $cachekey ) {
-					$url = esc_url_raw( $post_data['redirect_url_error'] ) . '&transient=' . $cachekey;
+			if (false === $result) { // if the database didn't save, it's still an error
+				$this->sfwp_transients->set($cachekey, $post_data, $this->wordpress->options['cache_expiration']);
+				if ('' !== $cachekey) {
+					$url = esc_url_raw($post_data['redirect_url_error']) . '&transient=' . $cachekey;
 				}
 			} else {
-				if ( isset( $post_data['transient'] ) ) { // there was previously an error saved. can delete it now.
-					$this->sfwp_transients->delete( esc_attr( $post_data['map_transient'] ) );
+				if (isset($post_data['transient'])) { // there was previously an error saved. can delete it now.
+					$this->sfwp_transients->delete(esc_attr($post_data['map_transient']));
 				}
 				// then send the user to the list of fieldmaps
-				$url = esc_url_raw( $post_data['redirect_url_success'] );
+				$url = esc_url_raw($post_data['redirect_url_success']);
 			}
 		}
-		wp_safe_redirect( $url );
+		wp_safe_redirect($url);
 		exit();
 	}
 
@@ -1317,15 +1317,15 @@ 
 	*
 	*/
 	public function delete_fieldmap() {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( $post_data['id'] ) {
-			$result = $this->mappings->delete_fieldmap( $post_data['id'] );
-			if ( true === $result ) {
-				$url = esc_url_raw( $post_data['redirect_url_success'] );
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if ($post_data['id']) {
+			$result = $this->mappings->delete_fieldmap($post_data['id']);
+			if (true === $result) {
+				$url = esc_url_raw($post_data['redirect_url_success']);
 			} else {
-				$url = esc_url_raw( $post_data['redirect_url_error'] . '&id=' . $post_data['id'] );
+				$url = esc_url_raw($post_data['redirect_url_error'] . '&id=' . $post_data['id']);
 			}
-			wp_safe_redirect( $url );
+			wp_safe_redirect($url);
 			exit();
 		}
 	}
@@ -1340,38 +1340,38 @@ 
 	*/
 	public function prepare_object_map_data() {
 		$error     = false;
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		$cachekey  = md5( wp_json_encode( $post_data ) );
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		$cachekey  = md5(wp_json_encode($post_data));
 
-		if ( ! isset( $post_data['wordpress_id'] ) || ! isset( $post_data['salesforce_id'] ) ) {
+		if ( ! isset($post_data['wordpress_id']) || ! isset($post_data['salesforce_id'])) {
 			$error = true;
 		}
-		if ( true === $error ) {
-			$this->sfwp_transients->set( $cachekey, $post_data, $this->wordpress->options['cache_expiration'] );
-			if ( '' !== $cachekey ) {
-				$url = esc_url_raw( $post_data['redirect_url_error'] ) . '&map_transient=' . $cachekey;
+		if (true === $error) {
+			$this->sfwp_transients->set($cachekey, $post_data, $this->wordpress->options['cache_expiration']);
+			if ('' !== $cachekey) {
+				$url = esc_url_raw($post_data['redirect_url_error']) . '&map_transient=' . $cachekey;
 			}
 		} else { // there are no errors
 			// send the row to the object map class
-			$method = esc_attr( $post_data['method'] );
-			if ( 'edit' === $method ) { // if it is edit, use the update method
-				$id     = esc_attr( $post_data['id'] );
-				$result = $this->mappings->update_object_map( $post_data, $id );
+			$method = esc_attr($post_data['method']);
+			if ('edit' === $method) { // if it is edit, use the update method
+				$id     = esc_attr($post_data['id']);
+				$result = $this->mappings->update_object_map($post_data, $id);
 			}
-			if ( false === $result ) { // if the database didn't save, it's still an error
-				$this->sfwp_transients->set( $cachekey, $post_data, $this->wordpress->options['cache_expiration'] );
-				if ( '' !== $cachekey ) {
-					$url = esc_url_raw( $post_data['redirect_url_error'] ) . '&map_transient=' . $cachekey;
+			if (false === $result) { // if the database didn't save, it's still an error
+				$this->sfwp_transients->set($cachekey, $post_data, $this->wordpress->options['cache_expiration']);
+				if ('' !== $cachekey) {
+					$url = esc_url_raw($post_data['redirect_url_error']) . '&map_transient=' . $cachekey;
 				}
 			} else {
-				if ( isset( $post_data['map_transient'] ) ) { // there was previously an error saved. can delete it now.
-					$this->sfwp_transients->delete( esc_attr( $post_data['map_transient'] ) );
+				if (isset($post_data['map_transient'])) { // there was previously an error saved. can delete it now.
+					$this->sfwp_transients->delete(esc_attr($post_data['map_transient']));
 				}
 				// then send the user to the success redirect url
-				$url = esc_url_raw( $post_data['redirect_url_success'] );
+				$url = esc_url_raw($post_data['redirect_url_success']);
 			}
 		}
-		wp_safe_redirect( $url );
+		wp_safe_redirect($url);
 		exit();
 	}
 
@@ -1383,15 +1383,15 @@ 
 	*
 	*/
 	public function delete_object_map() {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( $post_data['id'] ) {
-			$result = $this->mappings->delete_object_map( $post_data['id'] );
-			if ( true === $result ) {
-				$url = esc_url_raw( $post_data['redirect_url_success'] );
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if ($post_data['id']) {
+			$result = $this->mappings->delete_object_map($post_data['id']);
+			if (true === $result) {
+				$url = esc_url_raw($post_data['redirect_url_success']);
 			} else {
-				$url = esc_url_raw( $post_data['redirect_url_error'] . '&id=' . $post_data['id'] );
+				$url = esc_url_raw($post_data['redirect_url_error'] . '&id=' . $post_data['id']);
 			}
-			wp_safe_redirect( $url );
+			wp_safe_redirect($url);
 			exit();
 		}
 	}
@@ -1402,95 +1402,95 @@ 
 	*/
 	public function import_json_file() {
 
-		if ( ! wp_verify_nonce( $_POST['object_sync_for_salesforce_nonce_import'], 'object_sync_for_salesforce_nonce_import' ) ) {
+		if ( ! wp_verify_nonce($_POST['object_sync_for_salesforce_nonce_import'], 'object_sync_for_salesforce_nonce_import')) {
 			return;
 		}
-		if ( ! current_user_can( 'manage_options' ) ) {
+		if ( ! current_user_can('manage_options')) {
 			return;
 		}
 		$path      = $_FILES['import_file']['name'];
-		$extension = pathinfo( $path, PATHINFO_EXTENSION );
-		if ( 'json' !== $extension ) {
-			wp_die( __( 'Please upload a valid .json file' ) );
+		$extension = pathinfo($path, PATHINFO_EXTENSION);
+		if ('json' !== $extension) {
+			wp_die(__('Please upload a valid .json file'));
 		}
 
 		$import_file = $_FILES['import_file']['tmp_name'];
-		if ( empty( $import_file ) ) {
-			wp_die( __( 'Please upload a file to import' ) );
+		if (empty($import_file)) {
+			wp_die(__('Please upload a file to import'));
 		}
 
 		// Retrieve the data from the file and convert the json object to an array.
-		$data = (array) json_decode( file_get_contents( $import_file ), true );
+		$data = (array) json_decode(file_get_contents($import_file), true);
 
 		// if there is only one object map, fix the array
-		if ( isset( $data['object_maps'] ) ) {
-			if ( count( $data['object_maps'] ) === count( $data['object_maps'], COUNT_RECURSIVE ) ) {
-				$data['object_maps'] = array( 0 => $data['object_maps'] );
+		if (isset($data['object_maps'])) {
+			if (count($data['object_maps']) === count($data['object_maps'], COUNT_RECURSIVE)) {
+				$data['object_maps'] = array(0 => $data['object_maps']);
 			}
 		}
 
-		$overwrite = isset( $_POST['overwrite'] ) ? esc_attr( $_POST['overwrite'] ) : '';
-		if ( '1' === $overwrite ) {
-			if ( isset( $data['fieldmaps'] ) ) {
+		$overwrite = isset($_POST['overwrite']) ? esc_attr($_POST['overwrite']) : '';
+		if ('1' === $overwrite) {
+			if (isset($data['fieldmaps'])) {
 				$fieldmaps = $this->mappings->get_fieldmaps();
-				foreach ( $fieldmaps as $fieldmap ) {
+				foreach ($fieldmaps as $fieldmap) {
 					$id     = $fieldmap['id'];
-					$delete = $this->mappings->delete_fieldmap( $id );
+					$delete = $this->mappings->delete_fieldmap($id);
 				}
 			}
-			if ( isset( $data['object_maps'] ) ) {
+			if (isset($data['object_maps'])) {
 				$object_maps = $this->mappings->get_object_maps();
 
 				// if there is only one existing object map, fix the array
-				if ( count( $object_maps ) === count( $object_maps, COUNT_RECURSIVE ) ) {
-					$object_maps = array( 0 => $object_maps );
+				if (count($object_maps) === count($object_maps, COUNT_RECURSIVE)) {
+					$object_maps = array(0 => $object_maps);
 				}
 
-				foreach ( $object_maps as $object_map ) {
+				foreach ($object_maps as $object_map) {
 					$id     = $object_map['id'];
-					$delete = $this->mappings->delete_object_map( $id );
+					$delete = $this->mappings->delete_object_map($id);
 				}
 			}
-			if ( isset( $data['plugin_settings'] ) ) {
-				foreach ( $data['plugin_settings'] as $key => $value ) {
-					delete_option( $value['option_name'] );
+			if (isset($data['plugin_settings'])) {
+				foreach ($data['plugin_settings'] as $key => $value) {
+					delete_option($value['option_name']);
 				}
 			}
 		}
 
 		$success = true;
 
-		if ( isset( $data['fieldmaps'] ) ) {
-			foreach ( $data['fieldmaps'] as $fieldmap ) {
-				unset( $fieldmap['id'] );
-				$create = $this->mappings->create_fieldmap( $fieldmap );
-				if ( false === $create ) {
+		if (isset($data['fieldmaps'])) {
+			foreach ($data['fieldmaps'] as $fieldmap) {
+				unset($fieldmap['id']);
+				$create = $this->mappings->create_fieldmap($fieldmap);
+				if (false === $create) {
 					$success = false;
 				}
 			}
 		}
 
-		if ( isset( $data['object_maps'] ) ) {
-			foreach ( $data['object_maps'] as $object_map ) {
-				unset( $object_map['id'] );
-				$create = $this->mappings->create_object_map( $object_map );
-				if ( false === $create ) {
+		if (isset($data['object_maps'])) {
+			foreach ($data['object_maps'] as $object_map) {
+				unset($object_map['id']);
+				$create = $this->mappings->create_object_map($object_map);
+				if (false === $create) {
 					$success = false;
 				}
 			}
 		}
 
-		if ( isset( $data['plugin_settings'] ) ) {
-			foreach ( $data['plugin_settings'] as $key => $value ) {
-				update_option( $value['option_name'], maybe_unserialize( $value['option_value'] ), $value['autoload'] );
+		if (isset($data['plugin_settings'])) {
+			foreach ($data['plugin_settings'] as $key => $value) {
+				update_option($value['option_name'], maybe_unserialize($value['option_value']), $value['autoload']);
 			}
 		}
 
-		if ( true === $success ) {
-			wp_safe_redirect( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=import-export&data_saved=true' ) );
+		if (true === $success) {
+			wp_safe_redirect(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=import-export&data_saved=true'));
 			exit;
 		} else {
-			wp_safe_redirect( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=import-export&data_saved=false' ) );
+			wp_safe_redirect(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=import-export&data_saved=false'));
 			exit;
 		}
 
@@ -1502,28 +1502,28 @@ 
 	*/
 	public function export_json_file() {
 
-		if ( ! wp_verify_nonce( $_POST['object_sync_for_salesforce_nonce_export'], 'object_sync_for_salesforce_nonce_export' ) ) {
+		if ( ! wp_verify_nonce($_POST['object_sync_for_salesforce_nonce_export'], 'object_sync_for_salesforce_nonce_export')) {
 			return;
 		}
-		if ( ! current_user_can( 'manage_options' ) ) {
+		if ( ! current_user_can('manage_options')) {
 			return;
 		}
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
 		$export    = array();
-		if ( in_array( 'fieldmaps', $post_data['export'] ) ) {
+		if (in_array('fieldmaps', $post_data['export'])) {
 			$export['fieldmaps'] = $this->mappings->get_fieldmaps();
 		}
-		if ( in_array( 'object_maps', $post_data['export'] ) ) {
+		if (in_array('object_maps', $post_data['export'])) {
 			$export['object_maps'] = $this->mappings->get_object_maps();
 		}
-		if ( in_array( 'plugin_settings', $post_data['export'] ) ) {
-			$export['plugin_settings'] = $this->wpdb->get_results( 'SELECT * FROM ' . $this->wpdb->prefix . 'options' . ' WHERE option_name like "' . $this->option_prefix . '%"', ARRAY_A );
+		if (in_array('plugin_settings', $post_data['export'])) {
+			$export['plugin_settings'] = $this->wpdb->get_results('SELECT * FROM ' . $this->wpdb->prefix . 'options' . ' WHERE option_name like "' . $this->option_prefix . '%"', ARRAY_A);
 		}
 		nocache_headers();
-		header( 'Content-Type: application/json; charset=utf-8' );
-		header( 'Content-Disposition: attachment; filename=object-sync-for-salesforce-data-export-' . date( 'm-d-Y' ) . '.json' );
-		header( 'Expires: 0' );
-		echo wp_json_encode( $export );
+		header('Content-Type: application/json; charset=utf-8');
+		header('Content-Disposition: attachment; filename=object-sync-for-salesforce-data-export-' . date('m-d-Y') . '.json');
+		header('Expires: 0');
+		echo wp_json_encode($export);
 		exit;
 	}
 
@@ -1532,7 +1532,7 @@ 
 	*
 	* @param array $args
 	*/
-	public function display_input_field( $args ) {
+	public function display_input_field($args) {
 		$type    = $args['type'];
 		$id      = $args['label_for'];
 		$name    = $args['name'];
@@ -1541,38 +1541,38 @@ 
 
 		$class = 'regular-text';
 
-		if ( 'checkbox' === $type ) {
+		if ('checkbox' === $type) {
 			$class = 'checkbox';
 		}
 
-		if ( ! isset( $args['constant'] ) || ! defined( $args['constant'] ) ) {
-			$value = esc_attr( get_option( $id, '' ) );
-			if ( 'checkbox' === $type ) {
-				if ( '1' === $value ) {
+		if ( ! isset($args['constant']) || ! defined($args['constant'])) {
+			$value = esc_attr(get_option($id, ''));
+			if ('checkbox' === $type) {
+				if ('1' === $value) {
 					$checked = 'checked ';
 				}
 				$value = 1;
 			}
-			if ( '' === $value && isset( $args['default'] ) && '' !== $args['default'] ) {
+			if ('' === $value && isset($args['default']) && '' !== $args['default']) {
 				$value = $args['default'];
 			}
 
-			echo sprintf( '<input type="%1$s" value="%2$s" name="%3$s" id="%4$s" class="%5$s"%6$s>',
-				esc_attr( $type ),
-				esc_attr( $value ),
-				esc_attr( $name ),
-				esc_attr( $id ),
-				sanitize_html_class( $class . esc_html( ' code' ) ),
-				esc_html( $checked )
+			echo sprintf('<input type="%1$s" value="%2$s" name="%3$s" id="%4$s" class="%5$s"%6$s>',
+				esc_attr($type),
+				esc_attr($value),
+				esc_attr($name),
+				esc_attr($id),
+				sanitize_html_class($class . esc_html(' code')),
+				esc_html($checked)
 			);
-			if ( '' !== $desc ) {
-				echo sprintf( '<p class="description">%1$s</p>',
-					esc_html( $desc )
+			if ('' !== $desc) {
+				echo sprintf('<p class="description">%1$s</p>',
+					esc_html($desc)
 				);
 			}
 		} else {
-			echo sprintf( '<p><code>%1$s</code></p>',
-				esc_html__( 'Defined in wp-config.php', 'object-sync-for-salesforce' )
+			echo sprintf('<p><code>%1$s</code></p>',
+				esc_html__('Defined in wp-config.php', 'object-sync-for-salesforce')
 			);
 		}
 	}
@@ -1583,33 +1583,33 @@ 
 	*
 	* @param array $args
 	*/
-	public function display_checkboxes( $args ) {
+	public function display_checkboxes($args) {
 		$type    = 'checkbox';
 		$name    = $args['name'];
-		$options = get_option( $name, array() );
-		foreach ( $args['items'] as $key => $value ) {
+		$options = get_option($name, array());
+		foreach ($args['items'] as $key => $value) {
 			$text    = $value['text'];
 			$id      = $value['id'];
 			$desc    = $value['desc'];
 			$checked = '';
-			if ( is_array( $options ) && in_array( (string) $key, $options, true ) ) {
+			if (is_array($options) && in_array((string) $key, $options, true)) {
 				$checked = 'checked';
-			} elseif ( is_array( $options ) && empty( $options ) ) {
-				if ( isset( $value['default'] ) && true === $value['default'] ) {
+			} elseif (is_array($options) && empty($options)) {
+				if (isset($value['default']) && true === $value['default']) {
 					$checked = 'checked';
 				}
 			}
-			echo sprintf( '<div class="checkbox"><label><input type="%1$s" value="%2$s" name="%3$s[]" id="%4$s"%5$s>%6$s</label></div>',
-				esc_attr( $type ),
-				esc_attr( $key ),
-				esc_attr( $name ),
-				esc_attr( $id ),
-				esc_html( $checked ),
-				esc_html( $text )
+			echo sprintf('<div class="checkbox"><label><input type="%1$s" value="%2$s" name="%3$s[]" id="%4$s"%5$s>%6$s</label></div>',
+				esc_attr($type),
+				esc_attr($key),
+				esc_attr($name),
+				esc_attr($id),
+				esc_html($checked),
+				esc_html($text)
 			);
-			if ( '' !== $desc ) {
-				echo sprintf( '<p class="description">%1$s</p>',
-					esc_html( $desc )
+			if ('' !== $desc) {
+				echo sprintf('<p class="description">%1$s</p>',
+					esc_html($desc)
 				);
 			}
 		}
@@ -1620,44 +1620,44 @@ 
 	*
 	* @param array $args
 	*/
-	public function display_select( $args ) {
+	public function display_select($args) {
 		$type = $args['type'];
 		$id   = $args['label_for'];
 		$name = $args['name'];
 		$desc = $args['desc'];
-		if ( ! isset( $args['constant'] ) || ! defined( $args['constant'] ) ) {
-			$current_value = get_option( $name );
+		if ( ! isset($args['constant']) || ! defined($args['constant'])) {
+			$current_value = get_option($name);
 
-			echo sprintf( '<div class="select"><select id="%1$s" name="%2$s"><option value="">- ' . __( 'Select one', 'object-sync-for-salesforce' ) . ' -</option>',
-				esc_attr( $id ),
-				esc_attr( $name )
+			echo sprintf('<div class="select"><select id="%1$s" name="%2$s"><option value="">- ' . __('Select one', 'object-sync-for-salesforce') . ' -</option>',
+				esc_attr($id),
+				esc_attr($name)
 			);
 
-			foreach ( $args['items'] as $key => $value ) {
+			foreach ($args['items'] as $key => $value) {
 				$text     = $value['text'];
 				$value    = $value['value'];
 				$selected = '';
-				if ( $key === $current_value || $value === $current_value ) {
+				if ($key === $current_value || $value === $current_value) {
 					$selected = ' selected';
 				}
 
-				echo sprintf( '<option value="%1$s"%2$s>%3$s</option>',
-					esc_attr( $value ),
-					esc_attr( $selected ),
-					esc_html( $text )
+				echo sprintf('<option value="%1$s"%2$s>%3$s</option>',
+					esc_attr($value),
+					esc_attr($selected),
+					esc_html($text)
 				);
 
 			}
 			echo '</select>';
-			if ( '' !== $desc ) {
-				echo sprintf( '<p class="description">%1$s</p>',
-					esc_html( $desc )
+			if ('' !== $desc) {
+				echo sprintf('<p class="description">%1$s</p>',
+					esc_html($desc)
 				);
 			}
 			echo '</div>';
 		} else {
-			echo sprintf( '<p><code>%1$s</code></p>',
-				esc_html__( 'Defined in wp-config.php', 'object-sync-for-salesforce' )
+			echo sprintf('<p><code>%1$s</code></p>',
+				esc_html__('Defined in wp-config.php', 'object-sync-for-salesforce')
 			);
 		}
 	}
@@ -1670,7 +1670,7 @@ 
 	private function version_options() {
 		$versions = $this->salesforce['sfapi']->get_api_versions();
 		$args     = array();
-		foreach ( $versions['data'] as $key => $value ) {
+		foreach ($versions['data'] as $key => $value) {
 			$args[] = array(
 				'value' => $value['version'],
 				'text'  => $value['label'] . ' (' . $value['version'] . ')',
@@ -1684,26 +1684,26 @@ 
 	*
 	* @param array $args
 	*/
-	public function display_link( $args ) {
+	public function display_link($args) {
 		$label = $args['label'];
 		$desc  = $args['desc'];
 		$url   = $args['url'];
-		if ( isset( $args['link_class'] ) ) {
-			echo sprintf( '<p><a class="%1$s" href="%2$s">%3$s</a></p>',
-				esc_attr( $args['link_class'] ),
-				esc_url( $url ),
-				esc_html( $label )
+		if (isset($args['link_class'])) {
+			echo sprintf('<p><a class="%1$s" href="%2$s">%3$s</a></p>',
+				esc_attr($args['link_class']),
+				esc_url($url),
+				esc_html($label)
 			);
 		} else {
-			echo sprintf( '<p><a href="%1$s">%2$s</a></p>',
-				esc_url( $url ),
-				esc_html( $label )
+			echo sprintf('<p><a href="%1$s">%2$s</a></p>',
+				esc_url($url),
+				esc_html($label)
 			);
 		}
 
-		if ( '' !== $desc ) {
-			echo sprintf( '<p class="description">%1$s</p>',
-				esc_html( $desc )
+		if ('' !== $desc) {
+			echo sprintf('<p class="description">%1$s</p>',
+				esc_html($desc)
 			);
 		}
 
@@ -1715,15 +1715,15 @@ 
 	* @param string $option
 	* @return string $option
 	*/
-	public function sanitize_validate_text( $option ) {
-		if ( is_array( $option ) ) {
+	public function sanitize_validate_text($option) {
+		if (is_array($option)) {
 			$options = array();
-			foreach ( $option as $key => $value ) {
-				$options[ $key ] = sanitize_text_field( $value );
+			foreach ($option as $key => $value) {
+				$options[$key] = sanitize_text_field($value);
 			}
 			return $options;
 		}
-		$option = sanitize_text_field( $option );
+		$option = sanitize_text_field($option);
 		return $option;
 	}
 
@@ -1732,60 +1732,60 @@ 
 	*
 	* @param object $sfapi
 	*/
-	private function status( $sfapi ) {
+	private function status($sfapi) {
 
 		$versions = $sfapi->get_api_versions();
 
 		// format this array into text so users can see the versions
-		if ( true === $versions['cached'] ) {
-			$versions_is_cached = esc_html__( 'This list is cached, and', 'object-sync-salesforce' );
+		if (true === $versions['cached']) {
+			$versions_is_cached = esc_html__('This list is cached, and', 'object-sync-salesforce');
 		} else {
-			$versions_is_cached = esc_html__( 'This list is not cached, but', 'object-sync-salesforce' );
+			$versions_is_cached = esc_html__('This list is not cached, but', 'object-sync-salesforce');
 		}
 
-		if ( true === $versions['from_cache'] ) {
-			$versions_from_cache = esc_html__( 'items were loaded from the cache', 'object-sync-salesforce' );
+		if (true === $versions['from_cache']) {
+			$versions_from_cache = esc_html__('items were loaded from the cache', 'object-sync-salesforce');
 		} else {
-			$versions_from_cache = esc_html__( 'items were not loaded from the cache', 'object-sync-salesforce' );
+			$versions_from_cache = esc_html__('items were not loaded from the cache', 'object-sync-salesforce');
 		}
 
 		// translators: 1) $versions_is_cached is the "This list is/is not cached, and/but" line, 2) $versions_from_cache is the "items were/were not loaded from the cache" line
-		$versions_apicall_summary = sprintf( esc_html__( 'Available Salesforce API versions. %1$s %2$s. This is not an authenticated request, so it does not touch the Salesforce token.', 'object-sync-for-salesforce' ),
+		$versions_apicall_summary = sprintf(esc_html__('Available Salesforce API versions. %1$s %2$s. This is not an authenticated request, so it does not touch the Salesforce token.', 'object-sync-for-salesforce'),
 			$versions_is_cached,
 			$versions_from_cache
 		);
 
-		$contacts = $sfapi->query( 'SELECT Name, Id from Contact LIMIT 100' );
+		$contacts = $sfapi->query('SELECT Name, Id from Contact LIMIT 100');
 
 		// format this array into html so users can see the contacts
-		if ( true === $contacts['cached'] ) {
-			$contacts_is_cached = esc_html__( 'They are cached, and', 'object-sync-salesforce' );
+		if (true === $contacts['cached']) {
+			$contacts_is_cached = esc_html__('They are cached, and', 'object-sync-salesforce');
 		} else {
-			$contacts_is_cached = esc_html__( 'They are not cached, but', 'object-sync-salesforce' );
+			$contacts_is_cached = esc_html__('They are not cached, but', 'object-sync-salesforce');
 		}
 
-		if ( true === $contacts['from_cache'] ) {
-			$contacts_from_cache = esc_html__( 'they were loaded from the cache', 'object-sync-salesforce' );
+		if (true === $contacts['from_cache']) {
+			$contacts_from_cache = esc_html__('they were loaded from the cache', 'object-sync-salesforce');
 		} else {
-			$contacts_from_cache = esc_html__( 'they were not loaded from the cache', 'object-sync-salesforce' );
+			$contacts_from_cache = esc_html__('they were not loaded from the cache', 'object-sync-salesforce');
 		}
 
-		if ( true === $contacts['is_redo'] ) {
-			$contacts_refreshed_token = esc_html__( 'This request did require refreshing the Salesforce token', 'object-sync-salesforce' );
+		if (true === $contacts['is_redo']) {
+			$contacts_refreshed_token = esc_html__('This request did require refreshing the Salesforce token', 'object-sync-salesforce');
 		} else {
-			$contacts_refreshed_token = esc_html__( 'This request did not require refreshing the Salesforce token', 'object-sync-salesforce' );
+			$contacts_refreshed_token = esc_html__('This request did not require refreshing the Salesforce token', 'object-sync-salesforce');
 		}
 
 		// translators: 1) $contacts['data']['totalSize'] is the number of items loaded, 2) $contacts['data']['records'][0]['attributes']['type'] is the name of the Salesforce object, 3) $contacts_is_cached is the "They are/are not cached, and/but" line, 4) $contacts_from_cache is the "they were/were not loaded from the cache" line, 5) is the "this request did/did not require refreshing the Salesforce token" line
-		$contacts_apicall_summary = sprintf( esc_html__( 'Salesforce successfully returned %1$s %2$s records. %3$s %4$s. %5$s.', 'object-sync-for-salesforce' ),
-			absint( $contacts['data']['totalSize'] ),
-			esc_html( $contacts['data']['records'][0]['attributes']['type'] ),
+		$contacts_apicall_summary = sprintf(esc_html__('Salesforce successfully returned %1$s %2$s records. %3$s %4$s. %5$s.', 'object-sync-for-salesforce'),
+			absint($contacts['data']['totalSize']),
+			esc_html($contacts['data']['records'][0]['attributes']['type']),
 			$contacts_is_cached,
 			$contacts_from_cache,
 			$contacts_refreshed_token
 		);
 
-		require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/status.php' );
+		require_once(plugin_dir_path(__FILE__) . '/../templates/admin/status.php');
 
 	}
 
@@ -1795,12 +1795,12 @@ 
 	* For this plugin at this time, that is the decision we are making: don't do any kind of authorization stuff inside Salesforce
 	*/
 	private function logout() {
-		$this->access_token  = delete_option( $this->option_prefix . 'access_token' );
-		$this->instance_url  = delete_option( $this->option_prefix . 'instance_url' );
-		$this->refresh_token = delete_option( $this->option_prefix . 'refresh_token' );
-		echo sprintf( '<p>You have been logged out. You can use the <a href="%1$s">%2$s</a> tab to log in again.</p>',
-			esc_url( get_admin_url( null, 'options-general.php?page=object-sync-salesforce-admin&tab=authorize' ) ),
-			esc_html__( 'Authorize', 'object-sync-for-salesforce' )
+		$this->access_token  = delete_option($this->option_prefix . 'access_token');
+		$this->instance_url  = delete_option($this->option_prefix . 'instance_url');
+		$this->refresh_token = delete_option($this->option_prefix . 'refresh_token');
+		echo sprintf('<p>You have been logged out. You can use the <a href="%1$s">%2$s</a> tab to log in again.</p>',
+			esc_url(get_admin_url(null, 'options-general.php?page=object-sync-salesforce-admin&tab=authorize')),
+			esc_html__('Authorize', 'object-sync-for-salesforce')
 		);
 	}
 
@@ -1808,28 +1808,28 @@ 
 	* Ajax call to clear the plugin cache.
 	*/
 	public function clear_sfwp_cache() {
-		$result   = $this->clear_cache( true );
+		$result   = $this->clear_cache(true);
 		$response = array(
 			'message' => $result['message'],
 			'success' => $result['success'],
 		);
-		wp_send_json_success( $response );
+		wp_send_json_success($response);
 	}
 
 	/**
 	* Clear the plugin's cache.
 	* This uses the flush method contained in the WordPress cache to clear all of this plugin's cached data.
 	*/
-	private function clear_cache( $ajax = false ) {
+	private function clear_cache($ajax = false) {
 		$result = (bool) $this->wordpress->sfwp_transients->flush();
-		if ( true === $result ) {
-			$message = __( 'The plugin cache has been cleared.', 'object-sync-for-salesforce' );
+		if (true === $result) {
+			$message = __('The plugin cache has been cleared.', 'object-sync-for-salesforce');
 		} else {
-			$message = __( 'There was an error clearing the plugin cache. Try refreshing this page.', 'object-sync-for-salesforce' );
+			$message = __('There was an error clearing the plugin cache. Try refreshing this page.', 'object-sync-for-salesforce');
 		}
-		if ( false === $ajax ) {
+		if (false === $ajax) {
 			// translators: parameter 1 is the result message
-			echo sprintf( '<p>%1$s</p>', $message );
+			echo sprintf('<p>%1$s</p>', $message);
 		} else {
 			return array(
 				'message' => $message,
@@ -1852,7 +1852,7 @@ 
 		// alternatively, other roles can get this capability in whatever other way you like
 		// point is: to administer this plugin, you need this capability
 
-		if ( ! current_user_can( 'configure_salesforce' ) ) {
+		if ( ! current_user_can('configure_salesforce')) {
 			return false;
 		} else {
 			return true;
@@ -1865,23 +1865,23 @@ 
 	* @param object $user
 	*
 	*/
-	public function show_salesforce_user_fields( $user ) {
-		$get_data = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
-		if ( true === $this->check_wordpress_admin_permissions() ) {
-			$mapping  = $this->mappings->load_by_wordpress( 'user', $user->ID );
+	public function show_salesforce_user_fields($user) {
+		$get_data = filter_input_array(INPUT_GET, FILTER_SANITIZE_STRING);
+		if (true === $this->check_wordpress_admin_permissions()) {
+			$mapping  = $this->mappings->load_by_wordpress('user', $user->ID);
 			$fieldmap = $this->mappings->get_fieldmaps(
 				null, // id field must be null for multiples
 				array(
 					'wordpress_object' => 'user',
 				)
 			);
-			if ( isset( $mapping['id'] ) && ! isset( $get_data['edit_salesforce_mapping'] ) ) {
-				require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/user-profile-salesforce.php' );
-			} elseif ( ! empty( $fieldmap ) ) { // is the user mapped to something already?
-				if ( isset( $get_data['edit_salesforce_mapping'] ) && 'true' === sanitize_key( $get_data['edit_salesforce_mapping'] ) ) {
-					require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/user-profile-salesforce-change.php' );
+			if (isset($mapping['id']) && ! isset($get_data['edit_salesforce_mapping'])) {
+				require_once(plugin_dir_path(__FILE__) . '/../templates/admin/user-profile-salesforce.php');
+			} elseif ( ! empty($fieldmap)) { // is the user mapped to something already?
+				if (isset($get_data['edit_salesforce_mapping']) && 'true' === sanitize_key($get_data['edit_salesforce_mapping'])) {
+					require_once(plugin_dir_path(__FILE__) . '/../templates/admin/user-profile-salesforce-change.php');
 				} else {
-					require_once( plugin_dir_path( __FILE__ ) . '/../templates/admin/user-profile-salesforce-map.php' );
+					require_once(plugin_dir_path(__FILE__) . '/../templates/admin/user-profile-salesforce-map.php');
 				}
 			}
 		}
@@ -1892,10 +1892,10 @@ 
 	* @param int $user_id
 	*
 	*/
-	public function save_salesforce_user_fields( $user_id ) {
-		$post_data = filter_input_array( INPUT_POST, FILTER_SANITIZE_STRING );
-		if ( isset( $post_data['salesforce_update_mapped_user'] ) && '1' === rawurlencode( $post_data['salesforce_update_mapped_user'] ) ) {
-			$mapping_object                  = $this->mappings->get_object_maps(
+	public function save_salesforce_user_fields($user_id) {
+		$post_data = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+		if (isset($post_data['salesforce_update_mapped_user']) && '1' === rawurlencode($post_data['salesforce_update_mapped_user'])) {
+			$mapping_object = $this->mappings->get_object_maps(
 				array(
 					'wordpress_id'     => $user_id,
 					'wordpress_object' => 'user',
@@ -1903,14 +1903,14 @@ 
 			);
 			$mapping_object['salesforce_id'] = $post_data['salesforce_id'];
 
-			$result = $this->mappings->update_object_map( $mapping_object, $mapping_object['id'] );
-		} elseif ( isset( $post_data['salesforce_create_mapped_user'] ) && '1' === rawurlencode( $post_data['salesforce_create_mapped_user'] ) ) {
+			$result = $this->mappings->update_object_map($mapping_object, $mapping_object['id']);
+		} elseif (isset($post_data['salesforce_create_mapped_user']) && '1' === rawurlencode($post_data['salesforce_create_mapped_user'])) {
 			// if a Salesforce ID was entered
-			if ( isset( $post_data['salesforce_id'] ) && ! empty( $post_data['salesforce_id'] ) ) {
-				$mapping_object = $this->create_object_map( $user_id, 'user', $post_data['salesforce_id'] );
-			} elseif ( isset( $post_data['push_new_user_to_salesforce'] ) ) {
+			if (isset($post_data['salesforce_id']) && ! empty($post_data['salesforce_id'])) {
+				$mapping_object = $this->create_object_map($user_id, 'user', $post_data['salesforce_id']);
+			} elseif (isset($post_data['push_new_user_to_salesforce'])) {
 				// otherwise, create a new record in Salesforce
-				$result = $this->push_to_salesforce( 'user', $user_id );
+				$result = $this->push_to_salesforce('user', $user_id);
 			}
 		}
 	}
@@ -1920,29 +1920,29 @@ 
 	* @param array $tabs
 	* @param string $tab
 	*/
-	private function tabs( $tabs, $tab = '' ) {
+	private function tabs($tabs, $tab = '') {
 
-		$get_data        = filter_input_array( INPUT_GET, FILTER_SANITIZE_STRING );
+		$get_data        = filter_input_array(INPUT_GET, FILTER_SANITIZE_STRING);
 		$consumer_key    = $this->login_credentials['consumer_key'];
 		$consumer_secret = $this->login_credentials['consumer_secret'];
 		$callback_url    = $this->login_credentials['callback_url'];
 
 		$current_tab = $tab;
 		echo '<h2 class="nav-tab-wrapper">';
-		foreach ( $tabs as $tab_key => $tab_caption ) {
+		foreach ($tabs as $tab_key => $tab_caption) {
 			$active = $current_tab === $tab_key ? ' nav-tab-active' : '';
-			if ( 'settings' === $tab_key || ( isset( $consumer_key ) && isset( $consumer_secret ) && ! empty( $consumer_key ) && ! empty( $consumer_secret ) ) ) {
-				echo sprintf( '<a class="nav-tab%1$s" href="%2$s">%3$s</a>',
-					esc_attr( $active ),
-					esc_url( '?page=object-sync-salesforce-admin&tab=' . $tab_key ),
-					esc_html( $tab_caption )
+			if ('settings' === $tab_key || (isset($consumer_key) && isset($consumer_secret) && ! empty($consumer_key) && ! empty($consumer_secret))) {
+				echo sprintf('<a class="nav-tab%1$s" href="%2$s">%3$s</a>',
+					esc_attr($active),
+					esc_url('?page=object-sync-salesforce-admin&tab=' . $tab_key),
+					esc_html($tab_caption)
 				);
 			}
 		}
 		echo '</h2>';
 
-		if ( isset( $get_data['tab'] ) ) {
-			$tab = sanitize_key( $get_data['tab'] );
+		if (isset($get_data['tab'])) {
+			$tab = sanitize_key($get_data['tab']);
 		} else {
 			$tab = '';
 		}
@@ -1952,21 +1952,21 @@ 
 	* Clear schedule
 	* This clears the schedule if the user clicks the button
 	*/
-	private function clear_schedule( $schedule_name = '' ) {
-		if ( '' !== $schedule_name ) {
-			$schedule = $this->schedule( $schedule_name );
-			$schedule->cancel_by_name( $schedule_name );
+	private function clear_schedule($schedule_name = '') {
+		if ('' !== $schedule_name) {
+			$schedule = $this->schedule($schedule_name);
+			$schedule->cancel_by_name($schedule_name);
 			// translators: $schedule_name is the name of the current queue. Defaults: salesforce_pull, salesforce_push, salesforce
-			echo sprintf( esc_html__( 'You have cleared the %s schedule.', 'object-sync-for-salesforce' ), esc_html( $schedule_name ) );
+			echo sprintf(esc_html__('You have cleared the %s schedule.', 'object-sync-for-salesforce'), esc_html($schedule_name));
 		} else {
-			echo esc_html__( 'You need to specify the name of the schedule you want to clear.', 'object-sync-for-salesforce' );
+			echo esc_html__('You need to specify the name of the schedule you want to clear.', 'object-sync-for-salesforce');
 		}
 	}
 
-	private function get_schedule_count( $schedule_name = '' ) {
-		if ( '' !== $schedule_name ) {
-			$schedule = $this->schedule( $schedule_name );
-			return $this->schedule->count_queue_items( $schedule_name );
+	private function get_schedule_count($schedule_name = '') {
+		if ('' !== $schedule_name) {
+			$schedule = $this->schedule($schedule_name);
+			return $this->schedule->count_queue_items($schedule_name);
 		} else {
 			return 'unknown';
 		}
@@ -1975,12 +1975,12 @@ 
 	/**
 	* Load the schedule class
 	*/
-	private function schedule( $schedule_name ) {
-		if ( ! class_exists( 'Object_Sync_Sf_Schedule' ) && file_exists( plugin_dir_path( __FILE__ ) . '../vendor/autoload.php' ) ) {
-			require_once plugin_dir_path( __FILE__ ) . '../vendor/autoload.php';
-			require_once plugin_dir_path( __FILE__ ) . '../classes/schedule.php';
+	private function schedule($schedule_name) {
+		if ( ! class_exists('Object_Sync_Sf_Schedule') && file_exists(plugin_dir_path(__FILE__) . '../vendor/autoload.php')) {
+			require_once plugin_dir_path(__FILE__) . '../vendor/autoload.php';
+			require_once plugin_dir_path(__FILE__) . '../classes/schedule.php';
 		}
-		$schedule       = new Object_Sync_Sf_Schedule( $this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $schedule_name, $this->logging, $this->schedulable_classes );
+		$schedule       = new Object_Sync_Sf_Schedule($this->wpdb, $this->version, $this->login_credentials, $this->slug, $this->wordpress, $this->salesforce, $this->mappings, $schedule_name, $this->logging, $this->schedulable_classes);
 		$this->schedule = $schedule;
 		return $schedule;
 	}
@@ -2001,17 +2001,17 @@ 
 	*   This is the database row for the map object
 	*
 	*/
-	private function create_object_map( $wordpress_id, $wordpress_object, $salesforce_id, $action = '' ) {
+	private function create_object_map($wordpress_id, $wordpress_object, $salesforce_id, $action = '') {
 		// Create object map and save it
 		$mapping_object = $this->mappings->create_object_map(
 			array(
 				'wordpress_id'      => $wordpress_id, // wordpress unique id
 				'salesforce_id'     => $salesforce_id, // salesforce unique id. we don't care what kind of object it is at this point
 				'wordpress_object'  => $wordpress_object, // keep track of what kind of wp object this is
-				'last_sync'         => current_time( 'mysql' ),
+				'last_sync'         => current_time('mysql'),
 				'last_sync_action'  => $action,
 				'last_sync_status'  => $this->mappings->status_success,
-				'last_sync_message' => __( 'Mapping object updated via function: ', 'object-sync-for-salesforce' ) . __FUNCTION__,
+				'last_sync_message' => __('Mapping object updated via function: ', 'object-sync-for-salesforce') . __FUNCTION__,
 			)
 		);
 

classes/activate.php

Indentation +30 added lines, -30 removed lines

@@ -21,13 +21,13 @@ 
 	private $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;
@@ -39,8 +39,8 @@ 
 	}
 
 	/**
-	* Activation hooks
-	*/
+	 * Activation hooks
+	 */
 	private function add_actions() {
 
 		// on initial activation, run these hooks
@@ -53,8 +53,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__ ) );
@@ -63,10 +63,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();
@@ -127,12 +127,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
@@ -153,15 +153,15 @@ 
 	}
 
 	/**
-	* 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
-	*
-	* @param object $upgrader_object
-	* @param array $hook_extra
-	*
-	* See https://developer.wordpress.org/reference/hooks/upgrader_process_complete/
-	*
-	*/
+	 * 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
+	 *
+	 * @param object $upgrader_object
+	 * @param array $hook_extra
+	 *
+	 * See https://developer.wordpress.org/reference/hooks/upgrader_process_complete/
+	 *
+	 */
 	public function wordpress_salesforce_update_db_check( $upgrader_object, $hook_extra ) {
 		if ( get_site_option( 'object_sync_for_salesforce_db_version' ) !== $this->version ) {
 			$this->wordpress_salesforce_tables();

Spacing +24 added lines, -24 removed lines

@@ -5,7 +5,7 @@ 
  * @file
  */
 
-if ( ! class_exists( 'Object_Sync_Salesforce' ) ) {
+if ( ! class_exists('Object_Sync_Salesforce')) {
 	die();
 }
 
@@ -28,12 +28,12 @@ 
 	* @param string $slug
 	*
 	*/
-	public function __construct( $wpdb, $version, $slug ) {
+	public function __construct($wpdb, $version, $slug) {
 		$this->wpdb    = $wpdb;
 		$this->version = $version;
 		$this->slug    = $slug;
 
-		$this->installed_version = get_option( 'object_sync_for_salesforce_db_version', '' );
+		$this->installed_version = get_option('object_sync_for_salesforce_db_version', '');
 
 		$this->add_actions();
 	}
@@ -44,21 +44,21 @@ 
 	private function add_actions() {
 
 		// on initial activation, run these hooks
-		register_activation_hook( dirname( __DIR__ ) . '/' . $this->slug . '.php', array( $this, 'php_requirements' ) );
-		register_activation_hook( dirname( __DIR__ ) . '/' . $this->slug . '.php', array( $this, 'wordpress_salesforce_tables' ) );
-		register_activation_hook( dirname( __DIR__ ) . '/' . $this->slug . '.php', array( $this, 'add_roles_capabilities' ) );
+		register_activation_hook(dirname(__DIR__) . '/' . $this->slug . '.php', array($this, 'php_requirements'));
+		register_activation_hook(dirname(__DIR__) . '/' . $this->slug . '.php', array($this, 'wordpress_salesforce_tables'));
+		register_activation_hook(dirname(__DIR__) . '/' . $this->slug . '.php', array($this, 'add_roles_capabilities'));
 
 		// when users upgrade the plugin, run these hooks
-		add_action( 'upgrader_process_complete', array( $this, 'wordpress_salesforce_update_db_check' ), 10, 2 );
+		add_action('upgrader_process_complete', array($this, 'wordpress_salesforce_update_db_check'), 10, 2);
 	}
 
 	/**
 	* 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.');
 		}
 	}
 
@@ -111,18 +111,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));
 
 	}
 
@@ -136,17 +136,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');
 			}
 		}
 
@@ -162,8 +162,8 @@ 
 	* See https://developer.wordpress.org/reference/hooks/upgrader_process_complete/
 	*
 	*/
-	public function wordpress_salesforce_update_db_check( $upgrader_object, $hook_extra ) {
-		if ( get_site_option( 'object_sync_for_salesforce_db_version' ) !== $this->version ) {
+	public function wordpress_salesforce_update_db_check($upgrader_object, $hook_extra) {
+		if (get_site_option('object_sync_for_salesforce_db_version') !== $this->version) {
 			$this->wordpress_salesforce_tables();
 		}
 	}