Conjunto de cambios dafc8d8 en sipes para modules_contrib/cck/content.module

Fecha y hora:

26/05/2016 19:20:21 (hace 8 años)

Autor:

José Gregorio Puentes <jpuentes@…>

Branches:

stable, version-3.0

Children:

f3eebcf

Parents:

2efe680

Mensaje:

se actualizo el modulo

Fichero:

• modules_contrib/cck/content.module (modificado) (27 diferencias)

modules_contrib/cck/content.module

@@ -1 +1 @@
 <?php
-// $Id: content.module,v 1.301.2.123 2011/01/03 11:03:47 yched Exp $
 /**
  * @file
@@ -15 +14 @@
 define('CONTENT_HANDLE_CORE', 0x0001);
 define('CONTENT_HANDLE_MODULE', 0x0002);
+
+// We do not use hook_init(), since that hook is not fired in update.php, and we
+// need token generation to be active within hook_update_N() (e.g. for
+// node_save() calls.)
+require_once dirname(__FILE__) . '/includes/content.token.inc';
 
 function content_help($path, $arg) {
@@ -46 +50 @@
 function content_init() {
   drupal_add_css(drupal_get_path('module', 'content') .'/theme/content-module.css');
-  if (module_exists('token') && !function_exists('content_token_values')) {
-    module_load_include('inc', 'content', 'includes/content.token');
-  }
   if (module_exists('diff') && !function_exists('content_diff')) {
     module_load_include('inc', 'content', 'includes/content.diff');
@@ -175 +176 @@
 function content_theme() {
   $path = drupal_get_path('module', 'content') .'/theme';
-  require_once "./$path/theme.inc";
+  module_load_include('inc', 'content', 'theme/theme');
 
   return array(
@@ -267 +268 @@
  */
 function content_validate(&$node, $form = NULL) {
+  _content_field_invoke_default('validate', $node, $form);
   _content_field_invoke('validate', $node, $form);
-  _content_field_invoke_default('validate', $node, $form);
 }
 
@@ -334 +335 @@
   // Merge fields.
   $additions = _content_field_invoke_default('view', $node, $teaser, $page);
-  $node->content = array_merge((array) $node->content, $additions);
+  $old = isset($node->content) ? (array) $node->content : array();
+  $node->content = array_merge($old, $additions);
 }
 
@@ -478 +480 @@
 
 /**
+ * Proxy function to call content_multiple_value_after_build(), because it might
+ * not be included yet when the form is processed and invokes the callback.
+ */
+function content_multiple_value_after_build_proxy($elements, &$form_state) {
+  module_load_include('inc', 'content', 'includes/content.node_form');
+  return content_multiple_value_after_build($elements, $form_state);
+}
+
+/**
  * Theme an individual form element.
  *
@@ -497 +508 @@
         'colspan' => 2
       ),
-      t('Order'),
+      array('data' => t('Order'), 'class' => 'content-multiple-weight-header'),
     );
+    if ($field['multiple'] == 1) {
+      $header[] = array('data' => '<span>'. t('Remove') .'</span>', 'class' => 'content-multiple-remove-header');
+    }
     $rows = array();
 
@@ -506 +520 @@
     foreach (element_children($element) as $key) {
       if ($key !== $element['#field_name'] .'_add_more') {
-        $items[] = &$element[$key];
-      }
-    }
-    usort($items, '_content_sort_items_value_helper');
+        $items[$element[$key]['#delta']] = &$element[$key];
+      }
+    }
+    uasort($items, '_content_sort_items_value_helper');
 
     // Add the items as table rows.
-    foreach ($items as $key => $item) {
+    foreach ($items as $delta => $item) {
       $item['_weight']['#attributes']['class'] = $order_class;
       $delta_element = drupal_render($item['_weight']);
+      if ($field['multiple'] == 1) {
+        $remove_element = drupal_render($item['_remove']);
+      }
       $cells = array(
         array('data' => '', 'class' => 'content-multiple-drag'),
@@ -520 +537 @@
         array('data' => $delta_element, 'class' => 'delta-order'),
       );
-      $rows[] = array(
-        'data' => $cells,
-        'class' => 'draggable',
-      );
+      $row_class = 'draggable';
+      if ($field['multiple'] == 1) {
+        if (!empty($item['_remove']['#default_value'])) {
+          $row_class .= ' content-multiple-removed-row';
+        }
+        $cells[] = array('data' => $remove_element, 'class' => 'content-multiple-remove-cell');
+      }
+      $rows[] = array('data' => $cells, 'class' => $row_class);
     }
 
@@ -531 +552 @@
 
     drupal_add_tabledrag($table_id, 'order', 'sibling', $order_class);
+    drupal_add_js(drupal_get_path('module', 'content') .'/js/content.node_form.js');
   }
   else {
@@ -684 +706 @@
  *   );
  */
-function content_field($op, &$node, $field, &$items, $teaser, $page) {
+function content_field($op, &$node, $field, &$items, $teaser, $page, $wrappers = NULL) {
   switch ($op) {
     case 'validate':
-      // TODO: here we could validate that the number of multiple data is correct ?
-      // We're controlling the number of fields to fill out and saving empty
-      // ones if a specified number is requested, so no reason to do any validation
-      // here right now, but if later create a method to indicate whether
-      // 'required' means all values must be filled out, we can come back
-      // here and check that they're not empty.
+      // If the field is configured for multiple values and these are handled
+      // by content module, we need to filter out items flagged for removal and
+      // count non-empty items to enforce field requirement settings.
+      if ($field['multiple'] >= 1 && content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
+        module_load_include('inc', 'content', 'includes/content.node_form');
+        // Note that the $teaser argument for nodeapi('validate') is the $form.
+        content_multiple_value_nodeapi_validate($node, $field, $items, $teaser);
+      }
       break;
 
@@ -723 +747 @@
       }
 
-      // Filter out empty values.
+      // Filter out items flagged for removal.
       $items = content_set_empty($field, $items);
 
@@ -731 +755 @@
       $addition = array();
 
-      // Previewed nodes bypass the 'presave' op, so we need to some massaging.
-      if ($node->build_mode == NODE_BUILD_PREVIEW && content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
+      // Previewed nodes bypass the 'presave' op, so we need to do some massaging.
+      if ($node->build_mode == NODE_BUILD_PREVIEW) {
         if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
           // Reorder items to account for drag-n-drop reordering.
@@ -738 +762 @@
         }
 
-        // Filter out empty values.
+        // Filter out items flagged for removal.
         $items = content_set_empty($field, $items);
       }
@@ -777 +801 @@
 
         // Fill-in items.
-        foreach ($items as $delta => $item) {
+        foreach (array_keys($items) as $weight => $delta) {
           $element['items'][$delta] = array(
-            '#item' => $item,
-            '#weight' => $delta,
+            '#item' => $items[$delta],
+            '#weight' => $weight,
           );
         }
@@ -826 +850 @@
 
       // The location of the field's rendered output depends on whether the
-      // field is in a fieldgroup or not.
-      $wrapper = NULL;
-      if (isset($node->content[$field['field_name']])) {
-        $wrapper = $node->content[$field['field_name']];
-      }
-      elseif (module_exists('fieldgroup') && ($group_name = fieldgroup_get_group($node->type, $field['field_name'])) && isset($node->content[$group_name]['group'][$field['field_name']])) {
-        $wrapper = $node->content[$group_name]['group'][$field['field_name']];
-      }
-
-      if ($wrapper) {
+      // field is in a fieldgroup or not. _content_field_invoke_default() takes
+      // care of pre-searching all fields and providing the wrappers. In case of
+      // direct calls, search the wrappers ourselves.
+      if (is_null($wrappers)) {
+        $wrappers = content_get_nested_elements($node->content, $field['field_name']);
+      }
+
+      foreach ($wrappers as $wrapper) {
         $element = $wrapper['field'];
         // '#single' is not set if the field is hidden or inaccessible.
@@ -842 +864 @@
             // Single value formatter.
             foreach (element_children($element['items']) as $delta) {
-              // '#chilren' is not set if the field is empty.
+              // '#children' is not set if the field is empty.
               $items[$delta]['view'] = isset($element['items'][$delta]['#children']) ? $element['items'][$delta]['#children'] : '';
             }
@@ -860 +882 @@
     case 'preprocess_node':
       // Add $FIELD_NAME_rendered variables.
-      $addition = array();
+      $addition = array($field['field_name'] .'_rendered' => '');
 
       // The location of the field's rendered output depends on whether the
-      // field is in a fieldgroup or not.
-      $wrapper = NULL;
-      if (isset($node->content[$field['field_name']])) {
-        $wrapper = $node->content[$field['field_name']];
-      }
-      elseif (module_exists('fieldgroup') && ($group_name = fieldgroup_get_group($node->type, $field['field_name'])) && isset($node->content[$group_name]['group'][$field['field_name']])) {
-        $wrapper = $node->content[$group_name]['group'][$field['field_name']];
-      }
-
-      if ($wrapper) {
-        // '#chilren' is not set if the field is empty.
-        $addition[$field['field_name'] .'_rendered'] = isset($wrapper['#children']) ? $wrapper['#children'] : '';
-      }
-
+      // field is in a fieldgroup or not. _content_field_invoke_default() takes
+      // care of pre-searching all fields and providing the wrappers. In case of
+      // direct calls, search the wrappers ourselves.
+      if (is_null($wrappers)) {
+        $wrappers = content_get_nested_elements($node->content, $field['field_name']);
+      }
+      foreach ($wrappers as $wrapper) {
+        // '#children' is not set if the field is empty.
+        $addition[$field['field_name'] .'_rendered'] .= isset($wrapper['#children']) ? $wrapper['#children'] : '';
+      }
       return $addition;
 
@@ -889 +907 @@
 
 /**
- * Helper function to filter out empty values.
+ * Helper function to filter out items flagged for removal.
  *
  * On order to keep marker rows in the database, the function ensures
@@ -900 +918 @@
  */
 function content_set_empty($field, $items) {
-  // Filter out empty values.
+  // Prepare an empty item.
+  $empty = array();
+  foreach (array_keys($field['columns']) as $column) {
+    $empty[$column] = NULL;
+  }
+
+  // Filter out items flagged for removal.
   $filtered = array();
   $function = $field['module'] .'_content_is_empty';
   foreach ((array) $items as $delta => $item) {
-    if (!$function($item, $field)) {
-      $filtered[] = $item;
+    if (empty($item['_remove'])) {
+      $filtered[] = ($function($item, $field) ? $empty : $item);
     }
   }
 
   // Make sure we store the right number of 'empty' values.
-  $empty = array();
-  foreach (array_keys($field['columns']) as $column) {
-    $empty[$column] = NULL;
-  }
   $pad = $field['multiple'] > 1 ? $field['multiple'] : 1;
   $filtered = array_pad($filtered, $pad, $empty);
@@ -928 +948 @@
     usort($items, '_content_sort_items_helper');
     foreach ($items as $delta => $item) {
-      if (is_array($items[$delta])) {
+      if (is_array($item) && isset($item['_weight'])) {
         unset($items[$delta]['_weight']);
       }
@@ -1009 +1029 @@
               $additions[$field_name] = array();
             }
-            $additions[$field_name][] = $item;
+
+            // Preserve deltas when loading items from database.
+            if (isset($row['delta'])) {
+              // Make sure multiple value fields have consecutive deltas.
+              if ($row['delta'] > 0 && !isset($additions[$field_name][$row['delta']-1])) {
+                $empty = array();
+                foreach (array_keys($db_info['columns']) as $column) {
+                  $empty[$column] = NULL;
+                }
+                $next_delta = !empty($additions[$field_name]) ? (max(array_keys($additions[$field_name])) + 1) : 0;
+                for ($delta = $next_delta; $delta < $row['delta']; $delta++) {
+                  if (!isset($additions[$field_name][$delta])) {
+                    $additions[$field_name][$delta] = $empty;
+                  }
+                }
+              }
+              $additions[$field_name][$row['delta']] = $item;
+            }
+            else {
+              $additions[$field_name][] = $item;
+            }
           }
         }
@@ -1066 +1106 @@
             db_query('DELETE FROM {'. $db_info['table'] .'} WHERE vid = %d', $node->vid);
           }
+          // Collect records for non-empty items.
+          $function = $field['module'] .'_content_is_empty';
+          $records = array();
           foreach ($node->$field['field_name'] as $delta => $item) {
+            if (!$function($item, $field)) {
+              $record = array();
+              foreach ($db_info['columns'] as $column => $attributes) {
+                $record[$attributes['column']] = $item[$column];
+              }
+              $record['nid'] = $node->nid;
+              $record['vid'] = $node->vid;
+              $record['delta'] = $delta;
+              $records[] = $record;
+            }
+          }
+          // If there was no non-empty item, insert delta 0 with NULL values.
+          if (empty($records)) {
             $record = array();
             foreach ($db_info['columns'] as $column => $attributes) {
-              $record[$attributes['column']] = $item[$column];
+              $record[$attributes['column']] = NULL;
             }
             $record['nid'] = $node->nid;
             $record['vid'] = $node->vid;
-            $record['delta'] = $delta;
+            $record['delta'] = 0;
+            $records[] = $record;
+          }
+          // Insert the collected records for this field into database.
+          foreach ($records as $record) {
             content_write_record($db_info['table'], $record);
           }
@@ -1282 +1342 @@
   }
   else {
+    // The 'alter' and 'preprocess_node' ops need the location of each field
+    // within the $node->content array. Search once for all fields rather than
+    // letting content_field() search for each field individually.
+    if (in_array($op, array('alter', 'preprocess_node'))) {
+      $all_wrappers = content_get_nested_elements($node->content, array_keys($type['fields']));
+    }
     foreach ($type['fields'] as $field) {
       $items = isset($node->$field['field_name']) ? $node->$field['field_name'] : array();
-      $result = content_field($op, $node, $field, $items, $teaser, $page);
+      $wrappers = isset($all_wrappers) ? $all_wrappers[$field['field_name']] : NULL;
+      $result = content_field($op, $node, $field, $items, $teaser, $page, $wrappers);
       if (is_array($result)) {
         $return = array_merge($return, $result);
@@ -2682 +2749 @@
 }
 
- 
 /**
  * Helper function to identify inactive instances.
  * This will be the same results as content_inactive_fields(),
- * EXCEPT that his function will return inactive instances even 
+ * EXCEPT that his function will return inactive instances even
  * if the fields have other (shared) instances that are still active.
  */
@@ -2708 +2774 @@
   return $inactive;
 }
+
+/**
+ * Return the nested form elements for a field by name.
+ * This can be used either to retrieve the entire sub-element
+ * for a field by name, no matter how deeply nested it is within
+ * fieldgroups or multigroups, or to find the multiple value
+ * sub-elements within a field element by name (i.e. 'value' or
+ * 'nid'). You can also use this function to see if an item exists
+ * in a form (the return will be an empty array if it does not exist).
+ *
+ * A field/group will generally only exist once in a form but the
+ * function can also be used to locate all the 'value' elements
+ * within a multiple value field if you pass the multiple value field
+ * as the $form argument;
+ *
+ * For example, for a field named field_custom,  the following will
+ * pluck out the form element for this field from the node form,
+ * no matter how deeply it is nested within fieldgroups or fieldsets:
+ *
+ * $element = array_shift(content_get_nested_elements($node_form, 'field_custom'));
+ *
+ * You can prefix the function with '&' to retrieve the element by
+ * reference to alter it directly:
+ *
+ * $elements = &content_get_nested_elements($form, 'field_custom');
+ * foreach ($elements as $element) {
+ *   $element['#after_build'][] = 'my_field_afterbuild';
+ * }
+ *
+ * During the #after_build you could then do something like the
+ * following to alter each individual part of a multiple value field:
+ *
+ * $sub_elements = &content_get_nested_elements($element, 'value', 'all');
+ * foreach ($sub_elements as $sub_element) {
+ *   $sub_element['#element_validate'][] = 'custom_validation';
+ * }
+ *
+ * @param $form
+ *   The form array to search.
+ * @param $field_name
+ *   The key of the form elements to return (can be a field name, a group name,
+ *   or a sub-field), or an array of names.
+ * @return
+ *   An array of all matching form elements, returned by reference.
+ */
+function &content_get_nested_elements(&$form, $field_name) {
+  // Handle single-field and multi-fields calls.
+  if (is_array($field_name)) {
+    $single = FALSE;
+    $names = drupal_map_assoc($field_name);
+  }
+  else {
+    $single = TRUE;
+    $names = array($field_name => $field_name);
+  }
+
+  // Initialize the results array (array_fill_keys() is only available in PHP
+  // 5.2+).
+  $results = array();
+  foreach ($names as $name) {
+    $results[$name] = array();
+  }
+
+  // Search for the elements within the $form. Start at the top-level,
+  // sub-elements will be added as we walk the form.
+  $queue = array(&$form);
+  while ($current = &_content_shift($queue)) {
+    foreach (element_children($current) as $key) {
+      // If this is one of the elements we are looking for, push it in the
+      // results.
+      if (isset($names[$key])) {
+        $results[$key][] = &$current[$key];
+      }
+      // Else push the element in our search queue.
+      elseif (is_array($current[$key]) && !empty($current[$key])) {
+        $queue[] = &$current[$key];
+      }
+    }
+  }
+
+  return $single ? $results[$field_name] : $results;
+}
+
+/**
+ * Returns the first element of an array by reference.
+ *
+ * This is conceptually equivalent to PHP built-in array_shift, but the
+ * element is returned by reference to allow the caller to modify it.
+ *
+ * @param $array
+ *   The array whose first element's should be returned.
+ * @return mixed
+ *    A reference to the variable that was the first array element.
+ */
+function &_content_shift(&$array) {
+  reset($array);
+  $k = key($array);
+  $v = &$array[$k];
+  unset($array[$k]);
+  return $v;
+}
+
+/**
+ * Helper function to set a value in a form element,
+ * no matter how deeply nested it is in the form.
+ *
+ * @param $form
+ *   The form array to search.
+ * @param $field_name
+ *   The name or key of the form elements to return. Can be a field name, a group name, or a sub-field.
+ * @param $value
+ *   The value to set the element to. Should be an array that matches the part of the form that is being altered.
+ * @return
+ *   TRUE or FALSE, depending on whether the element was discovered and set.
+ */
+function content_set_nested_elements(&$form, $field_name, $value) {
+  $success = FALSE;
+  $elements = &content_get_nested_elements($form, $field_name);
+  if (!empty($elements)) {
+    foreach ($elements as &$element) {
+      $element = $value;
+      $success = TRUE;
+    }
+  }
+  return $success;
+}