Using libraries_get_path() in a define() call is a potential issue.

kostajh:

Just a thought, this breaks if you are using a multi-site install and don't have libraries installed.

We should do something like the below - it should work for multi-site, install profiles, and normal sites. Also, should be reasonably performant if variable_set() and variable_get() work in this context. Finally, would remove the need for Libraries altogether as it checks the same paths in the same order.

Sorry for not providing the below as a patch - it started as 'back of envelope' code to illustrate what I was trying to describe, and bloomed into below. I can set up the salesforce repo and create it as a patch if necessary.

$toolkit_path = salesforce_api_locate_toolkit();
define('SALESFORCE_DIR_TOOLKIT', $toolkit_path);

/**
 * Locates the salesforce toolkit api, if installed.
 */
function salesforce_api_locate_toolkit() {
  $toolkit_path = variable_get('salesforce_toolkit_path', '');

  // If the toolkit path is not set or is no longer valid, try to find it.
  if ($toolkit_path == '' || !file_exists($toolkit_path)) {

    $profile = drupal_get_profile();
    $config = conf_path();

    // First check if this was provided along with the profile.
    if (file_exists("profiles/$profile/libraries/salesforce/toolkit")) {
      $toolkit_path = "profiles/$profile/libraries/salesforce/toolkit";
    }
    
    // Check the sites/all directory.
    else if (file_exists("sites/all/libraries/salesforce/toolkit")) {
      $toolkit_path = "sites/all/libraries/salesforce/toolkit";
    }
    
    // Now check our current site directory (if multisite).
    else if (file_exists("$config/libraries/salesforce/toolkit")) {
        $toolkit_path = "$config/libraries/salesforce/toolkit";
    }
    
    // Toolkit not installed.
    else {
      $toolkit_path = "";
    }
    
    variable_set($toolkit_path);
  }

  return $toolkit_path;
}