uppdated modules

2017-01-22 16:19:36 +01:00
parent 03be8f82aa
commit 8416e3eea1
748 changed files with 32317 additions and 20900 deletions
@@ -155,6 +155,11 @@ function ctools_content_get_subtypes($type) {
  // Walk through the subtypes and ensure minimal settings are
  // retained.
  foreach ($subtypes as $id => $subtype) {
+    // Ensure that the 'subtype_id' value exists.
+    if (!isset($subtype['subtype_id'])) {
+      $subtype['subtype_id'] = $id;
+    }
+
    // Use exact name since this is a modify by reference.
    ctools_content_prepare_subtype($subtypes[$id], $plugin);
  }
@@ -217,6 +222,7 @@ function ctools_content_prepare_subtype(&$subtype, $plugin) {
    }
  }

+  // Trigger hook_ctools_content_subtype_alter().
  drupal_alter('ctools_content_subtype', $subtype, $plugin);
 }

@@ -241,8 +247,8 @@ function ctools_content_prepare_subtype(&$subtype, $plugin) {
 *   Any incoming content, if this display is a wrapper.
 *
 * @return
- *   The content as rendered by the plugin. This content should be an array
- *   with the following possible keys:
+ *   The content as rendered by the plugin, or NULL.
+ *   This content should be an object with the following possible properties:
 *   - title: The safe to render title of the content.
 *   - title_heading: The title heading.
 *   - content: The safe to render HTML content.
@@ -341,7 +347,16 @@ function ctools_content_editable($type, $subtype, $conf) {
    return FALSE;
  }

-  if ($function = ctools_plugin_get_function($subtype, 'check editable')) {
+  $function = FALSE;
+  
+  if (!empty($subtype['check editable'])) {
+    $function = ctools_plugin_get_function($subtype, 'check editable');
+  }
+  elseif (!empty($type['check editable'])) {
+    $function = ctools_plugin_get_function($type, 'check editable');
+  }
+
+  if ($function) {
    return $function($type, $subtype, $conf);
  }

@@ -23,12 +23,13 @@ function ctools_content_menu(&$items) {
 /**
 * Helper function for autocompletion of entity titles.
 */
-function ctools_content_autocomplete_entity($type, $string = '') {
+function ctools_content_autocomplete_entity($entity_type, $string = '') {
  if ($string != '') {
-    global $user;
-    $entity_info = entity_get_info($type);
-    if ($type == 'node') {
-      $entity_info['entity keys']['bundle field'] = 'type';
+    $entity_info = entity_get_info($entity_type);
+
+    if (!module_exists('entity')) {
+      module_load_include('inc', 'ctools', 'includes/entity-access');
+      _ctools_entity_access($entity_info, $entity_type);
    }

    // We must query all ids, because if every one of the 10 don't have access
@@ -42,25 +43,19 @@ function ctools_content_autocomplete_entity($type, $string = '') {
    // If an ID match was found, use that ID rather than the whole string.
    if ($match) {
      $entity_id = $preg_matches[1];
-      $entity = entity_load($type, array($entity_id));
-
-      // Format results in an array so later we could add attributes to the
-      // autocomplete text that is returned.
-      $results = array($entity_id => array(
-        'label' => $entity[$entity_id]->$entity_info['entity keys']['label'],
-      ));
+      $results = _ctools_getReferencableEntities($entity_type, $entity_info, $entity_id, '=', 1);
    }
    else {
-      $results = _ctools_getReferencableEntities($type, $entity_info, $string, 'LIKE', 10);
+      // We cannot find results if the entity doesn't have a label to search.
+      if (!isset($entity_info['entity keys']['label'])) {
+        drupal_json_output(array("[id: NULL]" => '<span class="autocomplete_title">' . t('Entity Type !entity_type does not support autocomplete search.', array('!entity_type' => $entity_type)) . '</span>'));
+        return;
+      }
+      $results = _ctools_getReferencableEntities($entity_type, $entity_info, $string, 'LIKE', 10);
    }
-    foreach($results as $entity_id => $result) {
-      if (!$entity_info['entity keys']['label']) {
-         $matches["[id: $entity_id]"] = '<span class="autocomplete_title">' . $entity_id . '</span>';
-      }
-      else {
-        $matches[$result['label'] . " [id: $entity_id]"] = '<span class="autocomplete_title">' . check_plain($result['label']) . '</span>';
-        $matches[$result['label'] . " [id: $entity_id]"] .= isset($result['bundle field']) ? ' <span class="autocomplete_bundle">(' . check_plain($result['bundle field']) . ')</span>' : '';
-      }
+    foreach ($results as $entity_id => $result) {
+      $matches[$result['label'] . " [id: $entity_id]"] = '<span class="autocomplete_title">' . check_plain($result['label']) . '</span>';
+      $matches[$result['label'] . " [id: $entity_id]"] .= isset($result['bundle']) ? ' <span class="autocomplete_bundle">(' . check_plain($result['bundle']) . ')</span>' : '';
    }

    drupal_json_output($matches);
@@ -73,53 +68,53 @@ function ctools_content_autocomplete_entity($type, $string = '') {
 */
 function _ctools_buildQuery($entity_type, $entity_info, $match = NULL, $match_operator = 'CONTAINS') {
  $base_table = $entity_info['base table'];
-    $query = db_select($base_table)
-      ->fields($base_table, array($entity_info['entity keys']['id']));
+  $label_key = $entity_info['entity keys']['label'];
+  $query = db_select($base_table)
+    ->fields($base_table, array($entity_info['entity keys']['id']));

-    if (isset($match)) {
-      if (isset($entity_info['entity keys']['label'])) {
-        $query->condition($base_table .'.'. $entity_info['entity keys']['label'], '%' . $match . '%' , $match_operator);
-      }
-    }
-
-    // Add a label to the query, if the label exists
-    if (isset($entity_info['entity keys']['label'])) {
-      $query->fields($base_table, array($entity_info['entity keys']['label']));
-    }
-
-    // Add bundle field to the query, if it exists.
-    if (isset($entity_info['entity keys']['bundle field'])) {
-      $query->fields($base_table, array($entity_info['entity keys']['bundle field']));
-    }
-
-    // Add a generic entity access tag to the query.
-    $query->addTag('ctools');
-
-    if($entity_type == 'comment') {
-      // Adding the 'comment_access' tag is sadly insufficient for comments: core
-      // requires us to also know about the concept of 'published' and
-      // 'unpublished'.
-      if (!user_access('administer comments')) {
-        $query->condition('comment.status', COMMENT_PUBLISHED);
-      }
-      // Join to a node if the user does not have node access bypass permissions
-      // to obey node published permissions
-      if (!user_access('bypass node access') && !count(module_implements('node_grants'))) {
-        $node_alias = $query->innerJoin('node', 'n', '%alias.nid = comment.nid');
-        $query->condition($node_alias . '.status', NODE_PUBLISHED);
-      }
-      $query->addTag('node_access');
+  if (isset($match)) {
+    if (isset($label_key)) {
+      $query->condition($base_table . '.' . $label_key, '%' . $match . '%', $match_operator);
    }
+    // This should never happen, but double check just in case.
    else {
-      $query->addTag($entity_type . '_access');
+      return array();
+    }
+  }
+  // Add a generic entity access tag to the query.
+  $query->addTag('ctools');
+
+  // We have to perform two checks. First check is a query alter (with tags)
+  // in an attempt to only return results that have access. However, this is
+  // not full-proof since entities many not implement hook_access query tag.
+  // This is why we have a second check after entity load, before we display
+  // the label of an entity.
+  if ($entity_type == 'comment') {
+    // Adding the 'comment_access' tag is sadly insufficient for comments: core 
+    // requires us to also know about the concept of 'published' and 
+    // 'unpublished'. 
+    if (!user_access('administer comments')) {
+      $query->condition('comment.status', COMMENT_PUBLISHED);
    }

-    // Add the sort option.
-    if(isset($entity_info['entity keys']['label'])) {
-      $query->orderBy($base_table .'.'. $entity_info['entity keys']['label'], 'ASC');
+    // Join to a node if the user does not have node access bypass permissions 
+    // to obey node published permissions 
+    if (!user_access('bypass node access')) {
+      $node_alias = $query->innerJoin('node', 'n', '%alias.nid = comment.nid');
+      $query->condition($node_alias . '.status', NODE_PUBLISHED);
    }
+    $query->addTag('node_access');
+  }
+  else {
+    $query->addTag($entity_type . '_access');
+  }

-    return $query;
+  // Add the sort option.
+  if (isset($label_key)) {
+    $query->orderBy($base_table . '.' . $label_key, 'ASC');
+  }
+
+  return $query;
 }

 /**
@@ -127,23 +122,58 @@ function _ctools_buildQuery($entity_type, $entity_info, $match = NULL, $match_op
 * Entity Reference module.
 */
 function _ctools_getReferencableEntities($entity_type, $entity_info, $match = NULL, $match_operator = 'LIKE', $limit = 0) {
+  global $user;
+  $account = $user;
  $options = array();
-
-  $query = _ctools_buildQuery($entity_type, $entity_info, $match, $match_operator);
-  if ($limit > 0) {
-    $query->range(0, $limit);
-  }
-
-  $results = $query->execute();
-
-  if (!empty($results)) {
-    foreach ($results as $record) {
-      $options[$record->{$entity_info['entity keys']['id']}] = array(
-        'label' => isset($entity_info['entity keys']['label']) ? check_plain($record->{$entity_info['entity keys']['label']}) : $record->{$entity_info['entity keys']['id']},
-        'bundle field' => isset($entity_info['entity keys']['bundle field']) ? check_plain($record->{$entity_info['entity keys']['bundle field']}) : '',
-      );
+  // We're an entity ID, return the id
+  if (is_numeric($match) && $match_operator == '=') {
+    if ($entity = array_shift(entity_load($entity_type, array($match)))) {
+      if (isset($entity_info['access callback']) && function_exists($entity_info['access callback'])) {
+        if ($entity_info['access callback']('view', $entity, $account, $entity_type)) {
+          $label = entity_label($entity_type, $entity);
+          return array(
+            $match => array(
+              'label' => !empty($label) ? $label : $entity->{$entity_info['entity keys']['id']},
+              'bundle' => !empty($entity_info['entity keys']['bundle']) ? check_plain($entity->{$entity_info['entity keys']['bundle']}) : NULL,
+            ),
+          );
+        }
+      }
    }
+    // If you don't have access, or an access callback or a valid entity, just
+    // Return back the Entity ID.
+    return array(
+      $match =>  array(
+        'label' => $match,
+        'bundle' => NULL,
+        ),
+    );
  }

-  return $options;
-}
+  // We have matches, build a query to fetch the result.
+  if ($query = _ctools_buildQuery($entity_type, $entity_info, $match, $match_operator)) {
+    if ($limit > 0) {
+      $query->range(0, $limit);
+    }
+
+    $results = $query->execute();
+
+    if (!empty($results)) {
+      foreach ($results as $record) {
+        $entities = entity_load($entity_type, array($record->{$entity_info['entity keys']['id']}));
+        $entity = array_shift($entities);
+        if (isset($entity_info['access callback']) && function_exists($entity_info['access callback'])) {
+          if ($entity_info['access callback']('view', $entity, $account, $entity_type)) {
+            $label = entity_label($entity_type, $entity);
+            $options[$record->{$entity_info['entity keys']['id']}] = array(
+              'label' => !empty($label) ? $label : $entity->{$entity_info['entity keys']['id']},
+              'bundle' => !empty($entity_info['entity keys']['bundle']) ? check_plain($entity->{$entity_info['entity keys']['bundle']}) : NULL,
+            );
+          }
+        }
+      }
+    }
+    return $options;
+  }
+  return array();
+}
@@ -367,7 +367,6 @@ function ctools_access_ajax_edit($fragment = NULL, $id = NULL) {
    'contexts' => $contexts,
    'title' => t('Edit criteria'),
    'ajax' => TRUE,
-    'ajax' => TRUE,
    'modal' => TRUE,
    'modal return' => TRUE,
  );
@@ -376,11 +376,11 @@ function ctools_context_ajax_item_add($mechanism = NULL, $type = NULL, $cache_ke
    'path' => "ctools/context/ajax/add/$mechanism/$type/$cache_key/$name/%step",
    'show cancel' => TRUE,
    'default form' => 'ctools_edit_context_form_defaults',
-    'auto caching' => TRUE,
+    'auto cache' => TRUE,
    'cache mechanism' => $mechanism,
    'cache key' => $cache_key,
    // This is stating what the cache will be referred to in $form_state
-    'cache storage' => 'object',
+    'cache location' => 'object',
  );

  if ($type == 'requiredcontext') {
@@ -561,11 +561,11 @@ function ctools_context_ajax_item_edit($mechanism = NULL, $type = NULL, $cache_k
    'path' => "ctools/context/ajax/configure/$mechanism/$type/$cache_key/$position/%step",
    'show cancel' => TRUE,
    'default form' => 'ctools_edit_context_form_defaults',
-    'auto caching' => TRUE,
+    'auto cache' => TRUE,
    'cache mechanism' => $mechanism,
    'cache key' => $cache_key,
    // This is stating what the cache will be referred to in $form_state
-    'cache storage' => 'object',
+    'cache location' => 'object',
  );

  if ($type == 'requiredcontext') {
@@ -736,6 +736,15 @@ function ctools_edit_context_form_defaults($form, &$form_state) {
    '#default_value' => $conf['keyword'],
  );

+  if ($type_info['key'] == 'requiredcontexts') {
+    $form['optional'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Context is optional'),
+      '#default_value' => !empty($form_state['conf']['optional']),
+      '#description' => t('This context need not be present for the component to function.'),
+    );
+  }
+
  $form['#submit'][] = 'ctools_edit_context_form_defaults_submit';

  return $form;
@@ -752,6 +761,9 @@ function ctools_edit_context_form_defaults_submit(&$form, &$form_state) {
    $form_state['conf']['default'] = $form_state['values']['default'];
    $form_state['conf']['title'] = $form_state['values']['title'];
  }
+  if ($form_state['type info']['key'] == 'requiredcontexts') {
+    $form_state['conf']['optional'] = $form_state['values']['optional'];
+  }

  $form_state['conf']['identifier'] = $form_state['values']['identifier'];
  $form_state['conf']['keyword'] = $form_state['values']['keyword'];
@@ -42,7 +42,7 @@ class ctools_context {
  var $restrictions = array();
  var $empty = FALSE;

-  function ctools_context($type = 'none', $data = NULL) {
+  function __construct($type = 'none', $data = NULL) {
    $this->type  = $type;
    $this->data  = $data;
    $this->title = t('Unknown context');
@@ -119,7 +119,7 @@ class ctools_context_required {
   * @param ...
   *   One or more keywords to use for matching which contexts are allowed.
   */
-  function ctools_context_required($title) {
+  function __construct($title) {
    $args = func_get_args();
    $this->title = array_shift($args);

@@ -204,10 +204,6 @@ class ctools_context_required {
 */
 class ctools_context_optional extends ctools_context_required {
  var $required = FALSE;
-  function ctools_context_optional() {
-    $args = func_get_args();
-    call_user_func_array(array($this, 'ctools_context_required'), $args);
-  }

  /**
   * Add the 'empty' context which is possible for optional
@@ -216,7 +212,7 @@ class ctools_context_optional extends ctools_context_required {
    $context = new ctools_context('any');
    $context->title      = t('No context');
    $context->identifier = t('No context');
-    $contexts = array_merge(array('empty' => $context), $contexts);
+    $contexts['empty'] = $context;
  }

  function filter($contexts) {
@@ -680,14 +676,19 @@ function ctools_context_keyword_substitute($string, $keywords, $contexts, $conve
        }
      }

-      if (empty($context_keywords[$context]) || !empty($context_keywords[$context]->empty)) {
-        $keywords['%' . $keyword] = '';
-      }
-      else if (!empty($converter)) {
-        $keywords['%' . $keyword] = ctools_context_convert_context($context_keywords[$context], $converter, $converter_options);
+      if (!isset($context_keywords[$context])) {
+        $keywords['%' . $keyword] = '%' . $keyword;
      }
      else {
-        $keywords['%' . $keyword] = $context_keywords[$keyword]->title;
+        if (empty($context_keywords[$context]) || !empty($context_keywords[$context]->empty)) {
+          $keywords['%' . $keyword] = '';
+        }
+        else if (!empty($converter)) {
+          $keywords['%' . $keyword] = ctools_context_convert_context($context_keywords[$context], $converter, $converter_options);
+        }
+        else {
+          $keywords['%' . $keyword] = $context_keywords[$keyword]->title;
+        }
      }
    }
  }
@@ -1163,7 +1164,7 @@ function ctools_context_match_required_contexts($required, $contexts) {
  }

  foreach ($required as $r) {
-    $context = clone(array_shift($contexts));
+    $context = clone array_shift($contexts);
    $context->identifier = $r['identifier'];
    $context->page_title = isset($r['title']) ? $r['title'] : '';
    $context->keyword    = $r['keyword'];
@@ -1505,7 +1506,7 @@ function ctools_access($settings, $contexts = array()) {
      return TRUE;
    }
    else if (!$pass && $settings['logic'] == 'and') {
-      // Fail if 'and' and htis rule failed.
+      // Fail if 'and' and this rule failed.
      return FALSE;
    }
  }
@@ -172,10 +172,12 @@ function ctools_css_cache($css, $filter = TRUE) {
  // @todo Is this slow? Does it matter if it is?
  $filename = $path . '/' . md5($css) . '.css';

-  // This will do renames if the file already exists, ensuring we don't
-  // accidentally overwrite other files who share the same md5. Yes this
-  // is a very miniscule chance but it's safe.
-  $filename = file_unmanaged_save_data($css, $filename);
+  // Generally md5 is considered unique enough to sign file downloads.
+  // So this replaces already existing files based on the assumption that two
+  // files with the same hash are identical content wise.
+  // If we rename, the cache folder can potentially fill up with thousands of
+  // files with the same content.
+  $filename = file_unmanaged_save_data($css, $filename, FILE_EXISTS_REPLACE);

  return $filename;
 }
@@ -0,0 +1,150 @@
+<?php
+
+/**
+ * @file
+ * Provides various callbacks for the whole core module integration.
+ * This is a copy of Entity API's functionality for use when Entity API isn't
+ * Enabled, and only works on view functions.
+ */
+
+/**
+ * Core hack to include entity api-esque 'access callback' functions to core
+ * entities without needing to rely on entity api.
+ * Exception: We don't touch file entity. You must have entity API enabled to
+ * view files.
+ */
+function _ctools_entity_access(&$entity_info, $entity_type) {
+  // If the access callback is already set, don't change anything.
+  if (isset($entity_info['access callback'])) {
+    return;
+  }
+
+  switch ($entity_type) {
+    case 'node':
+      // Sad panda, we don't use Entity API, lets manually add access callbacks.
+      $entity_info['access callback'] = 'ctools_metadata_no_hook_node_access';
+      break;
+    case 'user':
+      $entity_info['access callback'] = 'ctools_metadata_user_access';
+      break;
+    case 'comment':
+      if (module_exists('comment')) {
+        $entity_info['access callback'] = 'ctools_metadata_comment_access';
+      }
+      break;
+    case 'taxonomy_term':
+      if (module_exists('taxonomy')) {
+        $entity_info['access callback'] = 'ctools_metadata_taxonomy_access';
+      }
+      break;
+    case 'taxonomy_vocabulary':
+      if (module_exists('taxonomy')) {
+        $entity_info['access callback'] = 'ctools_metadata_taxonomy_access';
+      }
+      break;
+  }
+}
+
+/**
+ * Access callback for the node entity.
+ *
+ * This function does not implement hook_node_access(), thus it may not be
+ * called ctools_metadata_node_access().
+ *
+ * @see entity_access()
+ *
+ * @param $op
+ *   The operation being performed. One of 'view', 'update', 'create' or
+ *   'delete'.
+ * @param $node
+ *   A node to check access for. Must be a node object. Must have nid,
+ *   except in the case of 'create' operations.
+ * @param $account
+ *   The user to check for. Leave it to NULL to check for the global user.
+ *
+ * @throws EntityMalformedException
+ *
+ * @return boolean
+ *   TRUE if access is allowed, FALSE otherwise.
+ */
+function ctools_metadata_no_hook_node_access($op, $node = NULL, $account = NULL) {
+  // First deal with the case where a $node is provided.
+  if (isset($node)) {
+    // If a non-default revision is given, incorporate revision access.
+    $default_revision = node_load($node->nid);
+    if ($node->vid !== $default_revision->vid) {
+      return _node_revision_access($node, $op, $account);
+    }
+    else {
+      return node_access($op, $node, $account);
+    }
+  }
+  // No node is provided. Check for access to all nodes.
+  if (user_access('bypass node access', $account)) {
+    return TRUE;
+  }
+  if (!user_access('access content', $account)) {
+    return FALSE;
+  }
+  if ($op == 'view' && node_access_view_all_nodes($account)) {
+    return TRUE;
+  }
+  return FALSE;
+}
+
+/**
+ * Access callback for the user entity.
+ */
+function ctools_metadata_user_access($op, $entity = NULL, $account = NULL, $entity_type) {
+  $account = isset($account) ? $account : $GLOBALS['user'];
+  // Grant access to the users own user account and to the anonymous one.
+  if (isset($entity) && $op != 'delete' && (($entity->uid == $account->uid && $entity->uid) || (!$entity->uid && $op == 'view'))) {
+    return TRUE;
+  }
+  if (user_access('administer users', $account) || user_access('access user profiles', $account) && $op == 'view' && $entity->status) {
+    return TRUE;
+  }
+  return FALSE;
+}
+
+/**
+ * Access callback for the comment entity.
+ */
+function ctools_metadata_comment_access($op, $entity = NULL, $account = NULL) {
+  // When determining access to a comment, if comment has an associated node,
+  // the user must be able to view the node in order to access the comment.
+  if (isset($entity->nid)) {
+    if (!node_access('view', node_load($entity->nid), $account)) {
+      return FALSE;
+    }
+  }
+
+  // Comment administrators are allowed to perform all operations on all
+  // comments.
+  if (user_access('administer comments', $account)) {
+    return TRUE;
+  }
+
+  // Unpublished comments can never be accessed by non-admins.
+  if (isset($entity->status) && $entity->status == COMMENT_NOT_PUBLISHED) {
+    return FALSE;
+  }
+
+  if (user_access('access comments', $account) && $op == 'view') {
+    return TRUE;
+  }
+  return FALSE;
+}
+
+/**
+ * Access callback for the taxonomy entities.
+ */
+function ctools_metadata_taxonomy_access($op, $entity = NULL, $account = NULL, $entity_type) {
+  if ($entity_type == 'taxonomy_vocabulary') {
+    return user_access('administer taxonomy', $account);
+  }
+  if (user_access('administer taxonomy', $account) || user_access('access content', $account) && $op == 'view') {
+    return TRUE;
+  }
+  return FALSE;
+}
@@ -902,7 +902,8 @@ function ctools_export_object($table, $object, $indent = '', $identifier = NULL,
  $output = $indent . '$' . $identifier . ' = new ' . get_class($object) . "();\n";

  if ($schema['export']['can disable']) {
-    $output .= $indent . '$' . $identifier . '->disabled = FALSE; /* Edit this to true to make a default ' . $identifier . ' disabled initially */' . "\n";
+    $disabled = !isset($object->disabled) || $object->disabled != TRUE ? 'FALSE' : 'TRUE';
+    $output .= $indent . '$' . $identifier . '->disabled = ' . $disabled . '; /* Edit this to true to make a default ' . $identifier . ' disabled initially */' . "\n";
  }
  if (!empty($schema['export']['api']['current_version'])) {
    $output .= $indent . '$' . $identifier . '->api_version = ' . $schema['export']['api']['current_version'] . ";\n";
@@ -1227,7 +1228,7 @@ function ctools_export_default_to_hook_code($schema, $table, $names, $name) {
    $output .= "  \${$export['identifier']}s = array();\n\n";
    foreach ($objects as $object) {
      $output .= ctools_export_crud_export($table, $object, '  ');
-      $output .= "  \${$export['identifier']}s['" . check_plain($object->$export['key']) . "'] = \${$export['identifier']};\n\n";
+      $output .= "  \${$export['identifier']}s['" . check_plain($object->{$export['key']}) . "'] = \${$export['identifier']};\n\n";
    }
    $output .= "  return \${$export['identifier']}s;\n";
    $output .= "}\n";
@@ -137,7 +137,7 @@ function ctools_fields_get_field_formatter_settings_form($field, $formatter_type
 */
 function ctools_fields_get_field_formatter_info($fields) {
  $info = array();
-  $field_info = module_invoke_all('field_formatter_info');
+  $field_info = field_info_formatter_types();
  foreach ($fields as $field) {
    foreach ($field_info as $format_name => $formatter_info) {
      if (in_array($field['type'], $formatter_info['field types'])) {
@@ -145,7 +145,6 @@ function ctools_fields_get_field_formatter_info($fields) {
      }
    }
  }
-  drupal_alter('field_formatter_info', $info);
  return $info;
 }

@@ -51,7 +51,7 @@ function ctools_jump_menu($form, &$form_state, $select, $options = array()) {
    'hide' => TRUE,
  );

-  ctools_add_js('jump-menu');
+  $form['#attached']['js'][] = ctools_attach_js('jump-menu');

  if (!empty($options['choose'])) {
    $select = array('' => $options['choose']) + $select;
@@ -99,7 +99,7 @@ class ctools_math_expr {
        'sqrt','abs','ln','log',
        'time', 'ceil', 'floor', 'min', 'max', 'round');

-    function ctools_math_expr() {
+    function __construct() {
        // make the variables a little more accurate
        $this->v['pi'] = pi();
        $this->v['e'] = exp(1);
@@ -271,7 +271,7 @@ class ctools_math_expr {
            } elseif (in_array($op, $ops) and !$expecting_op) {
                return $this->trigger("unexpected operator '$op'");
            } else { // I don't even want to know what you did to get here
-                return $this->trigger("an unexpected error occured");
+                return $this->trigger("an unexpected error occurred");
            }
            if ($index == strlen($expr)) {
                if (in_array($op, $ops)) { // did we end with an operator? bad.
@@ -66,6 +66,7 @@ function ctools_modal_add_js() {
  drupal_add_library('system', 'jquery.form');
  drupal_add_library('system', 'drupal.progress');
  drupal_add_library('system', 'drupal.ajax');
+  drupal_add_library('system', 'ui');
  ctools_add_js('modal');

  ctools_add_css('modal');
@@ -79,7 +79,9 @@ function ctools_plugin_api_info($owner, $api, $minimum_version, $current_version
      }

      // Only process if version is between minimum and current, inclusive.
-      if (version_compare($version, $minimum_version, '>=') && version_compare($version, $current_version, '<=')) {
+      if (($version == $minimum_version) || ($version == $current_version)
+        || (version_compare($version, $minimum_version, '>=')
+        && version_compare($version, $current_version, '<='))) {
        if (!isset($info['path'])) {
          $info['path'] = drupal_get_path('module', $module);
        }
@@ -110,7 +112,7 @@ function ctools_plugin_api_info($owner, $api, $minimum_version, $current_version
    }

    // Allow other modules to hook in.
-    drupal_alter($hook, $cache[$owner][$api]);
+    drupal_alter($hook, $cache[$owner][$api], $owner, $api);
  }

  return $cache[$owner][$api];
@@ -198,22 +200,22 @@ function ctools_plugin_api_get_hook($owner, $api) {
 /**
 * Fetch a group of plugins by name.
 *
- * @param $module
- *   The name of the module that utilizes this plugin system. It will be
- *   used to call hook_ctools_plugin_$plugin() to get more data about the plugin.
- * @param $type
+ * @param string $module
+ *   The name of the module that utilizes this plugin system. It will be used to
+ *   get more data about the plugin as defined on hook_ctools_plugin_type().
+ * @param string $type
 *   The type identifier of the plugin.
- * @param $id
+ * @param string $id
 *   If specified, return only information about plugin with this identifier.
 *   The system will do its utmost to load only plugins with this id.
 *
- * @return
- *   An array of information arrays about the plugins received. The contents
- *   of the array are specific to the plugin.
+ * @return array
+ *   An array of information arrays about the plugins received. The contents of
+ *   the array are specific to the plugin.
 */
 function ctools_get_plugins($module, $type, $id = NULL) {
  // Store local caches of plugins and plugin info so we don't have to do full
-  // lookups everytime.
+  // lookups every time.
  static $drupal_static_fast;
  if (!isset($drupal_static_fast)) {
    $drupal_static_fast['plugins'] = &drupal_static('ctools_plugins', array());
@@ -222,10 +224,14 @@ function ctools_get_plugins($module, $type, $id = NULL) {

  $info = ctools_plugin_get_plugin_type_info();

-  // Bail out noisily if an invalid module/type combination is requested.
  if (!isset($info[$module][$type])) {
-    watchdog('ctools', 'Invalid plugin module/type combination requested: module @module and type @type', array('@module' => $module, '@type' => $type), WATCHDOG_ERROR);
-    return array();
+    // If we don't find the plugin we attempt a cache rebuild before bailing out
+    $info = ctools_plugin_get_plugin_type_info(TRUE);
+    // Bail out noisily if an invalid module/type combination is requested.
+    if (!isset($info[$module][$type])) {
+      watchdog('ctools', 'Invalid plugin module/type combination requested: module @module and type @type', array('@module' => $module, '@type' => $type), WATCHDOG_ERROR);
+      return array();
+    }
  }

  // Make sure our plugins array is populated.
@@ -233,8 +239,8 @@ function ctools_get_plugins($module, $type, $id = NULL) {
    $plugins[$module][$type] = array();
  }

-  // Attempt to shortcut this whole piece of code if we already have
-  // the requested plugin:
+  // Attempt to shortcut this whole piece of code if we already have the
+  // requested plugin:
  if ($id && array_key_exists($id, $plugins[$module][$type])) {
    return $plugins[$module][$type][$id];
  }
@@ -269,8 +275,8 @@ function ctools_get_plugins($module, $type, $id = NULL) {
    $plugins[$module][$type] = ctools_plugin_load_hooks($info[$module][$type]);
  }

-  // Then see if we should load all files. We only do this if we
-  // want a list of all plugins or there was a cache miss.
+  // Then see if we should load all files. We only do this if we want a list of
+  // all plugins or there was a cache miss.
  if (empty($setup[$module][$type]) && ($build_cache || !$id)) {
    $setup[$module][$type] = TRUE;
    $plugins[$module][$type] = array_merge($plugins[$module][$type], ctools_plugin_load_includes($info[$module][$type]));
@@ -294,8 +300,8 @@ function ctools_get_plugins($module, $type, $id = NULL) {
  }


-  // If we were told earlier that this is cacheable and the cache was
-  // empty, give something back.
+  // If we were told earlier that this is cacheable and the cache was empty,
+  // give something back.
  if ($build_cache) {
    cache_set("plugins:$module:$type", $plugins[$module][$type], $info[$module][$type]['cache table']);
  }
@@ -472,7 +478,7 @@ function ctools_plugin_load_includes($info, $filename = NULL) {
        }
        else {

-          require_once DRUPAL_ROOT . '/' . $file->uri;
+          include_once DRUPAL_ROOT . '/' . $file->uri;
          // .inc files have a special format for the hook identifier.
          // For example, 'foo.inc' in the module 'mogul' using the plugin
          // whose hook is named 'borg_type' should have a function named (deep breath)
@@ -500,7 +500,7 @@ class ctools_stylizer_image_processor {
    $palette[$luminosity_input]['green'] = $green;
    $palette[$luminosity_input]['blue'] = $blue;

-    // Now we complete the palette, first we'll do it tothe black, and then to
+    // Now we complete the palette, first we'll do it to the black, and then to
    // the white.

    // From input to black
@@ -9,7 +9,9 @@
 /**
 * Pattern for detecting a valid UUID.
 */
-define('UUID_PATTERN', '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}');
+if (!defined('UUID_PATTERN')) {
+  define('UUID_PATTERN', '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}');
+}

 /**
 * Generates a UUID using the Windows internal GUID generator.
@@ -25,7 +27,8 @@ function _ctools_uuid_generate_com() {
 * Generates an universally unique identifier using the PECL extension.
 */
 function _ctools_uuid_generate_pecl() {
-  return uuid_create(UUID_TYPE_DEFAULT);
+  $uuid_type = UUID_TYPE_DEFAULT;
+  return uuid_create($uuid_type);
 }

 /**