BOINC / boinc

drupal/sites/default/boinc/modules/contrib/cck/modules/optionwidgets/optionwidgets.module

Indentation +168 added lines, -168 removed lines

@@ -10,8 +10,8 @@ 
  * Implementation of hook_form_alter.
  */
 function optionwidgets_form_alter(&$form, $form_state, $form_id) {
-  // Provide additional help for the field settings form.
-  if ($form_id == 'content_field_edit_form' && isset($form['widget'])) {
+    // Provide additional help for the field settings form.
+    if ($form_id == 'content_field_edit_form' && isset($form['widget'])) {
     $widget_type = $form['#field']['widget']['type'];
     $field_type = $form['#field']['type'];
     $label = $form['#field']['widget']['label'];
@@ -19,45 +19,45 @@ 
     $output = '<p>'. t('Create a list of options as a list in <strong>Allowed values list</strong> or as an array in PHP code. These values will be the same for %field in all content types.', array('%field' => $label)) .'</p>';
 
     if ($widget_type == 'optionwidgets_onoff') {
-      $output .= '<p>'. t("For a 'single on/off checkbox' widget, define the 'off' value first, then the 'on' value in the <strong>Allowed values</strong> section. Note that the checkbox will be labeled with the label of the 'on' value.") .'</p>';
+        $output .= '<p>'. t("For a 'single on/off checkbox' widget, define the 'off' value first, then the 'on' value in the <strong>Allowed values</strong> section. Note that the checkbox will be labeled with the label of the 'on' value.") .'</p>';
     }
     elseif ($widget_type == 'optionwidgets_buttons') {
-      $output .= '<p>'. t("The 'checkboxes/radio buttons' widget will display checkboxes if the multiple values option is selected for this field, otherwise radios will be displayed.") .'</p>';
+        $output .= '<p>'. t("The 'checkboxes/radio buttons' widget will display checkboxes if the multiple values option is selected for this field, otherwise radios will be displayed.") .'</p>';
     }
 
     if (in_array($field_type, array('text', 'number_integer', 'number_float', 'number_decimal'))
     && in_array($widget_type, array('optionwidgets_onoff', 'optionwidgets_buttons', 'optionwidgets_select'))) {
-      $form['field']['allowed_values_fieldset']['#collapsed'] = FALSE;
-      $form['field']['allowed_values_fieldset']['#description'] = $output;
+        $form['field']['allowed_values_fieldset']['#collapsed'] = FALSE;
+        $form['field']['allowed_values_fieldset']['#description'] = $output;
 
-      // If no 'allowed values' were set yet, add a remainder in the messages area.
-      if (empty($form_state['post'])
+        // If no 'allowed values' were set yet, add a remainder in the messages area.
+        if (empty($form_state['post'])
       && empty($form['field']['allowed_values_fieldset']['allowed_values']['#default_value'])
       && empty($form['field']['allowed_values_fieldset']['advanced_options']['allowed_values_php']['#default_value'])) {
         drupal_set_message(t("You need to specify the 'allowed values' for this field."), 'warning');
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_theme().
  */
 function optionwidgets_theme() {
-  return array(
+    return array(
     'optionwidgets_select' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'optionwidgets_buttons' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'optionwidgets_onoff' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'optionwidgets_none' => array(
-      'arguments' => array('widget_type' => NULL, 'field_name' => NULL, 'node_type' => NULL),
-      ),
-  );
+        'arguments' => array('widget_type' => NULL, 'field_name' => NULL, 'node_type' => NULL),
+        ),
+    );
 }
 
 /**
@@ -75,32 +75,32 @@ 
  */
 function optionwidgets_widget_info() {
 
-  return array(
+    return array(
     'optionwidgets_select' => array(
-      'label' => t('Select list'),
-      'field types' => array('text', 'number_integer', 'number_decimal', 'number_float'),
-      'multiple values' => CONTENT_HANDLE_MODULE,
-      'callbacks' => array(
+        'label' => t('Select list'),
+        'field types' => array('text', 'number_integer', 'number_decimal', 'number_float'),
+        'multiple values' => CONTENT_HANDLE_MODULE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
     'optionwidgets_buttons' => array(
-      'label' => t('Check boxes/radio buttons'),
-      'field types' => array('text', 'number_integer', 'number_decimal', 'number_float'),
-      'multiple values' => CONTENT_HANDLE_MODULE,
-      'callbacks' => array(
+        'label' => t('Check boxes/radio buttons'),
+        'field types' => array('text', 'number_integer', 'number_decimal', 'number_float'),
+        'multiple values' => CONTENT_HANDLE_MODULE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
     'optionwidgets_onoff' => array(
-      'label' => t('Single on/off checkbox'),
-      'field types' => array('text', 'number_integer', 'number_decimal', 'number_float'),
-      'multiple values' => CONTENT_HANDLE_MODULE,
-      'callbacks' => array(
+        'label' => t('Single on/off checkbox'),
+        'field types' => array('text', 'number_integer', 'number_decimal', 'number_float'),
+        'multiple values' => CONTENT_HANDLE_MODULE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
@@ -113,22 +113,22 @@ 
  * the same name as the hook_elements key.
  */
 function optionwidgets_elements() {
-  return array(
+    return array(
     'optionwidgets_select' => array(
-      '#input' => TRUE,
-      '#columns' => array('value'), '#delta' => 0,
-      '#process' => array('optionwidgets_select_process'),
-      ),
+        '#input' => TRUE,
+        '#columns' => array('value'), '#delta' => 0,
+        '#process' => array('optionwidgets_select_process'),
+        ),
     'optionwidgets_buttons' => array(
-      '#input' => TRUE,
-      '#columns' => array('value'), '#delta' => 0,
-      '#process' => array('optionwidgets_buttons_process'),
-      ),
+        '#input' => TRUE,
+        '#columns' => array('value'), '#delta' => 0,
+        '#process' => array('optionwidgets_buttons_process'),
+        ),
     'optionwidgets_onoff' => array(
-      '#input' => TRUE,
-      '#columns' => array('value'), '#delta' => 0,
-      '#process' => array('optionwidgets_onoff_process'),
-      ),
+        '#input' => TRUE,
+        '#columns' => array('value'), '#delta' => 0,
+        '#process' => array('optionwidgets_onoff_process'),
+        ),
     );
 }
 
@@ -164,11 +164,11 @@ 
  *   the form item for a single element for this field
  */
 function optionwidgets_widget(&$form, &$form_state, $field, $items, $delta = NULL) {
-  $element = array(
+    $element = array(
     '#type' => $field['widget']['type'],
     '#default_value' => !empty($items) ? $items : array(),
-  );
-  return $element;
+    );
+    return $element;
 }
 
 /**
@@ -180,17 +180,17 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function optionwidgets_buttons_process($element, $edit, &$form_state, $form) {
-  $field_name = $element['#field_name'];
-  $field = $form['#field_info'][$field_name];
-  $field_key  = $element['#columns'][0];
+    $field_name = $element['#field_name'];
+    $field = $form['#field_info'][$field_name];
+    $field_key  = $element['#columns'][0];
 
-  // See if this element is in the database format or the transformed format,
-  // and transform it if necessary.
-  if (is_array($element['#value']) && !array_key_exists($field_key, $element['#value'])) {
+    // See if this element is in the database format or the transformed format,
+    // and transform it if necessary.
+    if (is_array($element['#value']) && !array_key_exists($field_key, $element['#value'])) {
     $element['#value'] = optionwidgets_data2form($element, $element['#default_value'], $field);
-  }
-  $options = optionwidgets_options($field);
-  $element[$field_key] = array(
+    }
+    $options = optionwidgets_options($field);
+    $element[$field_key] = array(
     '#type' => $field['multiple'] ? 'checkboxes' : 'radios',
     '#title' => $element['#title'],
     '#description' => $element['#description'],
@@ -198,19 +198,19 @@ 
     '#multiple' => isset($element['#multiple']) ? $element['#multiple'] : $field['multiple'],
     '#options' => $options,
     '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : NULL,
-  );
+    );
 
-  // Set #element_validate in a way that it will not wipe out other
-  // validation functions already set by other modules.
-  if (empty($element['#element_validate'])) {
+    // Set #element_validate in a way that it will not wipe out other
+    // validation functions already set by other modules.
+    if (empty($element['#element_validate'])) {
     $element['#element_validate'] = array();
-  }
-  array_unshift($element['#element_validate'], 'optionwidgets_validate');
+    }
+    array_unshift($element['#element_validate'], 'optionwidgets_validate');
 
-  // Make sure field info will be available to the validator which
-  // does not get the values in $form.
-  $form_state['#field_info'][$field['field_name']] = $field;
-  return $element;
+    // Make sure field info will be available to the validator which
+    // does not get the values in $form.
+    $form_state['#field_info'][$field['field_name']] = $field;
+    return $element;
 }
 
 /**
@@ -222,23 +222,23 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function optionwidgets_select_process($element, $edit, &$form_state, $form) {
-  $field_name = $element['#field_name'];
-  $field = $form['#field_info'][$field_name];
-  $field_key  = $element['#columns'][0];
+    $field_name = $element['#field_name'];
+    $field = $form['#field_info'][$field_name];
+    $field_key  = $element['#columns'][0];
 
-  // See if this element is in the database format or the transformed format,
-  // and transform it if necessary.
-  if (is_array($element['#value']) && !array_key_exists($field_key, $element['#value'])) {
+    // See if this element is in the database format or the transformed format,
+    // and transform it if necessary.
+    if (is_array($element['#value']) && !array_key_exists($field_key, $element['#value'])) {
     $element['#value'] = optionwidgets_data2form($element, $element['#default_value'], $field);
-  }
+    }
 
-  $options = optionwidgets_options($field, FALSE);
+    $options = optionwidgets_options($field, FALSE);
 
-  // For this specific widget, HTML should be filtered out and entities left unencoded.
-  // See content_allowed_values / content_filter_xss / filter_xss.
-  content_allowed_values_filter_html($options);
+    // For this specific widget, HTML should be filtered out and entities left unencoded.
+    // See content_allowed_values / content_filter_xss / filter_xss.
+    content_allowed_values_filter_html($options);
 
-  $element[$field_key] = array(
+    $element[$field_key] = array(
     '#type' => 'select',
     '#title' => $element['#title'],
     '#description' => $element['#description'],
@@ -246,24 +246,24 @@ 
     '#multiple' => isset($element['#multiple']) ? $element['#multiple'] : $field['multiple'],
     '#options' => $options,
     '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : NULL,
-  );
+    );
 
-  // Set #element_validate in a way that it will not wipe out other
-  // validation functions already set by other modules.
-  if (empty($element['#element_validate'])) {
+    // Set #element_validate in a way that it will not wipe out other
+    // validation functions already set by other modules.
+    if (empty($element['#element_validate'])) {
     $element['#element_validate'] = array();
-  }
-  array_unshift($element['#element_validate'], 'optionwidgets_validate');
-
-  // Make sure field info will be available to the validator which
-  // does not get the values in $form.
-
-  // TODO for some reason putting the $field array into $form_state['storage']
-  // causes the node's hook_form_alter to be invoked twice, garbling the
-  // results. Need to investigate why that is happening (a core bug?), but
-  // in the meantime avoid using $form_state['storage'] to store anything.
-  $form_state['#field_info'][$field['field_name']] = $field;
-  return $element;
+    }
+    array_unshift($element['#element_validate'], 'optionwidgets_validate');
+
+    // Make sure field info will be available to the validator which
+    // does not get the values in $form.
+
+    // TODO for some reason putting the $field array into $form_state['storage']
+    // causes the node's hook_form_alter to be invoked twice, garbling the
+    // results. Need to investigate why that is happening (a core bug?), but
+    // in the meantime avoid using $form_state['storage'] to store anything.
+    $form_state['#field_info'][$field['field_name']] = $field;
+    return $element;
 }
 
 /**
@@ -275,64 +275,64 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function optionwidgets_onoff_process($element, $edit, &$form_state, $form) {
-  $field_name = $element['#field_name'];
-  $field = $form['#field_info'][$field_name];
-  $field_key  = $element['#columns'][0];
+    $field_name = $element['#field_name'];
+    $field = $form['#field_info'][$field_name];
+    $field_key  = $element['#columns'][0];
 
-  // See if this element is in the database format or the transformed format,
-  // and transform it if necessary.
-  if (is_array($element['#value']) && !array_key_exists($field_key, $element['#value'])) {
+    // See if this element is in the database format or the transformed format,
+    // and transform it if necessary.
+    if (is_array($element['#value']) && !array_key_exists($field_key, $element['#value'])) {
     $element['#value'] = optionwidgets_data2form($element, $element['#default_value'], $field);
-  }
-  $options = optionwidgets_options($field);
-  $keys = array_keys($options);
-  $on_value = (!empty($keys) && isset($keys[1])) ? $keys[1] : NULL;
-  $element[$field_key] = array(
+    }
+    $options = optionwidgets_options($field);
+    $keys = array_keys($options);
+    $on_value = (!empty($keys) && isset($keys[1])) ? $keys[1] : NULL;
+    $element[$field_key] = array(
     '#type' => 'checkbox',
     '#title' => isset($options[$on_value]) ? $options[$on_value] : '',
     '#description' => $element['#description'],
     '#required' => isset($element['#required']) ? $element['#required'] : $field['required'],
     '#default_value' => isset($element['#value'][$field_key][0]) ? $element['#value'][$field_key][0] == $on_value : FALSE,
     '#return_value' => $on_value,
-  );
+    );
 
-  // Set #element_validate in a way that it will not wipe out other
-  // validation functions already set by other modules.
-  if (empty($element['#element_validate'])) {
+    // Set #element_validate in a way that it will not wipe out other
+    // validation functions already set by other modules.
+    if (empty($element['#element_validate'])) {
     $element['#element_validate'] = array();
-  }
-  array_unshift($element['#element_validate'], 'optionwidgets_validate');
+    }
+    array_unshift($element['#element_validate'], 'optionwidgets_validate');
 
-  // Make sure field info will be available to the validator which
-  // does not get the values in $form.
-  $form_state['#field_info'][$field['field_name']] = $field;
-  return $element;
+    // Make sure field info will be available to the validator which
+    // does not get the values in $form.
+    $form_state['#field_info'][$field['field_name']] = $field;
+    return $element;
 }
 
 /**
  * FAPI function to validate optionwidgets element.
  */
 function optionwidgets_validate($element, &$form_state) {
-  // Transpose selections from field => delta to delta => field,
-  // turning multiple selected options into multiple parent elements.
-  // Immediate parent is the delta, need to get back to parent's parent
-  // to create multiple elements.
-  $field = $form_state['#field_info'][$element['#field_name']];
-  $items = optionwidgets_form2data($element, $field);
-  form_set_value($element, $items, $form_state);
-
-  // Check we don't exceed the allowed number of values.
-  if ($field['multiple'] >= 2) {
+    // Transpose selections from field => delta to delta => field,
+    // turning multiple selected options into multiple parent elements.
+    // Immediate parent is the delta, need to get back to parent's parent
+    // to create multiple elements.
+    $field = $form_state['#field_info'][$element['#field_name']];
+    $items = optionwidgets_form2data($element, $field);
+    form_set_value($element, $items, $form_state);
+
+    // Check we don't exceed the allowed number of values.
+    if ($field['multiple'] >= 2) {
     // Filter out 'none' value (if present, will always be in key 0)
     $field_key = $element['#columns'][0];
     if (isset($items[0][$field_key]) && $items[0][$field_key] === '') {
-      unset($items[0]);
+        unset($items[0]);
     }
     if (count($items) > $field['multiple']) {
-      $field_key  = $element['#columns'][0];
-      form_error($element[$field_key], t('%name: this field cannot hold more than @count values.', array('%name' => t($field['widget']['label']), '@count' => $field['multiple'])));
+        $field_key  = $element['#columns'][0];
+        form_error($element[$field_key], t('%name: this field cannot hold more than @count values.', array('%name' => t($field['widget']['label']), '@count' => $field['multiple'])));
+    }
     }
-  }
 }
 
 /**
@@ -341,24 +341,24 @@ 
  * transformation is needed.
  */
 function optionwidgets_data2form($element, $items, $field) {
-  $field_key  = $element['#columns'][0];
-  $options    = optionwidgets_options($field);
+    $field_key  = $element['#columns'][0];
+    $options    = optionwidgets_options($field);
 
-  $items_transposed = content_transpose_array_rows_cols($items);
-  $values = (isset($items_transposed[$field_key]) && is_array($items_transposed[$field_key])) ? $items_transposed[$field_key] : array();
-  $keys = array();
-  foreach ($values as $value) {
+    $items_transposed = content_transpose_array_rows_cols($items);
+    $values = (isset($items_transposed[$field_key]) && is_array($items_transposed[$field_key])) ? $items_transposed[$field_key] : array();
+    $keys = array();
+    foreach ($values as $value) {
     $key = array_search($value, array_keys($options));
     if (isset($key)) {
-      $keys[] = $value;
+        $keys[] = $value;
+    }
     }
-  }
-  if ($field['multiple'] || $element['#type'] == 'optionwidgets_onoff') {
+    if ($field['multiple'] || $element['#type'] == 'optionwidgets_onoff') {
     return array($field_key => $keys);
-  }
-  else {
+    }
+    else {
     return !empty($keys) ? array($field_key => $value) : array();
-  }
+    }
 }
 
 /**
@@ -367,22 +367,22 @@ 
  * transformation is needed.
  */
 function optionwidgets_form2data($element, $field) {
-  $field_key = $element['#columns'][0];
-  $items = (array) $element[$field_key]['#value'];
-  $options = optionwidgets_options($field);
+    $field_key = $element['#columns'][0];
+    $items = (array) $element[$field_key]['#value'];
+    $options = optionwidgets_options($field);
 
-  $values = array_values($items);
+    $values = array_values($items);
 
-  if ($element['#type'] == 'optionwidgets_onoff' && ($values[0] === 0)) {
+    if ($element['#type'] == 'optionwidgets_onoff' && ($values[0] === 0)) {
     $keys = array_keys($options);
     $values = array(array_key_exists(0, $keys) ? $keys[0] : NULL);
-  }
+    }
 
-  if (empty($values)) {
+    if (empty($values)) {
     $values[] = NULL;
-  }
-  $result = content_transpose_array_rows_cols(array($field_key => $values));
-  return $result;
+    }
+    $result = content_transpose_array_rows_cols(array($field_key => $values));
+    return $result;
 }
 
 /**
@@ -399,18 +399,18 @@ 
  *   when allowed values list is generated using PHP code.
  */
 function optionwidgets_options($field, $flatten = TRUE) {
-  $function = $field['module'] .'_allowed_values';
-  $options = function_exists($function) ? $function($field) : (array) content_allowed_values($field, $flatten);
-  // Add an empty choice for :
-  // - non required radios
-  // - non required selects
-  if (!$field['required']) {
+    $function = $field['module'] .'_allowed_values';
+    $options = function_exists($function) ? $function($field) : (array) content_allowed_values($field, $flatten);
+    // Add an empty choice for :
+    // - non required radios
+    // - non required selects
+    if (!$field['required']) {
     if ((in_array($field['widget']['type'], array('optionwidgets_buttons', 'nodereference_buttons', 'userreference_buttons')) && !$field['multiple'])
       || (in_array($field['widget']['type'], array('optionwidgets_select', 'nodereference_select', 'userreference_select')))) {
-      $options = array('' => theme('optionwidgets_none', $field)) + $options;
+        $options = array('' => theme('optionwidgets_none', $field)) + $options;
+    }
     }
-  }
-  return $options;
+    return $options;
 }
 
 /**
@@ -418,7 +418,7 @@ 
  *  The default theme will display N/A for a radio list and blank for a select.
  */
 function theme_optionwidgets_none($field) {
-  switch ($field['widget']['type']) {
+    switch ($field['widget']['type']) {
     case 'optionwidgets_buttons':
     case 'nodereference_buttons':
     case 'userreference_buttons':
@@ -429,7 +429,7 @@ 
       return t('- None -');
     default :
       return '';
-  }
+    }
 }
 
 /**
@@ -444,13 +444,13 @@ 
  * $element['#delta]  is the position of this element in the group
  */
 function theme_optionwidgets_select($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
 
 function theme_optionwidgets_onoff($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
 
 function theme_optionwidgets_buttons($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
\ No newline at end of file

drupal/sites/default/boinc/modules/contrib/cck/modules/content_copy/content_copy.module

Indentation +273 added lines, -273 removed lines

@@ -32,174 +32,174 @@ 
  * Implementation of hook_menu().
  */
 function content_copy_menu() {
-  $items = array();
+    $items = array();
 
-  $items['admin/content/types/export'] = array(
+    $items['admin/content/types/export'] = array(
     'title' => 'Export',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('content_copy_export_form'),
     'access arguments' => array('administer content types'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 3,
-  );
-  $items['admin/content/types/import'] = array(
+    );
+    $items['admin/content/types/import'] = array(
     'title' => 'Import',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('content_copy_import_form'),
     'access arguments' => array('administer content types'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 4,
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function content_copy_theme() {
-  return array(
+    return array(
     'content_copy_export_form' => array(
-      'template' => 'content_copy_export_form',
-      'arguments' => array('form' => NULL),
+        'template' => 'content_copy_export_form',
+        'arguments' => array('form' => NULL),
     ),
-  );
+    );
 }
 
 /**
  *  A form to export field definitions.
  */
 function content_copy_export_form(&$form_state) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
-  include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
+    include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+    include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
 
-  $form_values = isset($form_state['values']) ? $form_state['values'] : array();
-  $step = isset($form_state['storage']['step']) ? $form_state['storage']['step'] + 1 : 1;
+    $form_values = isset($form_state['values']) ? $form_state['values'] : array();
+    $step = isset($form_state['storage']['step']) ? $form_state['storage']['step'] + 1 : 1;
 
-  $exportable_fields = array();
-  $groups = array();
+    $exportable_fields = array();
+    $groups = array();
 
-  $type_name = isset($form_values['type_name']) ? $form_values['type_name'] : '';
-  if ($type_name) {
+    $type_name = isset($form_values['type_name']) ? $form_values['type_name'] : '';
+    if ($type_name) {
     $type = content_types($type_name);
     $exportable_fields = content_copy_fields($type_name);
     if (module_exists('fieldgroup')) {
-      $groups = fieldgroup_groups($type_name);
+        $groups = fieldgroup_groups($type_name);
+    }
     }
-  }
 
-  // If a content type has been selected and there are no fields or groups to select,
-  // jump straight to export.
-  if ($step == 2 && !($groups) && !($exportable_fields)) {
+    // If a content type has been selected and there are no fields or groups to select,
+    // jump straight to export.
+    if ($step == 2 && !($groups) && !($exportable_fields)) {
     $step = 3;
-  }
+    }
 
-  $form['#step'] = $step;
-  $form['#prefix'] = t('This form will process a content type and one or more fields from that type and export the settings. The export created by this process can be copied and pasted as an import into the current or any other database. The import will add the fields to an existing content type or create a new content type that includes the selected fields.');
+    $form['#step'] = $step;
+    $form['#prefix'] = t('This form will process a content type and one or more fields from that type and export the settings. The export created by this process can be copied and pasted as an import into the current or any other database. The import will add the fields to an existing content type or create a new content type that includes the selected fields.');
 
-  switch ($step) {
+    switch ($step) {
     case 1: // Select a content type.
       $types  = content_copy_types();
-      $form['type_name'] = array(
+        $form['type_name'] = array(
         '#title' => t('Types'),
         '#type' => 'radios',
         '#options' => $types,
         '#description' => t('Select the content type to export.'),
-      );
-      break;
+        );
+        break;
 
     case 2: // Select groups and fields.
       $form['type_name'] = array(
         '#type' => 'hidden',
         '#value' => $type_name,
-      );
+        );
 
-      $form += array(
+        $form += array(
         '#fields' => $exportable_fields,
         '#groups' => array_keys($groups),
-      );
+        );
 
-      $fields_options = $groups_options = array();
+        $fields_options = $groups_options = array();
 
-      // Fields.
-      foreach ($exportable_fields as $field_name) {
+        // Fields.
+        foreach ($exportable_fields as $field_name) {
         $field = content_fields($field_name, $type_name);
         $fields_options[$field_name] = '';
         $weight = $field['widget']['weight'];
         $form[$field_name] = array(
-          'human_name' => array('#value' => check_plain($field['widget']['label'])),
-          'field_name' => array('#value' => $field['field_name']),
-          'type' => array('#value' => $field['type']),
-          'weight' => array('#type' => 'value', '#value' => $weight),
-          'parent' => array('#type' => 'value', '#value' => ''),
-          '#row_type' => 'field',
+            'human_name' => array('#value' => check_plain($field['widget']['label'])),
+            'field_name' => array('#value' => $field['field_name']),
+            'type' => array('#value' => $field['type']),
+            'weight' => array('#type' => 'value', '#value' => $weight),
+            'parent' => array('#type' => 'value', '#value' => ''),
+            '#row_type' => 'field',
         );
-      }
-      $form['fields'] = array(
+        }
+        $form['fields'] = array(
         '#type' => 'checkboxes',
         '#options' => $fields_options,
         '#default_value' => array_keys($fields_options),
-      );
+        );
 
-      // Groups.
-      foreach ($groups as $name => $group) {
+        // Groups.
+        foreach ($groups as $name => $group) {
         $groups_options[$name] = '';
         $weight = $group['weight'];
         $form[$name] = array(
-          'human_name' => array('#value' => check_plain($group['label'])),
-          'group_name' => array('#value' => $group['group_name']),
-          'weight' => array('#type' => 'value', '#value' => $weight),
-          '#row_type' => 'group',
+            'human_name' => array('#value' => check_plain($group['label'])),
+            'group_name' => array('#value' => $group['group_name']),
+            'weight' => array('#type' => 'value', '#value' => $weight),
+            '#row_type' => 'group',
         );
         foreach ($group['fields'] as $field_name => $field) {
-          // Do nothing for non-exportable (inactive) fields.
-          if (isset($form[$field_name])) {
+            // Do nothing for non-exportable (inactive) fields.
+            if (isset($form[$field_name])) {
             $form[$field_name]['parent']['#value'] = $name;
-          }
+            }
+        }
         }
-      }
-      if ($groups) {
+        if ($groups) {
         $form['groups'] = array(
-          '#type' => 'checkboxes',
-          '#options' => $groups_options,
-          '#default_value' => array_keys($groups_options),
+            '#type' => 'checkboxes',
+            '#options' => $groups_options,
+            '#default_value' => array_keys($groups_options),
         );
-      }
-      break;
+        }
+        break;
 
     case 3: // Display the export macro.
       $GLOBALS['content_copy']['count'] = 0;
-      $form['export'] = array(
+        $form['export'] = array(
         '#title' => t('Export data'),
         '#type' => 'textarea',
         '#cols' => 60,
         '#value' => content_copy_export($form_values),
         '#rows' => max(40, $GLOBALS['content_copy']['count']),
         '#description' => t('Copy the export text and paste it into another content type using the import function.'),
-      );
-      // The calls to drupal_execute('content_field_edit_form') in
-      // content_copy_export() affect the page title,
-      drupal_set_title(t('Content types'));
-      break;
-  }
-
-  if ($step < 3) {  // Omit submit button on the textarea block to display the export data.
+        );
+        // The calls to drupal_execute('content_field_edit_form') in
+        // content_copy_export() affect the page title,
+        drupal_set_title(t('Content types'));
+        break;
+    }
+
+    if ($step < 3) {  // Omit submit button on the textarea block to display the export data.
     $form['submit'] = array(
-      '#type' => 'submit',
-      '#value' => t('Export'),
+        '#type' => 'submit',
+        '#value' => t('Export'),
     );
-  }
+    }
 
-  $form['step'] = array(
+    $form['step'] = array(
     '#type' => 'value',
     '#value' => $step,
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 function content_copy_export_form_submit($form, &$form_state) {
-  $form_state['rebuild'] = TRUE;
-  $form_state['storage']['step'] = $form_state['values']['step'];
+    $form_state['rebuild'] = TRUE;
+    $form_state['storage']['step'] = $form_state['values']['step'];
 }
 
 
@@ -208,66 +208,66 @@ 
  *   and save the form values as formatted text.
  */
 function content_copy_export($form_values) {
-  // Set a global variable to tell when to intervene with form_alter().
-  $GLOBALS['content_copy']['status'] = 'export';
+    // Set a global variable to tell when to intervene with form_alter().
+    $GLOBALS['content_copy']['status'] = 'export';
 
-  // Get the content type info by submitting the content type form.
-  $node_state = array('values' => array('type_name' => $form_values['type_name']));
-  module_load_include('inc', 'node', 'content_types');
-  drupal_execute('node_type_form', $node_state, node_get_types('type', $form_values['type_name']));
+    // Get the content type info by submitting the content type form.
+    $node_state = array('values' => array('type_name' => $form_values['type_name']));
+    module_load_include('inc', 'node', 'content_types');
+    drupal_execute('node_type_form', $node_state, node_get_types('type', $form_values['type_name']));
 
-  module_load_include('inc', 'content', 'includes/content.admin');
-  module_load_include('inc', 'content', 'includes/content.crud');
+    module_load_include('inc', 'content', 'includes/content.admin');
+    module_load_include('inc', 'content', 'includes/content.crud');
 
-  // Get an array of groups to export.
-  // Record a macro for each group by submitting the group edit form.
-  $groups = array();
-  if (!empty($form_values['groups']) && module_exists('fieldgroup')) {
+    // Get an array of groups to export.
+    // Record a macro for each group by submitting the group edit form.
+    $groups = array();
+    if (!empty($form_values['groups']) && module_exists('fieldgroup')) {
     $groups = array_filter($form_values['groups']);
     foreach ($groups as $group) {
-      $group_state = array('values' => array('group_name' => $group));
-      drupal_execute('fieldgroup_group_edit_form', $group_state, $form_values['type_name'], $group, 'edit');
+        $group_state = array('values' => array('group_name' => $group));
+        drupal_execute('fieldgroup_group_edit_form', $group_state, $form_values['type_name'], $group, 'edit');
+    }
     }
-  }
 
-  // Get an array of fields to export
-  // Record a macro for each field by submitting the field settings form.
-  // Omit fields from the export if their module is not currently installed
-  // otherwise the system will generate errors when the macro tries to execute their forms.
-  if (!empty($form_values['fields'])) {
+    // Get an array of fields to export
+    // Record a macro for each field by submitting the field settings form.
+    // Omit fields from the export if their module is not currently installed
+    // otherwise the system will generate errors when the macro tries to execute their forms.
+    if (!empty($form_values['fields'])) {
     $type = content_types($form_values['type_name']);
     $fields = array_filter($form_values['fields']);
     foreach ($fields as $field_name) {
-      $field = $type['fields'][$field_name];
-      $field_types = _content_field_types();
-      $field_module = $field_types[$field['type']]['module'];
-      $widget_types = _content_widget_types();
-      $widget_module = $widget_types[$field['widget']['type']]['module'];
-      if (!empty($field_module) && module_exists($field_module) && !empty($widget_module) && module_exists($widget_module)) {
+        $field = $type['fields'][$field_name];
+        $field_types = _content_field_types();
+        $field_module = $field_types[$field['type']]['module'];
+        $widget_types = _content_widget_types();
+        $widget_module = $widget_types[$field['widget']['type']]['module'];
+        if (!empty($field_module) && module_exists($field_module) && !empty($widget_module) && module_exists($widget_module)) {
         $field_state = array('values' => content_field_instance_collapse($field));
         $field_state['values']['op'] = t('Save field settings');
         if (module_exists('fieldgroup')) {
-          // Avoid undefined index error by always creating this.
-          $field_state['values']['group'] = '';
-          $group_name = fieldgroup_get_group($form_values['type_name'], $field_name);
-          if (in_array($group_name, $groups)) {
+            // Avoid undefined index error by always creating this.
+            $field_state['values']['group'] = '';
+            $group_name = fieldgroup_get_group($form_values['type_name'], $field_name);
+            if (in_array($group_name, $groups)) {
             $field_state['values']['group'] = $group_name;
-          }
+            }
         }
         drupal_execute('content_field_edit_form', $field_state, $form_values['type_name'], $field_name);
-      }
+        }
+    }
     }
-  }
 
-  // Convert the macro array into formatted text.
-  $output = content_copy_get_macro();
+    // Convert the macro array into formatted text.
+    $output = content_copy_get_macro();
 
-  // Add weights of non-CCK fields.
-  if ($extra = variable_get('content_extra_weights_'. $form_values['type_name'], array())) {
+    // Add weights of non-CCK fields.
+    if ($extra = variable_get('content_extra_weights_'. $form_values['type_name'], array())) {
     $output .= "\$content['extra']  = ". var_export((array) $extra, TRUE) .";\n";
-  }
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
@@ -294,37 +294,37 @@ 
  * }
  */
 function content_copy_import_form(&$form_state, $type_name = '') {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
-  include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
+    include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+    include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
 
-  $form['#prefix'] = t('This form will import field definitions exported from another content type or another database.<br/>Note that fields cannot be duplicated within the same content type, so imported fields will be added only if they do not already exist in the selected type.');
-  $form['type_name'] = array(
+    $form['#prefix'] = t('This form will import field definitions exported from another content type or another database.<br/>Note that fields cannot be duplicated within the same content type, so imported fields will be added only if they do not already exist in the selected type.');
+    $form['type_name'] = array(
     '#type' => 'select',
     '#options' => array('<create>' => t('<Create>')) + content_copy_types(),
     '#default_value' => $type_name,
     '#title' => t('Content type'),
     '#description' => t('Select the content type to import these fields into.<br/>Select &lt;Create&gt; to create a new content type to contain the fields.'),
-  );
-  $form['macro'] = array(
+    );
+    $form['macro'] = array(
     '#type' => 'textarea',
     '#rows' => 40,
     '#title' => t('Import data'),
     '#required' => TRUE,
     '#description' => t('Paste the text created by a content export into this field.'),
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Import'),
-  );
-  // Read in a file if there is one and set it as the default macro value.
-  if (isset($_REQUEST['macro_file']) && $file = file_get_contents($_REQUEST['macro_file'])) {
+    );
+    // Read in a file if there is one and set it as the default macro value.
+    if (isset($_REQUEST['macro_file']) && $file = file_get_contents($_REQUEST['macro_file'])) {
     $form['macro']['#default_value'] = $file;
     if (isset($_REQUEST['type_name'])) {
-      $form['type_name']['#default_value'] = $_REQUEST['type_name'];
+        $form['type_name']['#default_value'] = $_REQUEST['type_name'];
     }
     $form['#prefix'] .= '<p class="error">'. t('A file has been pre-loaded for import.') .'</p>';
-  }
-  return $form;
+    }
+    return $form;
 }
 
 /**
@@ -334,90 +334,90 @@ 
  *     2) execute the imported field macro to update the settings to the imported values
  */
 function content_copy_import_form_submit($form, &$form_state) {
-  $form_values = $form_state['values'];
+    $form_values = $form_state['values'];
 
-  // Get the content type we are importing into.
-  $type_name = $form_values['type_name'];
-  $type_label = node_get_types('name', $type_name);
+    // Get the content type we are importing into.
+    $type_name = $form_values['type_name'];
+    $type_label = node_get_types('name', $type_name);
 
-  $content = NULL;
-  // Convert the import formatted text back into a $content array.
-  // Return if errors generated or not an array.
-  // Use '@' to suppress errors about undefined constants in the macro.
-  @eval($form_values['macro']);
+    $content = NULL;
+    // Convert the import formatted text back into a $content array.
+    // Return if errors generated or not an array.
+    // Use '@' to suppress errors about undefined constants in the macro.
+    @eval($form_values['macro']);
 
-  // Preliminary error trapping, must have valid arrays to work with.
-  if (!isset($content) || !isset($content['type']) || !is_array($content) || !is_array($content['type'])) {
+    // Preliminary error trapping, must have valid arrays to work with.
+    if (!isset($content) || !isset($content['type']) || !is_array($content) || !is_array($content['type'])) {
     form_set_error('macro', t('The import data is not valid import text.'));
     return;
-  }
+    }
 
-  module_load_include('inc', 'content', 'includes/content.crud');
+    module_load_include('inc', 'content', 'includes/content.crud');
 
-  // Get all type and field info for this database.
-  $content_info = _content_type_info();
+    // Get all type and field info for this database.
+    $content_info = _content_type_info();
 
-  $imported_type = $content['type'];
-  $imported_type_name = $imported_type['type'];
-  $imported_type_label = $imported_type['name'];
+    $imported_type = $content['type'];
+    $imported_type_name = $imported_type['type'];
+    $imported_type_label = $imported_type['name'];
 
-  // It is allowed to import a type with no fields,
-  // so the fields array could be empty and must be cast as an array.
-  $imported_fields = isset($content['fields']) ? $content['fields'] : array();
+    // It is allowed to import a type with no fields,
+    // so the fields array could be empty and must be cast as an array.
+    $imported_fields = isset($content['fields']) ? $content['fields'] : array();
 
-  // Perform more pre-import error trapping.
-  // If there are potential problems, exit without doing the import.
-  $not_enabled = array();
+    // Perform more pre-import error trapping.
+    // If there are potential problems, exit without doing the import.
+    $not_enabled = array();
 
-  // The groups array could be empty and still valid, make sure to cast it as an array.
-  // If there are groups in the import, make sure the fieldgroup module is enabled.
-  $imported_groups = array();
-  if (isset($content['groups']) && module_exists('fieldgroup')) {
+    // The groups array could be empty and still valid, make sure to cast it as an array.
+    // If there are groups in the import, make sure the fieldgroup module is enabled.
+    $imported_groups = array();
+    if (isset($content['groups']) && module_exists('fieldgroup')) {
     $imported_groups = (array) $content['groups'];
-  }
-  elseif (isset($content['groups']) && is_array($content['groups'])) {
+    }
+    elseif (isset($content['groups']) && is_array($content['groups'])) {
     $not_enabled[] = 'fieldgroup';
-  }
+    }
 
-  // Make sure that all the field and widget modules in the import are enabled in this database.
-  foreach ($imported_fields as $import) {
+    // Make sure that all the field and widget modules in the import are enabled in this database.
+    foreach ($imported_fields as $import) {
     $field = content_field_instance_collapse($import);
     if (empty($field['module']) || empty($field['widget_module'])) {
-      $not_enabled[] = $field['field_name'];
+        $not_enabled[] = $field['field_name'];
     }
     else {
-      if (!module_exists($field['module'])) {
+        if (!module_exists($field['module'])) {
         $not_enabled[] = $field['module'];
-      }
-      if (!module_exists($field['widget_module'])) {
+        }
+        if (!module_exists($field['widget_module'])) {
         $not_enabled[] = $field['widget_module'];
-      }
+        }
+    }
     }
-  }
 
-  // If any required module is not enabled, set an error message and exit.
-  if ($not_enabled) {
+    // If any required module is not enabled, set an error message and exit.
+    if ($not_enabled) {
     form_set_error('macro', t('The following modules must be enabled for this import to work: %modules.', array(
         '%modules' => implode(', ', array_unique($not_enabled))
         )));
-  }
+    }
 
-  // Make sure the imported content type doesn't already exist in the database.
-  if ($form_values['type_name'] == '<create>') {
+    // Make sure the imported content type doesn't already exist in the database.
+    if ($form_values['type_name'] == '<create>') {
     if (in_array($imported_type_name, array_keys($content_info['content types']))) {
-      form_set_error('macro', t('The content type %type already exists in this database.', array(
+        form_set_error('macro', t('The content type %type already exists in this database.', array(
             '%type' => $imported_type_name
             )));
     }
-  }
+    }
 
-  if (form_get_errors()) {
+    if (form_get_errors()) {
     drupal_set_message(t('Exiting. No import performed.'), 'error');
     return;
-  }
+    }
 
-  // Create the content type, if requested.
-  if ($form_values['type_name'] == '<create>') {
+    // Create the content type, if requested.
+    if ($form_values['type_name'] == '<create>') {
 
     $type = (object) $imported_type;
     $values = $imported_type;
@@ -435,26 +435,26 @@ 
     $content_info = _content_type_info();
 
     if (form_get_errors() || !isset($content_info['content types']) || !is_array($content_info['content types'][$type_name])) {
-       drupal_set_message(t('An error has occurred adding the content type %type.<br/>Please check the errors displayed for more details.', array(
+        drupal_set_message(t('An error has occurred adding the content type %type.<br/>Please check the errors displayed for more details.', array(
             '%type' => $imported_type_name
             )));
-       return;
+        return;
+    }
     }
-  }
 
-  // Create the groups for this type, if they don't already exist.
-  if (module_exists('fieldgroup') && $imported_groups) {
+    // Create the groups for this type, if they don't already exist.
+    if (module_exists('fieldgroup') && $imported_groups) {
     foreach ($imported_groups as $group) {
-      $group_name = $group['group_name'];
-      fieldgroup_save_group($type_name, $group);
+        $group_name = $group['group_name'];
+        fieldgroup_save_group($type_name, $group);
     }
     // Reset the static variable in fieldgroup_groups() with new data.
     fieldgroup_groups('', FALSE, TRUE);
-  }
+    }
 
-  // Iterate through the field forms in the import and execute each.
-  $rebuild = FALSE;
-  foreach ($imported_fields as $field) {
+    // Iterate through the field forms in the import and execute each.
+    $rebuild = FALSE;
+    foreach ($imported_fields as $field) {
 
     // Make sure the field doesn't already exist in the type.
     // If so, do nothing, fields can't be duplicated within a content type.
@@ -464,13 +464,13 @@ 
     $field['type_name'] = $type_name;
 
     if (!empty($field['field_name']) && isset($content_info['content types'][$type_name]['fields'][$field_name])) {
-      drupal_set_message(t('The imported field %field_label (%field_name) was not added to %type because that field already exists in %type.', array(
+        drupal_set_message(t('The imported field %field_label (%field_name) was not added to %type because that field already exists in %type.', array(
         '%field_label' => $field['label'], '%field_name' => $field_name, '%type' => $type_label)));
     }
     else {
-      $field = content_field_instance_create($field, FALSE);
-      $rebuild = TRUE;
-      drupal_set_message(t('The field %field_label (%field_name) was added to the content type %type.', array(
+        $field = content_field_instance_create($field, FALSE);
+        $rebuild = TRUE;
+        drupal_set_message(t('The field %field_label (%field_name) was added to the content type %type.', array(
         '%field_label' => $field['widget']['label'], '%field_name' => $field_name, '%type' => $type_label)));
     }
 
@@ -480,20 +480,20 @@ 
     // restored. Hence, we need to update field group data for newly imported
     // field, but also for fields that already exist.
     if (module_exists('fieldgroup') && isset($imported_groups)) {
-      fieldgroup_update_fields($field);
+        fieldgroup_update_fields($field);
+    }
     }
-  }
 
-  // Clear caches and rebuild menu only if any field has been created.
-  if ($rebuild) {
+    // Clear caches and rebuild menu only if any field has been created.
+    if ($rebuild) {
     content_clear_type_cache(TRUE);
     menu_rebuild();
-  }
+    }
 
-  // Import weights of non-CCK fields.
-  if (isset($content['extra'])) {
+    // Import weights of non-CCK fields.
+    if (isset($content['extra'])) {
     variable_set('content_extra_weights_'. $type_name, $content['extra']);
-  }
+    }
 }
 
 /**
@@ -501,22 +501,22 @@ 
  * Intervene to run form through macro when doing export
  */
 function content_copy_form_alter(&$form, $form_state, $form_id) {
-  $alter_forms = array('node_type_form', 'content_field_edit_form', 'fieldgroup_group_edit_form');
-  if (isset($GLOBALS['content_copy']) && isset($GLOBALS['content_copy']['status']) && $GLOBALS['content_copy']['status'] == 'export' && in_array($form_id, $alter_forms)) {
+    $alter_forms = array('node_type_form', 'content_field_edit_form', 'fieldgroup_group_edit_form');
+    if (isset($GLOBALS['content_copy']) && isset($GLOBALS['content_copy']['status']) && $GLOBALS['content_copy']['status'] == 'export' && in_array($form_id, $alter_forms)) {
     $form['#submit'][] = 'content_copy_record_macro';
-  }
+    }
 }
 
 /**
  * Get all the *active* fields for a content type.
  */
 function content_copy_fields($type_name) {
-  $fields = array();
-  if (!$type_name) {
+    $fields = array();
+    if (!$type_name) {
     return $fields;
-  }
-  $content_info = _content_type_info();
-  foreach ($content_info['content types'][$type_name]['fields'] as $field_name => $field) {
+    }
+    $content_info = _content_type_info();
+    foreach ($content_info['content types'][$type_name]['fields'] as $field_name => $field) {
     // Omit fields from the export if their module is not currently installed
     // otherwise the system will generate errors when the macro tries to execute their forms.
     $field_types = _content_field_types();
@@ -525,125 +525,125 @@ 
     $widget_module = $widget_types[$field['widget']['type']]['module'];
 
     if (!$field['locked'] && !empty($field_module) && module_exists($field_module) && !empty($widget_module) && module_exists($widget_module)) {
-      $fields[] = $field_name;
+        $fields[] = $field_name;
     }
-  }
-  return $fields;
+    }
+    return $fields;
 }
 
 /**
  *  Get all content types.
  */
 function content_copy_types() {
-  $types = array();
-  $content_info = _content_type_info();
-  foreach ($content_info['content types'] as $type_name => $val) {
+    $types = array();
+    $content_info = _content_type_info();
+    foreach ($content_info['content types'] as $type_name => $val) {
     $types[$type_name] = check_plain($val['name']) .' ('. $type_name .')';
-  }
-  return $types;
+    }
+    return $types;
 }
 
 /**
  * A handler that stores the form submissions into a $GLOBALS array
  */
 function content_copy_record_macro($form, &$form_state) {
-  $edit = $form_state['values'];
-  $subs = isset($GLOBALS['content_copy']['submissions']) ? $GLOBALS['content_copy']['submissions'] : array();
+    $edit = $form_state['values'];
+    $subs = isset($GLOBALS['content_copy']['submissions']) ? $GLOBALS['content_copy']['submissions'] : array();
 
-  // Get the form values and store them in a $GLOBALS['content_copy']['submissions'] array.
-  // Update $GLOBALS['content_copy']['count'] with an approximation of the number of rows in this item.
-  // Count is used to approximate necessary size of textarea in form.
+    // Get the form values and store them in a $GLOBALS['content_copy']['submissions'] array.
+    // Update $GLOBALS['content_copy']['count'] with an approximation of the number of rows in this item.
+    // Count is used to approximate necessary size of textarea in form.
 
-  $form_id = $form_state['values']['form_id'];
-  if (isset($edit['type_name']) || isset($edit['submit']) || isset($edit['delete']) || isset($edit['form_id'])) {
+    $form_id = $form_state['values']['form_id'];
+    if (isset($edit['type_name']) || isset($edit['submit']) || isset($edit['delete']) || isset($edit['form_id'])) {
     unset($edit['type_name'], $edit['submit'], $edit['delete'], $edit['form_id'], $edit['previous_field']);
-  }
-  switch ($form_id) {
+    }
+    switch ($form_id) {
     case 'node_type_form':
       $subs['type'] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
+        $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+        break;
 
     case 'fieldgroup_group_edit_form':
       $subs['groups'][] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
+        $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+        break;
 
     default:
       if (isset($edit['field_widget_type'])) {
         $tmp = explode('-', $edit['field_widget_type']);
         $field_name = $tmp[0];
-      }
-      else {
+        }
+        else {
         $field_name = isset($edit['field_name']) ? $edit['field_name'] : '';
-      }
+        }
 
-      // The display settings are being fetched directly from the DB. During import,
-      // we'll re-insert the data directly as well.
-      //
-      $query = 'SELECT display_settings FROM {'. content_instance_tablename() .'} WHERE field_name = \'%s\'';
-      $row_info = db_fetch_array(db_query($query, $field_name));
+        // The display settings are being fetched directly from the DB. During import,
+        // we'll re-insert the data directly as well.
+        //
+        $query = 'SELECT display_settings FROM {'. content_instance_tablename() .'} WHERE field_name = \'%s\'';
+        $row_info = db_fetch_array(db_query($query, $field_name));
 
-      // If an error occurs, notify the user.
-      if ($db_err = db_error()) {
+        // If an error occurs, notify the user.
+        if ($db_err = db_error()) {
         drupal_set_message(t("An error occurred when exporting the 'display settings' data for the field %field_name.<br/>The db error is: '%db_err'.", array(
-             '%field_name' => $field_name,
-             '%db_err' => $db_err
+                '%field_name' => $field_name,
+                '%db_err' => $db_err
         )));
-      }
-      else {
+        }
+        else {
         // The db fetch occurred successfully, unserialize the data blob and
         // insert it into a new "display_settings" field of the data.
         if ($display_settings = unserialize($row_info['display_settings'])) {
-          $edit['display_settings'] = $display_settings;
+            $edit['display_settings'] = $display_settings;
         }
-      }
-      $subs['fields'][] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
-  }
+        }
+        $subs['fields'][] = $edit;
+        $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+        break;
+    }
 
-  $GLOBALS['content_copy']['submissions'] = $subs;
+    $GLOBALS['content_copy']['submissions'] = $subs;
 }
 
 /**
  * @return a code representation of the recorded macro.
  */
 function content_copy_get_macro() {
-  // Define the indexes for the evaluated code.
-  $string = "";
-  if (array_key_exists('submissions', $GLOBALS['content_copy'])) {
+    // Define the indexes for the evaluated code.
+    $string = "";
+    if (array_key_exists('submissions', $GLOBALS['content_copy'])) {
     foreach ($GLOBALS['content_copy']['submissions'] as $form_type => $form) {
-      $string .= "\$content['$form_type']  = ". var_export((array) $form, TRUE) .";\n";
+        $string .= "\$content['$form_type']  = ". var_export((array) $form, TRUE) .";\n";
     }
     return $string;
-  }
+    }
 }
 
 function template_preprocess_content_copy_export_form($vars) {
-  $form = &$vars['form'];
+    $form = &$vars['form'];
 
-  if ($form['#step'] == 2) {
+    if ($form['#step'] == 2) {
     $order = _content_overview_order($form, $form['#fields'], $form['#groups']);
 
     $rows = array();
     foreach ($order as $key) {
-      $element = &$form[$key];
-      $row = new stdClass();
+        $element = &$form[$key];
+        $row = new stdClass();
 
-      $row->row_type = $element['#row_type'];
-      $checkbox_key = $element['#row_type'] == 'field' ? 'fields' : 'groups';
-      $row->checkbox = drupal_render($form[$checkbox_key][$key]);
-      foreach (element_children($element) as $child) {
+        $row->row_type = $element['#row_type'];
+        $checkbox_key = $element['#row_type'] == 'field' ? 'fields' : 'groups';
+        $row->checkbox = drupal_render($form[$checkbox_key][$key]);
+        foreach (element_children($element) as $child) {
         $row->{$child} = drupal_render($element[$child]);
-      }
-      $row->label_class = in_array($key, $form['#groups']) ? 'label-group' : 'label-field';
-      $row->indentation = theme('indentation', isset($element['#depth']) ? $element['#depth'] : 0);
+        }
+        $row->label_class = in_array($key, $form['#groups']) ? 'label-group' : 'label-field';
+        $row->indentation = theme('indentation', isset($element['#depth']) ? $element['#depth'] : 0);
 
-      $rows[] = $row;
+        $rows[] = $row;
     }
     $vars['rows'] = $rows;
-  }
+    }
 
-  $vars['submit'] = drupal_render($form);
+    $vars['submit'] = drupal_render($form);
 }
\ No newline at end of file

drupal/sites/default/boinc/modules/contrib/cck/modules/content_permissions/content_permissions.module

Indentation +7 added lines, -7 removed lines

@@ -5,12 +5,12 @@ 
  *  Implementation of hook_perm().
  */
 function content_permissions_perm() {
-  $perms = array();
-  foreach (content_fields() as $field) {
+    $perms = array();
+    foreach (content_fields() as $field) {
     $perms[] = 'edit '. $field['field_name'];
     $perms[] = 'view '. $field['field_name'];
-  }
-  return $perms;
+    }
+    return $perms;
 }
 
 /**
@@ -19,10 +19,10 @@ 
  * @see content_access().
  */
 function content_permissions_field_access($op, $field, $account, $node = NULL) {
-  switch ($op) {
+    switch ($op) {
     case 'view':
     case 'edit':
       return user_access($op .' '. $field['field_name'], $account);
-  }
-  return TRUE;
+    }
+    return TRUE;
 }

drupal/sites/default/boinc/modules/contrib/cck/modules/text/text.module

Indentation +150 added lines, -150 removed lines

@@ -10,101 +10,101 @@ 
  * Implementation of hook_theme().
  */
 function text_theme() {
-  return array(
+    return array(
     'text_textarea' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'text_textfield' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'text_formatter_default' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'text_formatter_plain' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'text_formatter_trimmed' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'text_formatter_foo' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_field_info().
  */
 function text_field_info() {
-  return array(
+    return array(
     'text' => array(
-      'label' => t('Text'),
-      'description' => t('Store text in the database.'),
+        'label' => t('Text'),
+        'description' => t('Store text in the database.'),
 //      'content_icon' => 'icon_content_text.png',
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_field_settings().
  */
 function text_field_settings($op, $field) {
-  switch ($op) {
+    switch ($op) {
     case 'form':
       $form = array();
-      $options = array(0 => t('Plain text'), 1 => t('Filtered text (user selects input format)'));
-      $form['text_processing'] = array(
+        $options = array(0 => t('Plain text'), 1 => t('Filtered text (user selects input format)'));
+        $form['text_processing'] = array(
         '#type' => 'radios',
         '#title' => t('Text processing'),
         '#default_value' => is_numeric($field['text_processing']) ? $field['text_processing'] : 0,
         '#options' => $options,
-      );
-      $form['max_length'] = array(
+        );
+        $form['max_length'] = array(
         '#type' => 'textfield',
         '#title' => t('Maximum length'),
         '#default_value' => is_numeric($field['max_length']) ? $field['max_length'] : '',
         '#required' => FALSE,
         '#element_validate' => array('_element_validate_integer_positive'),
         '#description' => t('The maximum length of the field in characters. Leave blank for an unlimited size.'),
-      );
-      $form['allowed_values_fieldset'] = array(
+        );
+        $form['allowed_values_fieldset'] = array(
         '#type' => 'fieldset',
         '#title' => t('Allowed values'),
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,
-      );
-      $form['allowed_values_fieldset']['allowed_values'] = array(
+        );
+        $form['allowed_values_fieldset']['allowed_values'] = array(
         '#type' => 'textarea',
         '#title' => t('Allowed values list'),
         '#default_value' => !empty($field['allowed_values']) ? $field['allowed_values'] : '',
         '#required' => FALSE,
         '#rows' => 10,
         '#description' => t('The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database, and it must match the field storage type (%type). The label is optional, and the key will be used as the label if no label is specified.<br />Allowed HTML tags: @tags', array('%type' => $field['type'], '@tags' => _content_filter_xss_display_allowed_tags())),
-      );
-      $form['allowed_values_fieldset']['advanced_options'] = array(
+        );
+        $form['allowed_values_fieldset']['advanced_options'] = array(
         '#type' => 'fieldset',
         '#title' => t('PHP code'),
         '#collapsible' => TRUE,
         '#collapsed' => empty($field['allowed_values_php']),
-      );
-      if (user_access('Use PHP input for field settings (dangerous - grant with care)')) {
+        );
+        if (user_access('Use PHP input for field settings (dangerous - grant with care)')) {
         $form['allowed_values_fieldset']['advanced_options']['allowed_values_php'] = array(
-          '#type' => 'textarea',
-          '#title' => t('Code'),
-          '#default_value' => !empty($field['allowed_values_php']) ? $field['allowed_values_php'] : '',
-          '#rows' => 6,
-          '#description' => t('Advanced usage only: PHP code that returns a keyed array of allowed values. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the array returned by this code will override the allowed values list above.'),
+            '#type' => 'textarea',
+            '#title' => t('Code'),
+            '#default_value' => !empty($field['allowed_values_php']) ? $field['allowed_values_php'] : '',
+            '#rows' => 6,
+            '#description' => t('Advanced usage only: PHP code that returns a keyed array of allowed values. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the array returned by this code will override the allowed values list above.'),
         );
-      }
-      else {
+        }
+        else {
         $form['allowed_values_fieldset']['advanced_options']['markup_allowed_values_php'] = array(
-          '#type' => 'item',
-          '#title' => t('Code'),
-          '#value' => !empty($field['allowed_values_php']) ? '<code>'. check_plain($field['allowed_values_php']) .'</code>' : t('&lt;none&gt;'),
-          '#description' => empty($field['allowed_values_php']) ? t("You're not allowed to input PHP code.") : t('This PHP code was set by an administrator and will override the allowed values list above.'),
+            '#type' => 'item',
+            '#title' => t('Code'),
+            '#value' => !empty($field['allowed_values_php']) ? '<code>'. check_plain($field['allowed_values_php']) .'</code>' : t('&lt;none&gt;'),
+            '#description' => empty($field['allowed_values_php']) ? t("You're not allowed to input PHP code.") : t('This PHP code was set by an administrator and will override the allowed values list above.'),
         );
-      }
-      return $form;
+        }
+        return $form;
 
     case 'save':
       return array('text_processing', 'max_length', 'allowed_values', 'allowed_values_php');
@@ -112,18 +112,18 @@ 
     case 'database columns':
       if (empty($field['max_length']) || $field['max_length'] > 255) {
         $columns['value'] = array('type' => 'text', 'size' => 'big', 'not null' => FALSE, 'sortable' => TRUE, 'views' => TRUE);
-      }
-      else {
+        }
+        else {
         $columns['value'] = array('type' => 'varchar', 'length' => $field['max_length'], 'not null' => FALSE, 'sortable' => TRUE, 'views' => TRUE);
-      }
-      if (!empty($field['text_processing'])) {
+        }
+        if (!empty($field['text_processing'])) {
         $columns['format'] = array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'views' => FALSE);
-      }
-      return $columns;
+        }
+        return $columns;
 
     case 'views data':
       $allowed_values = content_allowed_values($field);
-      if (count($allowed_values)) {
+        if (count($allowed_values)) {
         $data = content_views_field_views_data($field);
         $db_info = content_database_info($field);
         $table_alias = content_views_tablename($field);
@@ -137,106 +137,106 @@ 
         // Argument : swap the handler to the 'many to one' operator.
         $data[$table_alias][$field['field_name'] .'_value']['argument']['handler'] = 'content_handler_argument_many_to_one';
         return $data;
-      }
-  }
+        }
+    }
 }
 
 /**
  * Implementation of hook_field().
  */
 function text_field($op, &$node, $field, &$items, $teaser, $page) {
-  switch ($op) {
+    switch ($op) {
     case 'validate':
       $allowed_values = content_allowed_values($field);
-      if (is_array($items)) {
+        if (is_array($items)) {
         foreach ($items as $delta => $item) {
-          $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
-          if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
-          if (!empty($item['value'])) {
+            $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
+            if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
+            if (!empty($item['value'])) {
             if (count($allowed_values) && !array_key_exists($item['value'], $allowed_values)) {
-              form_set_error($error_element, t('%name: illegal value.', array('%name' => t($field['widget']['label']))));
+                form_set_error($error_element, t('%name: illegal value.', array('%name' => t($field['widget']['label']))));
             }
             if (!empty($field['max_length']) && drupal_strlen($item['value']) > $field['max_length']) {
-              form_set_error($error_element, t('%name: the value may not be longer than %max characters.', array('%name' => $field['widget']['label'], '%max' => $field['max_length'])));
+                form_set_error($error_element, t('%name: the value may not be longer than %max characters.', array('%name' => $field['widget']['label'], '%max' => $field['max_length'])));
+            }
             }
-          }
         }
-      }
-      return $items;
+        }
+        return $items;
 
     case 'sanitize':
       foreach ($items as $delta => $item) {
         if (!empty($field['text_processing'])) {
-          $text = isset($item['value']) ? check_markup($item['value'], $item['format'], FALSE) : '';
+            $text = isset($item['value']) ? check_markup($item['value'], $item['format'], FALSE) : '';
         }
         else {
-          $text = isset($item['value']) ? check_plain($item['value']) : '';
+            $text = isset($item['value']) ? check_plain($item['value']) : '';
         }
         $items[$delta]['safe'] = $text;
-      }
-  }
+        }
+    }
 }
 
 /**
  * Implementation of hook_content_is_empty().
  */
 function text_content_is_empty($item, $field) {
-  if (empty($item['value']) && (string)$item['value'] !== '0') {
+    if (empty($item['value']) && (string)$item['value'] !== '0') {
     return TRUE;
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Implementation of hook_field_formatter_info().
  */
 function text_field_formatter_info() {
-  return array(
+    return array(
     'default' => array(
-      'label' => t('Default'),
-      'field types' => array('text'),
-      'multiple values' => CONTENT_HANDLE_CORE,
+        'label' => t('Default'),
+        'field types' => array('text'),
+        'multiple values' => CONTENT_HANDLE_CORE,
     ),
     'plain' => array(
-      'label' => t('Plain text'),
-      'field types' => array('text'),
-      'multiple values' => CONTENT_HANDLE_CORE,
+        'label' => t('Plain text'),
+        'field types' => array('text'),
+        'multiple values' => CONTENT_HANDLE_CORE,
     ),
     'trimmed' => array(
-      'label' => t('Trimmed'),
-      'field types' => array('text'),
-      'multiple values' => CONTENT_HANDLE_CORE,
+        'label' => t('Trimmed'),
+        'field types' => array('text'),
+        'multiple values' => CONTENT_HANDLE_CORE,
     ),
-  );
+    );
 }
 
 /**
  * Theme function for 'default' text field formatter.
  */
 function theme_text_formatter_default($element) {
-  return ($allowed =_text_allowed_values($element)) ? $allowed : $element['#item']['safe'];
+    return ($allowed =_text_allowed_values($element)) ? $allowed : $element['#item']['safe'];
 }
 
 /**
  * Theme function for 'plain' text field formatter.
  */
 function theme_text_formatter_plain($element) {
-  return ($allowed =_text_allowed_values($element)) ? $allowed : strip_tags($element['#item']['safe']);
+    return ($allowed =_text_allowed_values($element)) ? $allowed : strip_tags($element['#item']['safe']);
 }
 
 /**
  * Theme function for 'trimmed' text field formatter.
  */
 function theme_text_formatter_trimmed($element) {
-  $field = content_fields($element['#field_name'], $element['#type_name']);
-  return ($allowed =_text_allowed_values($element)) ? $allowed : node_teaser($element['#item']['safe'], $field['text_processing'] ? $element['#item']['format'] : NULL);
+    $field = content_fields($element['#field_name'], $element['#type_name']);
+    return ($allowed =_text_allowed_values($element)) ? $allowed : node_teaser($element['#item']['safe'], $field['text_processing'] ? $element['#item']['format'] : NULL);
 }
 
 function _text_allowed_values($element) {
-  $field = content_fields($element['#field_name'], $element['#type_name']);
-  if (($allowed_values = content_allowed_values($field)) && isset($allowed_values[$element['#item']['value']])) {
+    $field = content_fields($element['#field_name'], $element['#type_name']);
+    if (($allowed_values = content_allowed_values($field)) && isset($allowed_values[$element['#item']['value']])) {
     return $allowed_values[$element['#item']['value']];
-  }
+    }
 }
 
 /**
@@ -251,24 +251,24 @@ 
  * differently.
  */
 function text_widget_info() {
-  return array(
+    return array(
     'text_textfield' => array(
-      'label' => t('Text field'),
-      'field types' => array('text'),
-      'multiple values' => CONTENT_HANDLE_CORE,
-      'callbacks' => array(
+        'label' => t('Text field'),
+        'field types' => array('text'),
+        'multiple values' => CONTENT_HANDLE_CORE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
     'text_textarea' => array(
-      'label' => t('Text area (multiple rows)'),
-      'field types' => array('text'),
-      'multiple values' => CONTENT_HANDLE_CORE,
-      'callbacks' => array(
+        'label' => t('Text area (multiple rows)'),
+        'field types' => array('text'),
+        'multiple values' => CONTENT_HANDLE_CORE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
@@ -284,56 +284,56 @@ 
  * (see nodereference and userreference).
  */
 function text_elements() {
-  return array(
+    return array(
     'text_textfield' => array(
-      '#input' => TRUE,
-      '#columns' => array('value'), '#delta' => 0,
-      '#process' => array('text_textfield_process'),
-      '#autocomplete_path' => FALSE,
+        '#input' => TRUE,
+        '#columns' => array('value'), '#delta' => 0,
+        '#process' => array('text_textfield_process'),
+        '#autocomplete_path' => FALSE,
     ),
     'text_textarea' => array(
-      '#input' => TRUE,
-      '#columns' => array('value', 'format'), '#delta' => 0,
-      '#process' => array('text_textarea_process'),
-      '#filter_value' => FILTER_FORMAT_DEFAULT,
+        '#input' => TRUE,
+        '#columns' => array('value', 'format'), '#delta' => 0,
+        '#process' => array('text_textarea_process'),
+        '#filter_value' => FILTER_FORMAT_DEFAULT,
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_widget_settings().
  */
 function text_widget_settings($op, $widget) {
-  switch ($op) {
+    switch ($op) {
     case 'form':
       $form = array();
-      $rows = (isset($widget['rows']) && is_numeric($widget['rows'])) ? $widget['rows'] : 5;
-      $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
-      if ($widget['type'] == 'text_textfield') {
+        $rows = (isset($widget['rows']) && is_numeric($widget['rows'])) ? $widget['rows'] : 5;
+        $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
+        if ($widget['type'] == 'text_textfield') {
         $form['rows'] = array('#type' => 'hidden', '#value' => $rows);
         $form['size'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Size of textfield'),
-          '#default_value' => $size,
-          '#element_validate' => array('_element_validate_integer_positive'),
-          '#required' => TRUE,
+            '#type' => 'textfield',
+            '#title' => t('Size of textfield'),
+            '#default_value' => $size,
+            '#element_validate' => array('_element_validate_integer_positive'),
+            '#required' => TRUE,
         );
-      }
-      else {
+        }
+        else {
         $form['rows'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Rows'),
-          '#default_value' => $rows,
-          '#element_validate' => array('_element_validate_integer_positive'),
-          '#required' => TRUE,
+            '#type' => 'textfield',
+            '#title' => t('Rows'),
+            '#default_value' => $rows,
+            '#element_validate' => array('_element_validate_integer_positive'),
+            '#required' => TRUE,
         );
         $form['size'] = array('#type' => 'hidden', '#value' => $size);
-      }
-      return $form;
+        }
+        return $form;
 
     case 'save':
       return array('rows', 'size');
-  }
+    }
 }
 
 /**
@@ -368,11 +368,11 @@ 
  *   the form item for a single element for this field
  */
 function text_widget(&$form, &$form_state, $field, $items, $delta = 0) {
-  $element = array(
+    $element = array(
     '#type' => $field['widget']['type'],
     '#default_value' => isset($items[$delta]) ? $items[$delta] : '',
-  );
-  return $element;
+    );
+    return $element;
 }
 
 /**
@@ -384,10 +384,10 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function text_textfield_process($element, $edit, $form_state, $form) {
-  $field = $form['#field_info'][$element['#field_name']];
-  $field_key = $element['#columns'][0];
-  $delta = $element['#delta'];
-  $element[$field_key] = array(
+    $field = $form['#field_info'][$element['#field_name']];
+    $field_key = $element['#columns'][0];
+    $delta = $element['#delta'];
+    $element[$field_key] = array(
     '#type' => 'textfield',
     '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : NULL,
     '#autocomplete_path' => $element['#autocomplete_path'],
@@ -402,24 +402,24 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
+    );
 
-  $element[$field_key]['#maxlength'] = !empty($field['max_length']) ? $field['max_length'] : NULL;
+    $element[$field_key]['#maxlength'] = !empty($field['max_length']) ? $field['max_length'] : NULL;
 
-  if (!empty($field['text_processing'])) {
+    if (!empty($field['text_processing'])) {
     $filter_key = $element['#columns'][1];
     $format = isset($element['#value'][$filter_key]) ? $element['#value'][$filter_key] : FILTER_FORMAT_DEFAULT;
     $parents = array_merge($element['#parents'] , array($filter_key));
     $element[$filter_key] = filter_form($format, 1, $parents);
-  }
+    }
 
-  // Used so that hook_field('validate') knows where to flag an error.
-  $element['_error_element'] = array(
+    // Used so that hook_field('validate') knows where to flag an error.
+    $element['_error_element'] = array(
     '#type' => 'value',
     '#value' => implode('][', array_merge($element['#parents'], array($field_key))),
-  );
+    );
 
-  return $element;
+    return $element;
 }
 
 /**
@@ -431,9 +431,9 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function text_textarea_process($element, $edit, $form_state, $form) {
-  $field = $form['#field_info'][$element['#field_name']];
-  $field_key   = $element['#columns'][0];
-  $element[$field_key] = array(
+    $field = $form['#field_info'][$element['#field_name']];
+    $field_key   = $element['#columns'][0];
+    $element[$field_key] = array(
     '#type' => 'textarea',
     '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : NULL,
     '#rows' => !empty($field['widget']['rows']) ? $field['widget']['rows'] : 10,
@@ -447,22 +447,22 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
+    );
 
-  if (!empty($field['text_processing'])) {
+    if (!empty($field['text_processing'])) {
     $filter_key  = (count($element['#columns']) == 2) ? $element['#columns'][1] : 'format';
     $format = isset($element['#value'][$filter_key]) ? $element['#value'][$filter_key] : FILTER_FORMAT_DEFAULT;
     $parents = array_merge($element['#parents'] , array($filter_key));
     $element[$filter_key] = filter_form($format, 1, $parents);
-  }
+    }
 
-  // Used so that hook_field('validate') knows where to flag an error.
-  $element['_error_element'] = array(
+    // Used so that hook_field('validate') knows where to flag an error.
+    $element['_error_element'] = array(
     '#type' => 'value',
     '#value' => implode('][', array_merge($element['#parents'], array($field_key))),
-  );
+    );
 
-  return $element;
+    return $element;
 }
 
 /**
@@ -477,9 +477,9 @@ 
  * $element['#delta]  is the position of this element in the group
  */
 function theme_text_textfield($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
 
 function theme_text_textarea($element) {
-  return $element['#children'];
+    return $element['#children'];
 }

drupal/sites/default/boinc/modules/contrib/cck/modules/userreference/panels/relationships/user_from_userref.inc

Indentation +18 added lines, -18 removed lines

@@ -10,7 +10,7 @@ 
  * Implementation of hook_ctools_relationships().
  */
 function userreference_user_from_userref_ctools_relationships() {
-  return array(
+    return array(
     'title' => t('User from reference'),
     'keyword' => 'userreference',
     'description' => t('Adds a user from a user reference in a node context; if multiple users are referenced, this will get the first referenced user only.'),
@@ -18,48 +18,48 @@ 
     'context' => 'userreference_user_from_userref_context',
     'settings form' => 'userreference_user_from_userref_settings_form',
     'settings form validate' => 'userreference_user_from_userref_settings_form_validate',
-  );
+    );
 }
 
 /**
  * Return a new ctools context based on an existing context.
  */
 function userreference_user_from_userref_context($context, $conf) {
-  // If unset it wants a generic, unfilled context, which is just NULL.
-  if (empty($context->data)) {
+    // If unset it wants a generic, unfilled context, which is just NULL.
+    if (empty($context->data)) {
     return ctools_context_create_empty('user', NULL);
-  }
+    }
 
-  // Prevent whitescreens on stale data.
-  if (empty($conf)) {
+    // Prevent whitescreens on stale data.
+    if (empty($conf)) {
     return ctools_context_create_empty('user', NULL);
-  }
+    }
 
-  if (isset($context->data->{$conf['field_name']}[0]['uid']) && ($uid = $context->data->{$conf['field_name']}[0]['uid'])) {
+    if (isset($context->data->{$conf['field_name']}[0]['uid']) && ($uid = $context->data->{$conf['field_name']}[0]['uid'])) {
     if ($account = user_load(array('uid' => $uid))) {
-      return ctools_context_create('user', $account);
+        return ctools_context_create('user', $account);
+    }
     }
-  }
 }
 
 /**
  * Settings form for the ctools relationship.
  */
 function userreference_user_from_userref_settings_form($conf) {
-  $options = array();
-  foreach (content_fields() as $field) {
+    $options = array();
+    foreach (content_fields() as $field) {
     if ($field['type'] == 'userreference') {
-      $options[$field['field_name']] = t($field['widget']['label']);
+        $options[$field['field_name']] = t($field['widget']['label']);
+    }
     }
-  }
-  $form['field_name'] = array(
+    $form['field_name'] = array(
     '#title' => t('User reference field'),
     '#type' => 'select',
     '#options' => $options,
     '#default_value' => isset($conf['field_name']) ? $conf['field_name'] : '',
     '#prefix' => '<div class="clear-block">',
     '#suffix' => '</div>',
-  );
+    );
 
-  return $form;
+    return $form;
 }

drupal/sites/default/boinc/modules/contrib/cck/modules/userreference/userreference.rules.inc

Indentation +16 added lines, -16 removed lines

@@ -10,39 +10,39 @@ 
  * Implementation of hook_rules_action_info()
  */
 function userreference_rules_action_info() {
-  $info = array();
-  $info['userreference_rules_action_load'] = array(
+    $info = array();
+    $info['userreference_rules_action_load'] = array(
     'label' => t('Load a referenced user'),
     'arguments' => array(
-      'node' => array(
+        'node' => array(
         'type' => 'node',
         'label' => t('Content containing the user reference field'),
-      ),
+        ),
     ),
     'new variables' => array(
-      'referenced_user' => array(
+        'referenced_user' => array(
         'type' => 'user',
         'label' => t('Referenced user'),
-      ),
+        ),
     ),
     'module' => 'CCK',
     'help' => t('Note that if the field has multiple values, only the first user will be loaded.'),
-  );
-  return $info;
+    );
+    return $info;
 }
 
 function userreference_rules_action_load($node, $settings) {
-  $uid = $node->{$settings['field']}[0]['uid'];
-  if (isset($uid)) {
+    $uid = $node->{$settings['field']}[0]['uid'];
+    if (isset($uid)) {
     $user = user_load(array('uid' => $uid));
     return array('referenced_user' => $user);
-  }
+    }
 }
 
 function userreference_rules_action_load_form($settings, &$form) {
-  $settings += array('field' => '');
-  $options = content_rules_get_field_names_by_type('userreference');
-  $form['settings']['field'] = array(
+    $settings += array('field' => '');
+    $options = content_rules_get_field_names_by_type('userreference');
+    $form['settings']['field'] = array(
     '#type' => 'select',
     '#title' => t('Field'),
     '#default_value' => $settings['field'],
@@ -50,7 +50,7 @@ 
     '#required' => TRUE,
     '#disabled' => empty($options),
     '#description' => empty($options) ? t('There are no userreference fields defined.') : '',
-  );
+    );
 }
 
 /**
@@ -58,5 +58,5 @@ 
  * "workflow_ng_action_load_referenced_user" to the equivalent rules action.
  */
 function workflow_ng_action_load_referenced_user_upgrade(&$element) {
-  $element['#name'] = 'userreference_rules_action_load';
+    $element['#name'] = 'userreference_rules_action_load';
 }

drupal/sites/default/boinc/modules/contrib/cck/modules/userreference/userreference.module

Indentation +320 added lines, -320 removed lines

@@ -10,258 +10,258 @@ 
  * Implementation of hook_menu().
  */
 function userreference_menu() {
-  $items = array();
-  $items['userreference/autocomplete'] = array(
+    $items = array();
+    $items['userreference/autocomplete'] = array(
     'title' => 'Userreference autocomplete',
     'page callback' => 'userreference_autocomplete',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function userreference_theme() {
-  return array(
+    return array(
     'userreference_select' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'userreference_buttons' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'userreference_autocomplete' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'userreference_formatter_default' => array(
-      'arguments' => array('element'),
+        'arguments' => array('element'),
     ),
     'userreference_formatter_plain' => array(
-      'arguments' => array('element'),
+        'arguments' => array('element'),
     ),
-  );
+    );
 }
 
 /**
  * Implementaion of hook_ctools_plugin_directory().
  */
 function userreference_ctools_plugin_directory($module, $plugin) {
-  if ($module == 'ctools' && $plugin == 'relationships') {
+    if ($module == 'ctools' && $plugin == 'relationships') {
     return 'panels/' . $plugin;
-  }
+    }
 }
 
 /**
  * Implementation of hook_field_info().
  */
 function userreference_field_info() {
-  return array(
+    return array(
     'userreference' => array(
-      'label' => t('User reference'),
-      'description' => t('Store the ID of a related user as an integer value.'),
+        'label' => t('User reference'),
+        'description' => t('Store the ID of a related user as an integer value.'),
 //      'content_icon' => 'icon_content_noderef.png',
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_field_settings().
  */
 function userreference_field_settings($op, $field) {
-  switch ($op) {
+    switch ($op) {
     case 'form':
       $form = array();
-      $form['referenceable_roles'] = array(
+        $form['referenceable_roles'] = array(
         '#type' => 'checkboxes',
         '#title' => t('User roles that can be referenced'),
         '#default_value' => isset($field['referenceable_roles']) && is_array($field['referenceable_roles']) ? array_filter($field['referenceable_roles']) : array(),
         '#options' => user_roles(1),
-      );
-      $form['referenceable_status'] = array(
+        );
+        $form['referenceable_status'] = array(
         '#type' => 'radios',
         '#title' => t('User status that can be referenced'),
         '#default_value' => isset($field['referenceable_status']) ? $field['referenceable_status'] : '',
         '#options' => array('' => t('All users'), 1 => t('Active users'), 0 => t('Blocked users')),
-      );
-      if (module_exists('views')) {
+        );
+        if (module_exists('views')) {
         $views = array('--' => '--');
         $all_views = views_get_all_views();
         foreach ($all_views as $view) {
-          // Only 'users' views that have fields will work for our purpose.
-          if ($view->base_table == 'users' && !empty($view->display['default']->display_options['fields'])) {
+            // Only 'users' views that have fields will work for our purpose.
+            if ($view->base_table == 'users' && !empty($view->display['default']->display_options['fields'])) {
             if ($view->type == 'Default') {
-              $views[t('Default Views')][$view->name] = $view->name;
+                $views[t('Default Views')][$view->name] = $view->name;
             }
             else {
-              $views[t('Existing Views')][$view->name] = $view->name;
+                $views[t('Existing Views')][$view->name] = $view->name;
+            }
             }
-          }
         }
 
         $form['advanced'] = array(
-           '#type' => 'fieldset',
-           '#title' => t('Advanced - Users that can be referenced (View)'),
-           '#collapsible' => TRUE,
-           '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
-         );
+            '#type' => 'fieldset',
+            '#title' => t('Advanced - Users that can be referenced (View)'),
+            '#collapsible' => TRUE,
+            '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
+            );
         if (count($views) > 1) {
-          $form['advanced']['advanced_view'] = array(
+            $form['advanced']['advanced_view'] = array(
             '#type' => 'select',
             '#title' => t('View used to select the users'),
             '#options' => $views,
             '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
             '#description' =>  t('<p>Choose the "Views module" view that selects the users that can be referenced.<br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
-          );
-          $form['advanced']['advanced_view_args'] = array(
+                t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
+            );
+            $form['advanced']['advanced_view_args'] = array(
             '#type' => 'textfield',
             '#title' => t('View arguments'),
             '#default_value' => isset($field['advanced_view_args']) ? $field['advanced_view_args'] : '',
             '#required' => FALSE,
             '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
-          );
+            );
         }
         else {
-          $form['advanced']['no_view_help'] = array(
+            $form['advanced']['no_view_help'] = array(
             '#value' => t('<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
-          );
+                t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
+            );
+        }
         }
-      }
-      return $form;
+        return $form;
 
     case 'save':
       $settings = array('referenceable_roles', 'referenceable_status');
-      if (module_exists('views')) {
+        if (module_exists('views')) {
         $settings[] = 'advanced_view';
         $settings[] = 'advanced_view_args';
-      }
-      return $settings;
+        }
+        return $settings;
 
     case 'database columns':
       $columns = array(
         'uid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'index' => TRUE),
-      );
-      return $columns;
+        );
+        return $columns;
 
     case 'views data':
       $data = content_views_field_views_data($field);
-      $db_info = content_database_info($field);
-      $table_alias = content_views_tablename($field);
-
-      // Filter : swap the handler to the 'in' operator.
-      $data[$table_alias][$field['field_name'] .'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
-      // Argument: get the user name for summaries.
-      // We need to join a new instance of the users table.
-      $data["users_$table_alias"]['table']['join']['node'] = array(
+        $db_info = content_database_info($field);
+        $table_alias = content_views_tablename($field);
+
+        // Filter : swap the handler to the 'in' operator.
+        $data[$table_alias][$field['field_name'] .'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
+        // Argument: get the user name for summaries.
+        // We need to join a new instance of the users table.
+        $data["users_$table_alias"]['table']['join']['node'] = array(
         'table' => 'users',
         'field' => 'uid',
         'left_table' => $table_alias,
         'left_field' => $field['field_name'] .'_uid',
-      );
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['handler'] = 'content_handler_argument_reference';
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name table'] = "users_$table_alias";
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name field'] = 'name';
-      // Relationship: Add a relationship for related user.
-      $data[$table_alias][$field['field_name'] .'_uid']['relationship'] = array(
+        );
+        $data[$table_alias][$field['field_name'] .'_uid']['argument']['handler'] = 'content_handler_argument_reference';
+        $data[$table_alias][$field['field_name'] .'_uid']['argument']['name table'] = "users_$table_alias";
+        $data[$table_alias][$field['field_name'] .'_uid']['argument']['name field'] = 'name';
+        // Relationship: Add a relationship for related user.
+        $data[$table_alias][$field['field_name'] .'_uid']['relationship'] = array(
         'base' => 'users',
         'field' => $db_info['columns']['uid']['column'],
         'handler' => 'content_handler_relationship',
         'label' => t($field['widget']['label']),
         'content_field_name' => $field['field_name'],
-      );
-      return $data;
+        );
+        return $data;
 
-  }
+    }
 }
 
 /**
  * Implementation of hook_field().
  */
 function userreference_field($op, &$node, $field, &$items, $teaser, $page) {
-  switch ($op) {
+    switch ($op) {
     case 'validate':
       // Extract uids to check.
       $ids = array();
-      foreach ($items as $delta => $item) {
+        foreach ($items as $delta => $item) {
         if (is_array($item) && !empty($item['uid'])) {
-          if (is_numeric($item['uid'])) {
+            if (is_numeric($item['uid'])) {
             $ids[] = $item['uid'];
-          }
-          else {
+            }
+            else {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
             if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
             form_set_error($error_element, t('%name: invalid input.', array('%name' => t($field['widget']['label']))));
-          }
+            }
+        }
         }
-      }
-      // Prevent performance hog if there are no ids to check.
-      if ($ids) {
+        // Prevent performance hog if there are no ids to check.
+        if ($ids) {
         $refs = _userreference_potential_references($field, '', NULL, $ids);
         foreach ($items as $delta => $item) {
-          if (is_array($item)) {
+            if (is_array($item)) {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
             if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
             if (!empty($item['uid']) && !isset($refs[$item['uid']])) {
-              form_set_error($error_element, t('%name: invalid user.', array('%name' => t($field['widget']['label']))));
+                form_set_error($error_element, t('%name: invalid user.', array('%name' => t($field['widget']['label']))));
+            }
             }
-          }
         }
-      }
-      return $items;
-  }
+        }
+        return $items;
+    }
 }
 
 /**
  * Implementation of hook_content_is_empty().
  */
 function userreference_content_is_empty($item, $field) {
-  if (empty($item['uid'])) {
+    if (empty($item['uid'])) {
     return TRUE;
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Implementation of hook_field_formatter_info().
  */
 function userreference_field_formatter_info() {
-  return array(
+    return array(
     'default' => array(
-      'label' => t('Default'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
+        'label' => t('Default'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
     ),
     'plain' => array(
-      'label' => t('Plain text'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
+        'label' => t('Plain text'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
     ),
-  );
+    );
 }
 
 /**
  * Theme function for 'default' userreference field formatter.
  */
 function theme_userreference_formatter_default($element) {
-  $output = '';
+    $output = '';
 
-  if (isset($element['#item']['uid']) && $account = user_load(array('uid' => $element['#item']['uid']))) {
+    if (isset($element['#item']['uid']) && $account = user_load(array('uid' => $element['#item']['uid']))) {
     $output = theme('username', $account);
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Theme function for 'plain' userreference field formatter.
  */
 function theme_userreference_formatter_plain($element) {
-  $output = '';
-  if (isset($element['#item']['uid']) && $account = user_load(array('uid' => $element['#item']['uid']))) {
+    $output = '';
+    if (isset($element['#item']['uid']) && $account = user_load(array('uid' => $element['#item']['uid']))) {
     $output = $account->name;
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
@@ -279,32 +279,32 @@ 
  * differently.
  */
 function userreference_widget_info() {
-  return array(
+    return array(
     'userreference_select' => array(
-      'label' => t('Select list'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_MODULE,
-      'callbacks' => array(
+        'label' => t('Select list'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_MODULE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
     'userreference_buttons' => array(
-      'label' => t('Check boxes/radio buttons'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_MODULE,
-      'callbacks' => array(
+        'label' => t('Check boxes/radio buttons'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_MODULE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
     'userreference_autocomplete' => array(
-      'label' => t('Autocomplete text field'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
-      'callbacks' => array(
+        'label' => t('Autocomplete text field'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
@@ -320,23 +320,23 @@ 
  * (see nodereference and userreference).
  */
 function userreference_elements() {
-  return array(
+    return array(
     'userreference_select' => array(
-      '#input' => TRUE,
-      '#columns' => array('uid'), '#delta' => 0,
-      '#process' => array('userreference_select_process'),
+        '#input' => TRUE,
+        '#columns' => array('uid'), '#delta' => 0,
+        '#process' => array('userreference_select_process'),
     ),
     'userreference_buttons' => array(
-      '#input' => TRUE,
-      '#columns' => array('uid'), '#delta' => 0,
-      '#process' => array('userreference_buttons_process'),
+        '#input' => TRUE,
+        '#columns' => array('uid'), '#delta' => 0,
+        '#process' => array('userreference_buttons_process'),
     ),
     'userreference_autocomplete' => array(
-      '#input' => TRUE,
-      '#columns' => array('name'), '#delta' => 0,
-      '#process' => array('userreference_autocomplete_process'),
-      '#autocomplete_path' => FALSE,
-      ),
+        '#input' => TRUE,
+        '#columns' => array('name'), '#delta' => 0,
+        '#process' => array('userreference_autocomplete_process'),
+        '#autocomplete_path' => FALSE,
+        ),
     );
 }
 
@@ -344,45 +344,45 @@ 
  * Implementation of hook_widget_settings().
  */
 function userreference_widget_settings($op, $widget) {
-  switch ($op) {
+    switch ($op) {
     case 'form':
       $form = array();
-      $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
-      $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
-      if ($widget['type'] == 'userreference_autocomplete') {
+        $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
+        $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
+        if ($widget['type'] == 'userreference_autocomplete') {
         $form['autocomplete_match'] = array(
-          '#type' => 'select',
-          '#title' => t('Autocomplete matching'),
-          '#default_value' => $match,
-          '#options' => array(
+            '#type' => 'select',
+            '#title' => t('Autocomplete matching'),
+            '#default_value' => $match,
+            '#options' => array(
             'starts_with' => t('Starts with'),
             'contains' => t('Contains'),
-          ),
-          '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of users.'),
+            ),
+            '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of users.'),
         );
         $form['size'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Size of textfield'),
-          '#default_value' => $size,
-          '#element_validate' => array('_element_validate_integer_positive'),
-          '#required' => TRUE,
+            '#type' => 'textfield',
+            '#title' => t('Size of textfield'),
+            '#default_value' => $size,
+            '#element_validate' => array('_element_validate_integer_positive'),
+            '#required' => TRUE,
         );
-      }
-      else {
+        }
+        else {
         $form['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
         $form['size'] = array('#type' => 'hidden', '#value' => $size);
-      }
-      $form['reverse_link'] = array(
+        }
+        $form['reverse_link'] = array(
         '#type' => 'checkbox',
         '#title' => t('Reverse link'),
         '#default_value' => isset($widget['reverse_link']) ? $widget['reverse_link'] : 0,
         '#description' => t('If selected, a reverse link back to the referencing node will displayed on the referenced user record.'),
-      );
-      return $form;
+        );
+        return $form;
 
     case 'save':
       return array('autocomplete_match', 'size', 'reverse_link');
-  }
+    }
 }
 
 /**
@@ -417,30 +417,30 @@ 
  *   the form item for a single element for this field
  */
 function userreference_widget(&$form, &$form_state, $field, $items, $delta = 0) {
-  switch ($field['widget']['type']) {
+    switch ($field['widget']['type']) {
     case 'userreference_select':
       $element = array(
         '#type' => 'userreference_select',
         '#default_value' => $items,
-      );
-      break;
+        );
+        break;
 
     case 'userreference_buttons':
       $element = array(
         '#type' => 'userreference_buttons',
         '#default_value' => $items,
-      );
-      break;
+        );
+        break;
 
     case 'userreference_autocomplete':
       $element = array(
         '#type' => 'userreference_autocomplete',
         '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
         '#value_callback' => 'userreference_autocomplete_value',
-      );
-      break;
-  }
-  return $element;
+        );
+        break;
+    }
+    return $element;
 }
 
 /**
@@ -449,12 +449,12 @@ 
  * Substitute in the user name for the uid.
  */
 function userreference_autocomplete_value($element, $edit = FALSE) {
-  $field_key  = $element['#columns'][0];
-  if (!empty($element['#default_value'][$field_key])) {
+    $field_key  = $element['#columns'][0];
+    if (!empty($element['#default_value'][$field_key])) {
     $value = db_result(db_query("SELECT name FROM {users} WHERE uid = '%d'", $element['#default_value'][$field_key]));
     return array($field_key => $value);
-  }
-  return array($field_key => NULL);
+    }
+    return array($field_key => NULL);
 }
 
 /**
@@ -466,11 +466,11 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function userreference_select_process($element, $edit, $form_state, $form) {
-  // The userreference_select widget doesn't need to create its own
-  // element, it can wrap around the optionwidgets_select element.
-  // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
-  $element[$field_key] = array(
+    // The userreference_select widget doesn't need to create its own
+    // element, it can wrap around the optionwidgets_select element.
+    // Add a validation step where the value can be unwrapped.
+    $field_key  = $element['#columns'][0];
+    $element[$field_key] = array(
     '#type' => 'optionwidgets_select',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
     // The following values were set by the content module and need
@@ -482,12 +482,12 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
-  if (empty($element[$field_key]['#element_validate'])) {
+    );
+    if (empty($element[$field_key]['#element_validate'])) {
     $element[$field_key]['#element_validate'] = array();
-  }
-  array_unshift($element[$field_key]['#element_validate'], 'userreference_optionwidgets_validate');
-  return $element;
+    }
+    array_unshift($element[$field_key]['#element_validate'], 'userreference_optionwidgets_validate');
+    return $element;
 }
 
 /**
@@ -499,11 +499,11 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function userreference_buttons_process($element, $edit, $form_state, $form) {
-  // The userreference_select widget doesn't need to create its own
-  // element, it can wrap around the optionwidgets_select element.
-  // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
-  $element[$field_key] = array(
+    // The userreference_select widget doesn't need to create its own
+    // element, it can wrap around the optionwidgets_select element.
+    // Add a validation step where the value can be unwrapped.
+    $field_key  = $element['#columns'][0];
+    $element[$field_key] = array(
     '#type' => 'optionwidgets_buttons',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
     // The following values were set by the content module and need
@@ -515,12 +515,12 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
-  if (empty($element[$field_key]['#element_validate'])) {
+    );
+    if (empty($element[$field_key]['#element_validate'])) {
     $element[$field_key]['#element_validate'] = array();
-  }
-  array_unshift($element[$field_key]['#element_validate'], 'userreference_optionwidgets_validate');
-  return $element;
+    }
+    array_unshift($element[$field_key]['#element_validate'], 'userreference_optionwidgets_validate');
+    return $element;
 }
 
 /**
@@ -531,13 +531,13 @@ 
  *
  */
 function userreference_autocomplete_process($element, $edit, $form_state, $form) {
-  // The userreference autocomplete widget doesn't need to create its own
-  // element, it can wrap around the text_textfield element and add an autocomplete
-  // path and some extra processing to it.
-  // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
+    // The userreference autocomplete widget doesn't need to create its own
+    // element, it can wrap around the text_textfield element and add an autocomplete
+    // path and some extra processing to it.
+    // Add a validation step where the value can be unwrapped.
+    $field_key  = $element['#columns'][0];
 
-  $element[$field_key] = array(
+    $element[$field_key] = array(
     '#type' => 'text_textfield',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
     '#autocomplete_path' => 'userreference/autocomplete/'. $element['#field_name'],
@@ -550,20 +550,20 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
-  if (empty($element[$field_key]['#element_validate'])) {
+    );
+    if (empty($element[$field_key]['#element_validate'])) {
     $element[$field_key]['#element_validate'] = array();
-  }
-  array_unshift($element[$field_key]['#element_validate'], 'userreference_autocomplete_validate');
+    }
+    array_unshift($element[$field_key]['#element_validate'], 'userreference_autocomplete_validate');
 
-  // Used so that hook_field('validate') knows where to flag an error.
-  $element['_error_element'] = array(
+    // Used so that hook_field('validate') knows where to flag an error.
+    $element['_error_element'] = array(
     '#type' => 'value',
     // Wrapping the element around a text_textfield element creates a
     // nested element, so the final id will look like 'field-name-0-uid-uid'.
     '#value' => implode('][', array_merge($element['#parents'], array($field_key, $field_key))),
-  );
-  return $element;
+    );
+    return $element;
 }
 
 /**
@@ -578,20 +578,20 @@ 
  * like optionwidgets are using #element_validate to alter the value.
  */
 function userreference_optionwidgets_validate($element, &$form_state) {
-  $field_key  = $element['#columns'][0];
+    $field_key  = $element['#columns'][0];
 
-  $value = $form_state['values'];
-  $new_parents = array();
-  foreach ($element['#parents'] as $parent) {
+    $value = $form_state['values'];
+    $new_parents = array();
+    foreach ($element['#parents'] as $parent) {
     $value = $value[$parent];
     // Use === to be sure we get right results if parent is a zero (delta) value.
     if ($parent === $field_key) {
-      $element['#parents'] = $new_parents;
-      form_set_value($element, $value, $form_state);
-      break;
+        $element['#parents'] = $new_parents;
+        form_set_value($element, $value, $form_state);
+        break;
     }
     $new_parents[] = $parent;
-  }
+    }
 }
 
 /**
@@ -602,36 +602,36 @@ 
  * back to its original location, 'field-name-0-uid'.
  */
 function userreference_autocomplete_validate($element, &$form_state) {
-  $field_name = $element['#field_name'];
-  $type_name = $element['#type_name'];
-  $field = content_fields($field_name, $type_name);
-  $field_key = $element['#columns'][0];
-  $value = $element['#value'][$field_key];
-  $uid = NULL;
-  if (!empty($value)) {
+    $field_name = $element['#field_name'];
+    $type_name = $element['#type_name'];
+    $field = content_fields($field_name, $type_name);
+    $field_key = $element['#columns'][0];
+    $value = $element['#value'][$field_key];
+    $uid = NULL;
+    if (!empty($value)) {
     $reference = _userreference_potential_references($field, $value, 'equals', NULL, 1);
     if (empty($reference)) {
-      form_error($element[$field_key], t('%name: found no valid user with that name.', array('%name' => t($field['widget']['label']))));
+        form_error($element[$field_key], t('%name: found no valid user with that name.', array('%name' => t($field['widget']['label']))));
     }
     else {
-      $uid = key($reference);
+        $uid = key($reference);
+    }
     }
-  }
-  form_set_value($element, $uid, $form_state);
+    form_set_value($element, $uid, $form_state);
 }
 
 /**
  * Implementation of hook_allowed_values().
  */
 function userreference_allowed_values($field) {
-  $references = _userreference_potential_references($field);
+    $references = _userreference_potential_references($field);
 
-  $options = array();
-  foreach ($references as $key => $value) {
+    $options = array();
+    foreach ($references as $key => $value) {
     $options[$key] = $value['rendered'];
-  }
+    }
 
-  return $options;
+    return $options;
 }
 
 /**
@@ -667,26 +667,26 @@ 
  *   )
  */
 function _userreference_potential_references($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
-  static $results = array();
+    static $results = array();
 
-  // Create unique id for static cache.
-  $cid = $field['field_name'] .':'. $match .':'. ($string !== '' ? $string : implode('-', $ids)) .':'. $limit;
-  if (!isset($results[$cid])) {
+    // Create unique id for static cache.
+    $cid = $field['field_name'] .':'. $match .':'. ($string !== '' ? $string : implode('-', $ids)) .':'. $limit;
+    if (!isset($results[$cid])) {
     $references = FALSE;
     if (module_exists('views') && !empty($field['advanced_view']) && $field['advanced_view'] != '--') {
-      $references = _userreference_potential_references_views($field, $string, $match, $ids, $limit);
+        $references = _userreference_potential_references_views($field, $string, $match, $ids, $limit);
     }
     // If the view doesn't exist, we got FALSE, and fallback to the regular 'standard mode'.
 
     if ($references === FALSE) {
-      $references = _userreference_potential_references_standard($field, $string, $match, $ids, $limit);
+        $references = _userreference_potential_references_standard($field, $string, $match, $ids, $limit);
     }
 
     // Store the results.
     $results[$cid] = !empty($references) ? $references : array();
-  }
+    }
 
-  return $results[$cid];
+    return $results[$cid];
 }
 
 /**
@@ -694,9 +694,9 @@ 
  * case of Views-defined referenceable users.
  */
 function _userreference_potential_references_views($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
-  $view_name = $field['advanced_view'];
+    $view_name = $field['advanced_view'];
 
-  if ($view = views_get_view($view_name)) {
+    if ($view = views_get_view($view_name)) {
     // We add a display, and let it derive from the 'default' display.
     // TODO: We should let the user pick a display in the fields settings - sort of requires AHAH...
     $display = $view->add_display('content_references');
@@ -713,12 +713,12 @@ 
     // Additional options to let content_plugin_display_references::query()
     // narrow the results.
     $options = array(
-      'table' => 'users',
-      'field_string' => 'name',
-      'string' => $string,
-      'match' => $match,
-      'field_id' => 'uid',
-      'ids' => $ids,
+        'table' => 'users',
+        'field_string' => 'name',
+        'string' => $string,
+        'match' => $match,
+        'field_id' => 'uid',
+        'ids' => $ids,
     );
     $view->display_handler->set_option('content_options', $options);
 
@@ -731,26 +731,26 @@ 
 
     // Get arguments for the view.
     if (!empty($field['advanced_view_args'])) {
-      // TODO: Support Tokens using token.module ?
-      $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
+        // TODO: Support Tokens using token.module ?
+        $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
     }
     else {
-      $view_args = array();
+        $view_args = array();
     }
 
     // We do need name field, so add it if not present (unlikely, but...)
     $fields = $view->get_items('field', $display);
     if (!isset($fields['name'])) {
-      $view->add_item($display, 'field', 'users', 'name');
+        $view->add_item($display, 'field', 'users', 'name');
     }
 
     // If not set, make all fields inline and define a separator.
     $options = $view->display_handler->get_option('row_options');
     if (empty($options['inline'])) {
-      $options['inline'] = drupal_map_assoc(array_keys($view->get_items('field', $display)));
+        $options['inline'] = drupal_map_assoc(array_keys($view->get_items('field', $display)));
     }
     if (empty($options['separator'])) {
-      $options['separator'] = '-';
+        $options['separator'] = '-';
     }
     $view->display_handler->set_option('row_options', $options);
 
@@ -759,12 +759,12 @@ 
 
     // Get the results.
     $result = $view->execute_display($display, $view_args);
-  }
-  else {
+    }
+    else {
     $result = FALSE;
-  }
+    }
 
-  return $result;
+    return $result;
 }
 
 /**
@@ -772,112 +772,112 @@ 
  * referenceable users defined by user role and status
  */
 function _userreference_potential_references_standard($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
-  $where = array();
-  $args = array();
-  $join = array();
+    $where = array();
+    $args = array();
+    $join = array();
 
-  if ($string !== '') {
+    if ($string !== '') {
     $like = $GLOBALS["db_type"] == 'pgsql' ? "ILIKE" : "LIKE";
     $match_clauses = array(
-      'contains' => "$like '%%%s%%'",
-      'equals' => "= '%s'",
-      'starts_with' => "$like '%s%%'",
+        'contains' => "$like '%%%s%%'",
+        'equals' => "= '%s'",
+        'starts_with' => "$like '%s%%'",
     );
     $where[] = 'u.name '. (isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
     $args[] = $string;
-  }
-  elseif ($ids) {
+    }
+    elseif ($ids) {
     $where[] = 'u.uid IN (' . db_placeholders($ids) . ')';
     $args = array_merge($args, $ids);
-  }
-  else {
+    }
+    else {
     $where[] = "u.uid > 0";
-  }
+    }
 
-  $roles = array();
-  if (isset($field['referenceable_roles']) && is_array($field['referenceable_roles'])) {
+    $roles = array();
+    if (isset($field['referenceable_roles']) && is_array($field['referenceable_roles'])) {
     // keep only selected checkboxes
     $roles = array_filter($field['referenceable_roles']);
     // filter invalid values that seems to get through sometimes ??
     $roles = array_intersect(array_keys(user_roles(1)), $roles);
-  }
-  if (!empty($roles) && !in_array(DRUPAL_AUTHENTICATED_RID, $roles)) {
+    }
+    if (!empty($roles) && !in_array(DRUPAL_AUTHENTICATED_RID, $roles)) {
     $where[] = "r.rid IN (". implode($roles, ',') .")";
     $join[] = 'LEFT JOIN {users_roles} r ON u.uid = r.uid';
-  }
+    }
 
-  if (isset($field['referenceable_status']) && is_numeric($field['referenceable_status'])) {
+    if (isset($field['referenceable_status']) && is_numeric($field['referenceable_status'])) {
     $where[] = 'u.status = %d';
     $args[] = $field['referenceable_status'];
-  }
+    }
 
-  $users = array();
-  $where_clause = $where ? 'WHERE ('. implode(') AND (', $where) .')' : '';
-  $result = db_query('SELECT u.name, u.uid FROM {users} u '. implode(' ', $join) ." $where_clause ORDER BY u.name ASC", $args);
-  while ($user = db_fetch_object($result)) {
+    $users = array();
+    $where_clause = $where ? 'WHERE ('. implode(') AND (', $where) .')' : '';
+    $result = db_query('SELECT u.name, u.uid FROM {users} u '. implode(' ', $join) ." $where_clause ORDER BY u.name ASC", $args);
+    while ($user = db_fetch_object($result)) {
     $users[$user->uid] = array(
-      'title' => $user->name,
-      'rendered' => check_plain($user->name),
+        'title' => $user->name,
+        'rendered' => check_plain($user->name),
     );
-  }
-  return $users;
+    }
+    return $users;
 }
 
 /**
  * Menu callback; Retrieve a pipe delimited string of autocomplete suggestions for existing users
  */
 function userreference_autocomplete($field_name, $string = '') {
-  $fields = content_fields();
-  $field = $fields[$field_name];
-  $match = isset($field['widget']['autocomplete_match']) ? $field['widget']['autocomplete_match'] : 'contains';
-  $matches = array();
+    $fields = content_fields();
+    $field = $fields[$field_name];
+    $match = isset($field['widget']['autocomplete_match']) ? $field['widget']['autocomplete_match'] : 'contains';
+    $matches = array();
 
-  $references = _userreference_potential_references($field, $string, $match, array(), 10);
-  foreach ($references as $id => $row) {
+    $references = _userreference_potential_references($field, $string, $match, array(), 10);
+    foreach ($references as $id => $row) {
     // Add a class wrapper for a few required CSS overrides.
     $matches[$row['title']] = '<div class="reference-autocomplete">'. $row['rendered'] . '</div>';
-  }
-  drupal_json($matches);
+    }
+    drupal_json($matches);
 }
 
 /**
  * Implementation of hook_user().
  */
 function userreference_user($type, &$edit, &$account) {
-  switch ($type) {
+    switch ($type) {
     case 'load':
       // Only add links if we are on the user 'view' page.
       if (arg(0) != 'user' || arg(2)) {
         return;
-      }
-      // find CCK userreference field tables
-      // search through them for matching user ids and load those nodes
-      $additions = array();
-      $types = content_types();
-
-      // Find the table and columns to search through, if the same
-      // table comes up in more than one content type, we only need
-      // to search it once.
-      $search_tables = array();
-      foreach ($types as $type_name => $type) {
+        }
+        // find CCK userreference field tables
+        // search through them for matching user ids and load those nodes
+        $additions = array();
+        $types = content_types();
+
+        // Find the table and columns to search through, if the same
+        // table comes up in more than one content type, we only need
+        // to search it once.
+        $search_tables = array();
+        foreach ($types as $type_name => $type) {
         foreach ($type['fields'] as $field) {
-          // Only add tables when reverse link has been selected.
-          if ($field['type'] == 'userreference' && !empty($field['widget']['reverse_link'])) {
+            // Only add tables when reverse link has been selected.
+            if ($field['type'] == 'userreference' && !empty($field['widget']['reverse_link'])) {
             $db_info = content_database_info($field);
             $search_tables[$db_info['table']][] = $db_info['columns']['uid']['column'];
-          }
+            }
+        }
         }
-      }
-      foreach ($search_tables as $table => $columns) {
+        foreach ($search_tables as $table => $columns) {
         foreach ($columns as $column) {
-          $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {". $table ."} f ON n.vid = f.vid WHERE f.". $column ."=". $account->uid. " AND n.status = 1"));
-          while ($data = db_fetch_object($ids)) {
+            $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {". $table ."} f ON n.vid = f.vid WHERE f.". $column ."=". $account->uid. " AND n.status = 1"));
+            while ($data = db_fetch_object($ids)) {
             $additions[$data->type][$data->nid] = $data->title;
-          }
+            }
         }
-      }
-      $account->userreference = $additions;
-      break;
+        }
+        $account->userreference = $additions;
+        break;
 
     case 'view':
       if (!empty($account->userreference)) {
@@ -885,28 +885,28 @@ 
         $additions = array();
         $values = array();
         foreach ($account->userreference as $node_type => $nodes) {
-          foreach ($nodes as $nid => $title) {
+            foreach ($nodes as $nid => $title) {
             $values[$node_type][] = l($title, 'node/'. $nid);
-          }
-          if (isset($values[$node_type])) {
+            }
+            if (isset($values[$node_type])) {
             $additions[] = array(
-              '#type' => 'user_profile_item',
-              '#title' => check_plain($node_types[$node_type]['name']),
-              '#value' => theme('item_list', $values[$node_type]),
+                '#type' => 'user_profile_item',
+                '#title' => check_plain($node_types[$node_type]['name']),
+                '#value' => theme('item_list', $values[$node_type]),
             );
-          }
+            }
         }
         if ($additions) {
-          $account->content['userreference'] = $additions + array(
+            $account->content['userreference'] = $additions + array(
             '#type' => 'user_profile_category',
             '#attributes' => array('class' => 'user-member'),
             '#title' => t('Related content'),
             '#weight' => 10,
-          );
+            );
         }
-      }
-      break;
-  }
+        }
+        break;
+    }
 }
 
 /**
@@ -921,13 +921,13 @@ 
  * $element['#delta]  is the position of this element in the group
  */
 function theme_userreference_select($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
 
 function theme_userreference_buttons($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
 
 function theme_userreference_autocomplete($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
\ No newline at end of file

drupal/sites/default/boinc/modules/contrib/cck/theme/theme.inc

Indentation +56 added lines, -56 removed lines

@@ -6,43 +6,43 @@ 
  * Theme preprocess function for content-admin-field-overview-form.tpl.php.
  */
 function template_preprocess_content_field_overview_form(&$vars) {
-  $form = &$vars['form'];
+    $form = &$vars['form'];
 
-  $vars['help'] = theme('advanced_help_topic', 'content', 'manage-fields') . t('Add fields and groups to the content type, and arrange them on content display and input forms.');
-  if (module_exists('fieldgroup')) {
+    $vars['help'] = theme('advanced_help_topic', 'content', 'manage-fields') . t('Add fields and groups to the content type, and arrange them on content display and input forms.');
+    if (module_exists('fieldgroup')) {
     $vars['help'] .= '<br/>'. t('You can add a field to a group by dragging it below and to the right of the group.');
-  }
-  if (!module_exists('advanced_help')) {
+    }
+    if (!module_exists('advanced_help')) {
     $vars['help'] .= '<br/>' . t('Note: Installing the <a href="!adv_help">Advanced help</a> module will let you access more and better help.', array('!adv_help' => 'http://drupal.org/project/advanced_help'));
-  }
+    }
 
-  $order = _content_overview_order($form, $form['#field_rows'], $form['#group_rows']);
-  $rows = array();
+    $order = _content_overview_order($form, $form['#field_rows'], $form['#group_rows']);
+    $rows = array();
 
-  // Identify the 'new item' keys in the form, they look like
-  // _add_new_field, add_new_group.
-  $keys = array_keys($form);
-  $add_rows = array();
-  foreach ($keys as $key) {
+    // Identify the 'new item' keys in the form, they look like
+    // _add_new_field, add_new_group.
+    $keys = array_keys($form);
+    $add_rows = array();
+    foreach ($keys as $key) {
     if (substr($key, 0, 4) == '_add') {
-      $add_rows[] = $key;
+        $add_rows[] = $key;
+    }
     }
-  }
-  while ($order) {
+    while ($order) {
     $key = reset($order);
     $element = &$form[$key];
 
     // Only display the 'Add' separator if the 'add' rows are still
     // at the end of the table.
     if (!isset($added_separator)) {
-      $remaining_rows = array_diff($order, $add_rows);
-      if (empty($remaining_rows) && empty($element['#depth'])) {
+        $remaining_rows = array_diff($order, $add_rows);
+        if (empty($remaining_rows) && empty($element['#depth'])) {
         $row = new stdClass();
         $row->row_type = 'separator';
         $row->class = 'tabledrag-leaf region';
         $rows[] = $row;
         $added_separator = TRUE;
-      }
+        }
     }
 
     $row = new stdClass();
@@ -53,18 +53,18 @@ 
     $element['hidden_name']['#attributes']['class'] = 'field-name';
     // Add target classes for the update selects behavior.
     switch ($element['#row_type']) {
-      case 'add_new_field':
+        case 'add_new_field':
         $element['type']['#attributes']['class'] = 'content-field-type-select';
         $element['widget_type']['#attributes']['class'] = 'content-widget-type-select';
         break;
-      case 'add_existing_field':
+        case 'add_existing_field':
         $element['field_name']['#attributes']['class'] = 'content-field-select';
         $element['widget_type']['#attributes']['class'] = 'content-widget-type-select';
         $element['label']['#attributes']['class'] = 'content-label-textfield';
         break;
     }
     foreach (element_children($element) as $child) {
-      $row->{$child} = drupal_render($element[$child]);
+        $row->{$child} = drupal_render($element[$child]);
     }
     $row->label_class = 'label-'. strtr($element['#row_type'], '_', '-');
     $row->row_type = $element['#row_type'];
@@ -77,69 +77,69 @@ 
 
     $rows[] = $row;
     array_shift($order);
-  }
-  $vars['rows'] = $rows;
-  $vars['submit'] = drupal_render($form);
+    }
+    $vars['rows'] = $rows;
+    $vars['submit'] = drupal_render($form);
 
-  // Add tabledrag behavior.
+    // Add tabledrag behavior.
 //  drupal_add_tabledrag('content-field-overview', 'match', 'parent', 'group-parent', 'group-parent', 'field-name', FALSE, 1);
-  drupal_add_tabledrag('content-field-overview', 'match', 'parent', 'group-parent', 'group-parent', 'field-name', TRUE, 1);
+    drupal_add_tabledrag('content-field-overview', 'match', 'parent', 'group-parent', 'group-parent', 'field-name', TRUE, 1);
 //  drupal_add_tabledrag('content-field-overview', 'order', 'sibling', 'field-weight', NULL, NULL, FALSE);
-  drupal_add_tabledrag('content-field-overview', 'order', 'sibling', 'field-weight');
+    drupal_add_tabledrag('content-field-overview', 'order', 'sibling', 'field-weight');
 
-  // Add settings for the update selects behavior.
-  $js_fields = array();
-  foreach (array_keys(content_existing_field_options($form['#type_name'])) as $field_name) {
+    // Add settings for the update selects behavior.
+    $js_fields = array();
+    foreach (array_keys(content_existing_field_options($form['#type_name'])) as $field_name) {
     $field = content_fields($field_name);
     $js_fields[$field_name] = array('label' => $field['widget']['label'], 'type' => $field['type'], 'widget' => $field['widget']['type']);
-  }
-  drupal_add_js(array('contentWidgetTypes' => content_widget_type_options(), 'contentFields' => $js_fields), 'setting');
-  drupal_add_js(drupal_get_path('module', 'content') .'/content.js');
+    }
+    drupal_add_js(array('contentWidgetTypes' => content_widget_type_options(), 'contentFields' => $js_fields), 'setting');
+    drupal_add_js(drupal_get_path('module', 'content') .'/content.js');
 }
 
 /**
  * Theme preprocess function for content-admin-display-overview-form.tpl.php.
  */
 function template_preprocess_content_display_overview_form(&$vars) {
-  $form = &$vars['form'];
+    $form = &$vars['form'];
 
-  $contexts_selector = $form['#contexts'];
-  $vars['basic'] = $contexts_selector == 'basic';
-  $vars['contexts'] = content_build_modes($contexts_selector);
+    $contexts_selector = $form['#contexts'];
+    $vars['basic'] = $contexts_selector == 'basic';
+    $vars['contexts'] = content_build_modes($contexts_selector);
 
-  if ($contexts_selector == 'basic') {
+    if ($contexts_selector == 'basic') {
     $help = t("Configure how this content type's fields and field labels should be displayed when it's viewed in teaser and full-page mode.");
-  }
-  else {
+    }
+    else {
     $help = t("Configure how this content type's fields should be displayed when it's rendered in the following contexts.");
-  }
-  $help .= ' '. t("Use the 'Exclude' checkbox to exclude an item from the !content value passed to the node template.", array('!content' => '$content'));
-  $vars['help'] = $help;
+    }
+    $help .= ' '. t("Use the 'Exclude' checkbox to exclude an item from the !content value passed to the node template.", array('!content' => '$content'));
+    $vars['help'] = $help;
 
-  $order = _content_overview_order($form, $form['#fields'], $form['#groups']);
-  if (empty($order)) {
+    $order = _content_overview_order($form, $form['#fields'], $form['#groups']);
+    if (empty($order)) {
     $vars['rows'] = array();
     $vars['submit'] = '';
     return;
-  }
+    }
 
-  $rows = array();
-  foreach ($order as $key) {
+    $rows = array();
+    foreach ($order as $key) {
     $element = &$form[$key];
     $row = new stdClass();
     foreach (element_children($element) as $child) {
-      if (!array_key_exists('exclude', $element[$child])) {
+        if (!array_key_exists('exclude', $element[$child])) {
         $row->{$child} = drupal_render($element[$child]);
-      }
-      else {
+        }
+        else {
         $row->{$child}->format = drupal_render($element[$child]['format']);
         $row->{$child}->exclude = drupal_render($element[$child]['exclude']);
-      }
+        }
     }
     $row->label_class = in_array($key, $form['#groups']) ? 'label-group' : 'label-field';
     $row->indentation = theme('indentation', isset($element['#depth']) ? $element['#depth'] : 0);
     $rows[] = $row;
-  }
-  $vars['rows'] = $rows;
-  $vars['submit'] = drupal_render($form);
+    }
+    $vars['rows'] = $rows;
+    $vars['submit'] = drupal_render($form);
 }
\ No newline at end of file

drupal/sites/default/boinc/modules/contrib/cck/content.module

Indentation +931 added lines, -931 removed lines

@@ -16,88 +16,88 @@ 
 define('CONTENT_HANDLE_MODULE', 0x0002);
 
 function content_help($path, $arg) {
-  switch ($path) {
+    switch ($path) {
     case 'admin/help#content':
       $output = '<p>'. t('The content module, a required component of the Content Construction Kit (CCK), allows administrators to associate custom fields with content types. In Drupal, content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Using the content module (and the other helper modules included in CCK), custom fields beyond the default "Title" and "Body" may be added. CCK features are accessible through tabs on the <a href="@content-types">content types administration page</a>. (See the <a href="@node-help">node module help page</a> for more information about content types.)', array('@content-types' => url('admin/content/types'), '@node-help' => url('admin/help/node'))) .'</p>';
-      $output .= '<p>'. t('When adding a custom field to a content type, you determine its type (whether it will contain text, numbers, or references to other objects) and how it will be displayed (either as a text field or area, a select box, checkbox, radio button, or autocompleting field). A field may have multiple values (i.e., a "person" may have multiple e-mail addresses) or a single value (i.e., an "employee" has a single employee identification number). As you add and edit fields, CCK automatically adjusts the structure of the database as necessary. CCK also provides a number of other features, including intelligent caching for your custom data, an import and export facility for content type definitions, and integration with other contributed modules.') .'</p>';
-      $output .= '<p>'. t('Custom field types are provided by a set of optional modules included with CCK (each module provides a different type). The <a href="@modules">modules page</a> allows you to enable or disable CCK components. A default installation of CCK includes:', array('@modules' => url('admin/build/modules'))) .'</p>';
-      $output .= '<ul>';
-      $output .= '<li>'. t('<em>number</em>, which adds numeric field types, in integer, decimal or floating point form. You may define a set of allowed inputs, or specify an allowable range of values. A variety of common formats for displaying numeric data are available.') .'</li>';
-      $output .= '<li>'. t("<em>text</em>, which adds text field types. A text field may contain plain text only, or optionally, may use Drupal's input format filters to securely manage rich text input. Text input fields may be either a single line (text field), multiple lines (text area), or for greater input control, a select box, checkbox, or radio buttons. If desired, CCK can validate the input to a set of allowed values.") .'</li>';
-      $output .= '<li>'. t('<em>nodereference</em>, which creates custom references between Drupal nodes. By adding a <em>nodereference</em> field and two different content types, for instance, you can easily create complex parent/child relationships between data (multiple "employee" nodes may contain a <em>nodereference</em> field linking to an "employer" node).') .'</li>';
-      $output .= '<li>'. t('<em>userreference</em>, which creates custom references to your sites\' user accounts. By adding a <em>userreference</em> field, you can create complex relationships between your site\'s users and posts. To track user involvement in a post beyond Drupal\'s standard <em>Authored by</em> field, for instance, add a <em>userreference</em> field named "Edited by" to a content type to store a link to an editor\'s user account page.') .'</li>';
-      $output .= '<li>'. t('<em>fieldgroup</em>, which creates collapsible fieldsets to hold a group of related fields. A fieldset may either be open or closed by default. The order of your fieldsets, and the order of fields within a fieldset, is managed via a drag-and-drop interface provided by content module.') .'</li>';
-      $output .= '</ul>';
-      $output .= '<p>'. t('For more information, see the online handbook entry for <a href="@handbook-cck">CCK</a> or the <a href="@project-cck">CCK project page</a>.', array('@handbook-cck' => 'http://drupal.org/handbook/modules/cck', '@project-cck' => 'http://drupal.org/project/cck')) .'</p>';
-      return $output;
-  }
+        $output .= '<p>'. t('When adding a custom field to a content type, you determine its type (whether it will contain text, numbers, or references to other objects) and how it will be displayed (either as a text field or area, a select box, checkbox, radio button, or autocompleting field). A field may have multiple values (i.e., a "person" may have multiple e-mail addresses) or a single value (i.e., an "employee" has a single employee identification number). As you add and edit fields, CCK automatically adjusts the structure of the database as necessary. CCK also provides a number of other features, including intelligent caching for your custom data, an import and export facility for content type definitions, and integration with other contributed modules.') .'</p>';
+        $output .= '<p>'. t('Custom field types are provided by a set of optional modules included with CCK (each module provides a different type). The <a href="@modules">modules page</a> allows you to enable or disable CCK components. A default installation of CCK includes:', array('@modules' => url('admin/build/modules'))) .'</p>';
+        $output .= '<ul>';
+        $output .= '<li>'. t('<em>number</em>, which adds numeric field types, in integer, decimal or floating point form. You may define a set of allowed inputs, or specify an allowable range of values. A variety of common formats for displaying numeric data are available.') .'</li>';
+        $output .= '<li>'. t("<em>text</em>, which adds text field types. A text field may contain plain text only, or optionally, may use Drupal's input format filters to securely manage rich text input. Text input fields may be either a single line (text field), multiple lines (text area), or for greater input control, a select box, checkbox, or radio buttons. If desired, CCK can validate the input to a set of allowed values.") .'</li>';
+        $output .= '<li>'. t('<em>nodereference</em>, which creates custom references between Drupal nodes. By adding a <em>nodereference</em> field and two different content types, for instance, you can easily create complex parent/child relationships between data (multiple "employee" nodes may contain a <em>nodereference</em> field linking to an "employer" node).') .'</li>';
+        $output .= '<li>'. t('<em>userreference</em>, which creates custom references to your sites\' user accounts. By adding a <em>userreference</em> field, you can create complex relationships between your site\'s users and posts. To track user involvement in a post beyond Drupal\'s standard <em>Authored by</em> field, for instance, add a <em>userreference</em> field named "Edited by" to a content type to store a link to an editor\'s user account page.') .'</li>';
+        $output .= '<li>'. t('<em>fieldgroup</em>, which creates collapsible fieldsets to hold a group of related fields. A fieldset may either be open or closed by default. The order of your fieldsets, and the order of fields within a fieldset, is managed via a drag-and-drop interface provided by content module.') .'</li>';
+        $output .= '</ul>';
+        $output .= '<p>'. t('For more information, see the online handbook entry for <a href="@handbook-cck">CCK</a> or the <a href="@project-cck">CCK project page</a>.', array('@handbook-cck' => 'http://drupal.org/handbook/modules/cck', '@project-cck' => 'http://drupal.org/project/cck')) .'</p>';
+        return $output;
+    }
 }
 
 /**
  * Implementation of hook_flush_caches.
  */
 function content_flush_caches() {
-  return array(content_cache_tablename());
+    return array(content_cache_tablename());
 }
 
 /**
  * Implementation of hook_init().
  */
 function content_init() {
-  drupal_add_css(drupal_get_path('module', 'content') .'/theme/content-module.css');
-  if (module_exists('token') && !function_exists('content_token_values')) {
+    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')) {
+    }
+    if (module_exists('diff') && !function_exists('content_diff')) {
     module_load_include('inc', 'content', 'includes/content.diff');
-  }
+    }
 }
 
 /**
  * Implementation of hook_perm().
  */
 function content_perm() {
-  return array('Use PHP input for field settings (dangerous - grant with care)');
+    return array('Use PHP input for field settings (dangerous - grant with care)');
 }
 
 /**
  * Implementation of hook_menu_alter().
  */
 function content_menu_alter(&$items) {
-  // Customize the content types page with our own callback
-  $items['admin/content/types']['page callback'] = 'content_types_overview';
-  $items['admin/content/types']['file'] = 'content.admin.inc';
-  $items['admin/content/types']['file path'] = drupal_get_path('module', 'content') .'/includes';
+    // Customize the content types page with our own callback
+    $items['admin/content/types']['page callback'] = 'content_types_overview';
+    $items['admin/content/types']['file'] = 'content.admin.inc';
+    $items['admin/content/types']['file path'] = drupal_get_path('module', 'content') .'/includes';
 }
 
 /**
  * Implementation of hook_menu().
  */
 function content_menu() {
-  $items = array();
-  $items['admin/content/types/fields'] = array(
+    $items = array();
+    $items['admin/content/types/fields'] = array(
     'title' => 'Fields',
     'page callback' => 'content_fields_list',
     'access arguments' => array('administer content types'),
     'file' => 'includes/content.admin.inc',
     'type' => MENU_LOCAL_TASK,
-  );
-  // Callback for AHAH add more buttons.
-  $items['content/js_add_more'] = array(
+    );
+    // Callback for AHAH add more buttons.
+    $items['content/js_add_more'] = array(
     'page callback' => 'content_add_more_js',
     'access arguments' => array('access content'),
     'file' => 'includes/content.node_form.inc',
     'type' => MENU_CALLBACK,
-  );
+    );
 
-  // Make sure this doesn't fire until content_types is working,
-  // and tables are updated, needed to avoid errors on initial installation.
-  if (!defined('MAINTENANCE_MODE') && variable_get('content_schema_version', -1) >= 6007) {
+    // Make sure this doesn't fire until content_types is working,
+    // and tables are updated, needed to avoid errors on initial installation.
+    if (!defined('MAINTENANCE_MODE') && variable_get('content_schema_version', -1) >= 6007) {
     foreach (node_get_types() as $type) {
-      $type_name = $type->type;
-      $content_type = content_types($type_name);
-      $type_url_str = $content_type['url_str'];
-      $items['admin/content/node-type/'. $type_url_str .'/fields'] = array(
+        $type_name = $type->type;
+        $content_type = content_types($type_name);
+        $type_url_str = $content_type['url_str'];
+        $items['admin/content/node-type/'. $type_url_str .'/fields'] = array(
         'title' => 'Manage fields',
         'page callback' => 'drupal_get_form',
         'page arguments' => array('content_field_overview_form', $type_name),
@@ -105,8 +105,8 @@ 
         'file' => 'includes/content.admin.inc',
         'type' => MENU_LOCAL_TASK,
         'weight' => 1,
-      );
-      $items['admin/content/node-type/'. $type_url_str .'/display'] = array(
+        );
+        $items['admin/content/node-type/'. $type_url_str .'/display'] = array(
         'title' => 'Display fields',
         'page callback' => 'drupal_get_form',
         'page arguments' => array('content_display_overview_form', $type_name),
@@ -114,41 +114,41 @@ 
         'file' => 'includes/content.admin.inc',
         'type' => MENU_LOCAL_TASK,
         'weight' => 2,
-      );
-      $contexts = content_build_modes('_tabs');
-      foreach ($contexts as $key => $tab) {
+        );
+        $contexts = content_build_modes('_tabs');
+        foreach ($contexts as $key => $tab) {
         $items['admin/content/node-type/'. $type_url_str .'/display/'. $key] = array(
-          'title' => $tab['title'],
-          'page arguments' => array('content_display_overview_form', $type_name, $key),
-          'access arguments' => array('administer content types'),
-          'type' => $key == 'basic' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK,
-          'weight' => $key == 'basic' ? 0 : 1,
+            'title' => $tab['title'],
+            'page arguments' => array('content_display_overview_form', $type_name, $key),
+            'access arguments' => array('administer content types'),
+            'type' => $key == 'basic' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK,
+            'weight' => $key == 'basic' ? 0 : 1,
         );
-      }
-      // Cast as an array in case this is called before any fields have
-      // been added, like when a new content type is created.
-      foreach ((array) $content_type['fields'] as $field) {
+        }
+        // Cast as an array in case this is called before any fields have
+        // been added, like when a new content type is created.
+        foreach ((array) $content_type['fields'] as $field) {
         $field_name = $field['field_name'];
         $items['admin/content/node-type/'. $type_url_str .'/fields/'. $field_name] = array(
-          'title' => $field['widget']['label'],
-          'page callback' => 'drupal_get_form',
-          'page arguments' => array('content_field_edit_form', $type_name, $field_name),
-          'access arguments' => array('administer content types'),
-          'file' => 'includes/content.admin.inc',
-          'type' => MENU_LOCAL_TASK,
+            'title' => $field['widget']['label'],
+            'page callback' => 'drupal_get_form',
+            'page arguments' => array('content_field_edit_form', $type_name, $field_name),
+            'access arguments' => array('administer content types'),
+            'file' => 'includes/content.admin.inc',
+            'type' => MENU_LOCAL_TASK,
         );
         $items['admin/content/node-type/'. $type_url_str .'/fields/'. $field_name .'/remove'] = array(
-          'title' => 'Remove field',
-          'page callback' => 'drupal_get_form',
-          'page arguments' => array('content_field_remove_form', $type_name, $field_name),
-          'access arguments' => array('administer content types'),
-          'file' => 'includes/content.admin.inc',
-          'type' => MENU_CALLBACK,
+            'title' => 'Remove field',
+            'page callback' => 'drupal_get_form',
+            'page arguments' => array('content_field_remove_form', $type_name, $field_name),
+            'access arguments' => array('administer content types'),
+            'file' => 'includes/content.admin.inc',
+            'type' => MENU_CALLBACK,
         );
-      }
+        }
+    }
     }
-  }
-  return $items;
+    return $items;
 }
 
 /**
@@ -163,69 +163,69 @@ 
  * the same name as the hook_elements key.
  */
 function content_elements() {
-  return array(
+    return array(
     'content_multiple_values' => array(),
     'content_field' => array(),
-  );
+    );
 }
 
 /**
  * Implementation of hook_theme().
  */
 function content_theme() {
-  $path = drupal_get_path('module', 'content') .'/theme';
-  require_once "./$path/theme.inc";
+    $path = drupal_get_path('module', 'content') .'/theme';
+    require_once "./$path/theme.inc";
 
-  return array(
+    return array(
     'content_field' => array(
-      'template' => 'content-field',
-      'arguments' => array('element' => NULL),
-      'path' => $path,
+        'template' => 'content-field',
+        'arguments' => array('element' => NULL),
+        'path' => $path,
     ),
     'content_overview_links' => array(
-      'arguments' => array(),
+        'arguments' => array(),
     ),
     'content_field_overview_form' => array(
-      'template' => 'content-admin-field-overview-form',
-      'file' => 'theme.inc',
-      'path' => $path,
-      'arguments' => array('form' => NULL),
+        'template' => 'content-admin-field-overview-form',
+        'file' => 'theme.inc',
+        'path' => $path,
+        'arguments' => array('form' => NULL),
     ),
     'content_display_overview_form' => array(
-      'template' => 'content-admin-display-overview-form',
-      'file' => 'theme.inc',
-      'path' => $path,
-      'arguments' => array('form' => NULL),
+        'template' => 'content-admin-display-overview-form',
+        'file' => 'theme.inc',
+        'path' => $path,
+        'arguments' => array('form' => NULL),
     ),
     'content_exclude' => array(
-      'arguments' => array('content' => NULL, 'object' => array(), 'context' => NULL),
+        'arguments' => array('content' => NULL, 'object' => array(), 'context' => NULL),
     ),
     'content_view_multiple_field' => array(
-      'arguments' => array('items' => NULL, 'field' => NULL, 'data' => NULL),
+        'arguments' => array('items' => NULL, 'field' => NULL, 'data' => NULL),
     ),
     'content_multiple_values' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_views_api().
  */
 function content_views_api() {
-  return array(
+    return array(
     'api' => 2,
     'path' => drupal_get_path('module', 'content') . '/includes/views',
-  );
+    );
 }
 
 /**
  * Implementation of hook_ctools_plugin_directory().
  */
 function content_ctools_plugin_directory($module, $plugin) {
-  if ($module == 'ctools' && $plugin == 'content_types') {
+    if ($module == 'ctools' && $plugin == 'content_types') {
     return 'includes/panels/' . $plugin;
-  }
+    }
 }
 
 /**
@@ -237,28 +237,28 @@ 
  * cache the loaded object structure and invalidate it during the update process.
  */
 function content_load(&$node) {
-  $cid = 'content:'. $node->nid .':'. $node->vid;
-  if ($cached = cache_get($cid, content_cache_tablename())) {
+    $cid = 'content:'. $node->nid .':'. $node->vid;
+    if ($cached = cache_get($cid, content_cache_tablename())) {
     foreach ($cached->data as $key => $value) {
-      $node->$key = $value;
+        $node->$key = $value;
     }
-  }
-  else {
+    }
+    else {
     $default_additions = _content_field_invoke_default('load', $node);
     if ($default_additions) {
-      foreach ($default_additions as $key => $value) {
+        foreach ($default_additions as $key => $value) {
         $node->$key = $value;
-      }
+        }
     }
     $additions = _content_field_invoke('load', $node);
     if ($additions) {
-      foreach ($additions as $key => $value) {
+        foreach ($additions as $key => $value) {
         $node->$key = $value;
         $default_additions[$key] = $value;
-      }
+        }
     }
     cache_set($cid, $default_additions, content_cache_tablename());
-  }
+    }
 }
 
 /**
@@ -266,8 +266,8 @@ 
  *
  */
 function content_validate(&$node, $form = NULL) {
-  _content_field_invoke('validate', $node, $form);
-  _content_field_invoke_default('validate', $node, $form);
+    _content_field_invoke('validate', $node, $form);
+    _content_field_invoke_default('validate', $node, $form);
 }
 
 /**
@@ -275,8 +275,8 @@ 
  *
  */
 function content_presave(&$node) {
-  _content_field_invoke('presave', $node);
-  _content_field_invoke_default('presave', $node);
+    _content_field_invoke('presave', $node);
+    _content_field_invoke_default('presave', $node);
 }
 
 /**
@@ -285,8 +285,8 @@ 
  * Insert node type fields.
  */
 function content_insert(&$node) {
-  _content_field_invoke('insert', $node);
-  _content_field_invoke_default('insert', $node);
+    _content_field_invoke('insert', $node);
+    _content_field_invoke_default('insert', $node);
 }
 
 /**
@@ -295,9 +295,9 @@ 
  * Update node type fields.
  */
 function content_update(&$node) {
-  _content_field_invoke('update', $node);
-  _content_field_invoke_default('update', $node);
-  cache_clear_all('content:'. $node->nid .':'. $node->vid, content_cache_tablename());
+    _content_field_invoke('update', $node);
+    _content_field_invoke_default('update', $node);
+    cache_clear_all('content:'. $node->nid .':'. $node->vid, content_cache_tablename());
 }
 
 /**
@@ -306,9 +306,9 @@ 
  * Delete node type fields.
  */
 function content_delete(&$node) {
-  _content_field_invoke('delete', $node);
-  _content_field_invoke_default('delete', $node);
-  cache_clear_all('content:'. $node->nid .':', content_cache_tablename(), TRUE);
+    _content_field_invoke('delete', $node);
+    _content_field_invoke_default('delete', $node);
+    cache_clear_all('content:'. $node->nid .':', content_cache_tablename(), TRUE);
 }
 
 /**
@@ -317,9 +317,9 @@ 
  * Delete node type fields for a revision.
  */
 function content_delete_revision(&$node) {
-  _content_field_invoke('delete revision', $node);
-  _content_field_invoke_default('delete revision', $node);
-  cache_clear_all('content:'. $node->nid .':'. $node->vid, content_cache_tablename());
+    _content_field_invoke('delete revision', $node);
+    _content_field_invoke_default('delete revision', $node);
+    cache_clear_all('content:'. $node->nid .':'. $node->vid, content_cache_tablename());
 }
 
 /**
@@ -328,12 +328,12 @@ 
  * Generate field render arrays.
  */
 function content_view(&$node, $teaser = FALSE, $page = FALSE) {
-  // Let field modules sanitize their data for output.
-  _content_field_invoke('sanitize', $node, $teaser, $page);
+    // Let field modules sanitize their data for output.
+    _content_field_invoke('sanitize', $node, $teaser, $page);
 
-  // Merge fields.
-  $additions = _content_field_invoke_default('view', $node, $teaser, $page);
-  $node->content = array_merge((array) $node->content, $additions);
+    // Merge fields.
+    $additions = _content_field_invoke_default('view', $node, $teaser, $page);
+    $node->content = array_merge((array) $node->content, $additions);
 }
 
 /**
@@ -361,8 +361,8 @@ 
  *   The themed output for the field.
  */
 function content_view_field($field, $node, $teaser = FALSE, $page = FALSE) {
-  $output = '';
-  if (isset($node->$field['field_name'])) {
+    $output = '';
+    if (isset($node->$field['field_name'])) {
     $items = $node->$field['field_name'];
 
     // Use 'full'/'teaser' if not specified otherwise.
@@ -373,16 +373,16 @@ 
     $module = $field_types[$field['type']]['module'];
     $function = $module .'_field';
     if (function_exists($function)) {
-      $function('sanitize', $node, $field, $items, $teaser, $page);
-      $node->$field['field_name'] = $items;
+        $function('sanitize', $node, $field, $items, $teaser, $page);
+        $node->$field['field_name'] = $items;
     }
 
     $view = content_field('view', $node, $field, $items, $teaser, $page);
     // content_field('view') adds a wrapper to handle variables and 'excluded'
     // fields for node templates. We bypass it and render the actual field.
     $output = drupal_render($view[$field['field_name']]['field']);
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
@@ -392,7 +392,7 @@ 
  * so that node templates can use it.
  */
 function content_alter(&$node, $teaser = FALSE, $page = FALSE) {
-  _content_field_invoke_default('alter', $node, $teaser, $page);
+    _content_field_invoke_default('alter', $node, $teaser, $page);
 }
 
 /**
@@ -401,70 +401,70 @@ 
  * Generate field render arrays.
  */
 function content_prepare_translation(&$node) {
-  $default_additions = _content_field_invoke_default('prepare translation', $node);
-  $additions = _content_field_invoke('prepare translation', $node);
-  // Merge module additions after the default ones to enable overriding
-  // of field values.
-  $node = (object) array_merge((array) $node, $default_additions, $additions);
+    $default_additions = _content_field_invoke_default('prepare translation', $node);
+    $additions = _content_field_invoke('prepare translation', $node);
+    // Merge module additions after the default ones to enable overriding
+    // of field values.
+    $node = (object) array_merge((array) $node, $default_additions, $additions);
 }
 
 /**
  * Implementation of hook_nodeapi().
  */
 function content_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
-  // Prevent against invalid 'nodes' built by broken 3rd party code.
-  if (isset($node->type)) {
+    // Prevent against invalid 'nodes' built by broken 3rd party code.
+    if (isset($node->type)) {
     $type = content_types($node->type);
     // Save cycles if the type has no CCK fields.
     if (!empty($type['fields'])) {
-      $callback = 'content_'. str_replace(' ', '_', $op);
-      if (function_exists($callback)) {
+        $callback = 'content_'. str_replace(' ', '_', $op);
+        if (function_exists($callback)) {
         $callback($node, $a3, $a4);
-      }
+        }
     }
 
     // Special case for 'view' op, we want to adjust weights of non-cck fields
     // even if there are no actual fields for this type.
     if ($op == 'view') {
-      $node->content['#pre_render'][] = 'content_alter_extra_weights';
-      $node->content['#content_extra_fields'] = $type['extra'];
+        $node->content['#pre_render'][] = 'content_alter_extra_weights';
+        $node->content['#content_extra_fields'] = $type['extra'];
+    }
     }
-  }
 }
 
 /**
  *  Implementation of hook_form_alter().
  */
 function content_form_alter(&$form, $form_state, $form_id) {
-  if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id) {
+    if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id) {
     $type = content_types($form['#node']->type);
     if (!empty($type['fields'])) {
-      module_load_include('inc', 'content', 'includes/content.node_form');
-      // Merge field widgets.
-      $form = array_merge($form, content_form($form, $form_state));
+        module_load_include('inc', 'content', 'includes/content.node_form');
+        // Merge field widgets.
+        $form = array_merge($form, content_form($form, $form_state));
     }
     $form['#pre_render'][] = 'content_alter_extra_weights';
     $form['#content_extra_fields'] = $type['extra'];
-  }
+    }
 }
 
 /**
  * Pre-render callback to adjust weights of non-CCK fields.
  */
 function content_alter_extra_weights($elements) {
-  if (isset($elements['#content_extra_fields'])) {
+    if (isset($elements['#content_extra_fields'])) {
     foreach ($elements['#content_extra_fields'] as $key => $value) {
-      // Some core 'fields' use a different key in node forms and in 'view'
-      // render arrays. Check we're not on a form first.
-      if (!isset($elements['#build_id']) && isset($value['view']) && isset($elements[$value['view']])) {
+        // Some core 'fields' use a different key in node forms and in 'view'
+        // render arrays. Check we're not on a form first.
+        if (!isset($elements['#build_id']) && isset($value['view']) && isset($elements[$value['view']])) {
         $elements[$value['view']]['#weight'] = $value['weight'];
-      }
-      elseif (isset($elements[$key])) {
+        }
+        elseif (isset($elements[$key])) {
         $elements[$key]['#weight'] = $value['weight'];
-      }
+        }
+    }
     }
-  }
-  return $elements;
+    return $elements;
 }
 
 /**
@@ -472,8 +472,8 @@ 
  * included yet when the form is processed and invokes the callback.
  */
 function content_add_more_submit_proxy($form, &$form_state) {
-  module_load_include('inc', 'content', 'includes/content.node_form');
-  content_add_more_submit($form, $form_state);
+    module_load_include('inc', 'content', 'includes/content.node_form');
+    content_add_more_submit($form, $form_state);
 }
 
 /**
@@ -482,21 +482,21 @@ 
  * Combine multiple values into a table with drag-n-drop reordering.
  */
 function theme_content_multiple_values($element) {
-  $field_name = $element['#field_name'];
-  $field = content_fields($field_name);
-  $output = '';
+    $field_name = $element['#field_name'];
+    $field = content_fields($field_name);
+    $output = '';
 
-  if ($field['multiple'] >= 1) {
+    if ($field['multiple'] >= 1) {
     $table_id = $element['#field_name'] .'_values';
     $order_class = $element['#field_name'] .'-delta-order';
     $required = !empty($element['#required']) ? '<span class="form-required" title="'. t('This field is required.') .'">*</span>' : '';
 
     $header = array(
-      array(
+        array(
         'data' => t('!title: !required', array('!title' => $element['#title'], '!required' => $required)),
         'colspan' => 2
-      ),
-      t('Order'),
+        ),
+        t('Order'),
     );
     $rows = array();
 
@@ -504,25 +504,25 @@ 
     // preview or failed validation)
     $items = array();
     foreach (element_children($element) as $key) {
-      if ($key !== $element['#field_name'] .'_add_more') {
+        if ($key !== $element['#field_name'] .'_add_more') {
         $items[] = &$element[$key];
-      }
+        }
     }
     usort($items, '_content_sort_items_value_helper');
 
     // Add the items as table rows.
     foreach ($items as $key => $item) {
-      $item['_weight']['#attributes']['class'] = $order_class;
-      $delta_element = drupal_render($item['_weight']);
-      $cells = array(
+        $item['_weight']['#attributes']['class'] = $order_class;
+        $delta_element = drupal_render($item['_weight']);
+        $cells = array(
         array('data' => '', 'class' => 'content-multiple-drag'),
         drupal_render($item),
         array('data' => $delta_element, 'class' => 'delta-order'),
-      );
-      $rows[] = array(
+        );
+        $rows[] = array(
         'data' => $cells,
         'class' => 'draggable',
-      );
+        );
     }
 
     $output .= theme('table', $header, $rows, array('id' => $table_id, 'class' => 'content-multiple-table'));
@@ -530,14 +530,14 @@ 
     $output .= drupal_render($element[$element['#field_name'] .'_add_more']);
 
     drupal_add_tabledrag($table_id, 'order', 'sibling', $order_class);
-  }
-  else {
+    }
+    else {
     foreach (element_children($element) as $key) {
-      $output .= drupal_render($element[$key]);
+        $output .= drupal_render($element[$key]);
+    }
     }
-  }
 
-  return $output;
+    return $output;
 }
 
 /**
@@ -552,29 +552,29 @@ 
  *   field modules are installed, uninstalled, enabled or disabled.
  */
 function content_notify($op, $module) {
-  switch ($op) {
+    switch ($op) {
     case 'install':
       content_clear_type_cache();
-      break;
+        break;
     case 'uninstall':
       module_load_include('inc', 'content', 'includes/content.crud');
-      content_module_delete($module);
-      break;
+        content_module_delete($module);
+        break;
     case 'enable':
       content_associate_fields($module);
-      content_clear_type_cache();
-      break;
+        content_clear_type_cache();
+        break;
     case 'disable':
       // When CCK modules are disabled before content module's update is run
       // to add the active column, we can't do this.
       if (variable_get('content_schema_version', -1) < 6007) {
         return FALSE;
-      }
-      db_query("UPDATE {". content_field_tablename() ."} SET active=0 WHERE module='%s'", $module);
-      db_query("UPDATE {". content_instance_tablename() ."} SET widget_active=0 WHERE widget_module='%s'", $module);
-      content_clear_type_cache(TRUE);
-      break;
-  }
+        }
+        db_query("UPDATE {". content_field_tablename() ."} SET active=0 WHERE module='%s'", $module);
+        db_query("UPDATE {". content_instance_tablename() ."} SET widget_active=0 WHERE widget_module='%s'", $module);
+        content_clear_type_cache(TRUE);
+        break;
+    }
 }
 
 /**
@@ -584,39 +584,39 @@ 
  *   The name of the module to update on.
  */
 function content_associate_fields($module) {
-  // When CCK modules are enabled before content module's update is run,
-  // to add module and active columns, we can't do this.
-  if (variable_get('content_schema_version', -1) < 6007) {
+    // When CCK modules are enabled before content module's update is run,
+    // to add module and active columns, we can't do this.
+    if (variable_get('content_schema_version', -1) < 6007) {
     return FALSE;
-  }
-  $module_fields = module_invoke($module, 'field_info');
-  if ($module_fields) {
+    }
+    $module_fields = module_invoke($module, 'field_info');
+    if ($module_fields) {
     foreach ($module_fields as $name => $field_info) {
-      watchdog('content', 'Updating field type %type with module %module.', array('%type' => $name, '%module' => $module));
-      db_query("UPDATE {". content_field_tablename() ."} SET module = '%s', active = %d WHERE type = '%s'", $module, 1, $name);
+        watchdog('content', 'Updating field type %type with module %module.', array('%type' => $name, '%module' => $module));
+        db_query("UPDATE {". content_field_tablename() ."} SET module = '%s', active = %d WHERE type = '%s'", $module, 1, $name);
     }
-  }
-  $module_widgets = module_invoke($module, 'widget_info');
-  if ($module_widgets) {
+    }
+    $module_widgets = module_invoke($module, 'widget_info');
+    if ($module_widgets) {
     foreach ($module_widgets as $name => $widget_info) {
-      watchdog('content', 'Updating widget type %type with module %module.', array('%type' => $name, '%module' => $module));
-      db_query("UPDATE {". content_instance_tablename() ."} SET widget_module = '%s', widget_active = %d WHERE widget_type = '%s'", $module, 1, $name);
-    }
-  }
-  // This is called from updates and installs, so get the install-safe
-  // version of a fields array.
-  $fields_set = array();
-  module_load_include('install', 'content');
-  $types = content_types_install();
-  foreach ($types as $type_name => $fields) {
+        watchdog('content', 'Updating widget type %type with module %module.', array('%type' => $name, '%module' => $module));
+        db_query("UPDATE {". content_instance_tablename() ."} SET widget_module = '%s', widget_active = %d WHERE widget_type = '%s'", $module, 1, $name);
+    }
+    }
+    // This is called from updates and installs, so get the install-safe
+    // version of a fields array.
+    $fields_set = array();
+    module_load_include('install', 'content');
+    $types = content_types_install();
+    foreach ($types as $type_name => $fields) {
     foreach ($fields as $field) {
-      if ($field['module'] == $module && !in_array($field['field_name'], $fields_set)) {
+        if ($field['module'] == $module && !in_array($field['field_name'], $fields_set)) {
         $columns = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
         db_query("UPDATE {". content_field_tablename() ."} SET db_columns = '%s' WHERE field_name = '%s'", serialize($columns), $field['field_name']);
         $fields_set[] = $field['field_name'];
-      }
+        }
+    }
     }
-  }
 }
 
 /**
@@ -684,7 +684,7 @@ 
  *   );
  */
 function content_field($op, &$node, $field, &$items, $teaser, $page) {
-  switch ($op) {
+    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
@@ -699,107 +699,107 @@ 
         include_once('./'. drupal_get_path('module', 'content') .'/includes/content.devel.inc');
         content_generate_fields($node, $field);
         $items = $node->{$field['field_name']};
-      }
-
-      // Manual node_save calls might not have all fields filled in.
-      // On node insert, we need to make sure all tables get at least an empty
-      // record, or subsequent edits, using drupal_write_record() in update mode,
-      // won't insert any data.
-      // Missing fields on node update are handled in content_storage().
-      if (empty($items) && !isset($node->nid)) {
+        }
+
+        // Manual node_save calls might not have all fields filled in.
+        // On node insert, we need to make sure all tables get at least an empty
+        // record, or subsequent edits, using drupal_write_record() in update mode,
+        // won't insert any data.
+        // Missing fields on node update are handled in content_storage().
+        if (empty($items) && !isset($node->nid)) {
         foreach (array_keys($field['columns']) as $column) {
-          $items[0][$column] = NULL;
+            $items[0][$column] = NULL;
         }
         $node->$field['field_name'] = $items;
-      }
+        }
 
-      // If there was an AHAH add more button in this field, don't save it.
-      // TODO: is it still needed ?
-      unset($items[$field['field_name'] .'_add_more']);
+        // If there was an AHAH add more button in this field, don't save it.
+        // TODO: is it still needed ?
+        unset($items[$field['field_name'] .'_add_more']);
 
-      if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
+        if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
         // Reorder items to account for drag-n-drop reordering.
         $items = _content_sort_items($field, $items);
-      }
+        }
 
-      // Filter out empty values.
-      $items = content_set_empty($field, $items);
+        // Filter out empty values.
+        $items = content_set_empty($field, $items);
 
-      break;
+        break;
 
     case 'view':
       $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 some massaging.
+        if ($node->build_mode == NODE_BUILD_PREVIEW && content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
         if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
-          // Reorder items to account for drag-n-drop reordering.
-          $items = _content_sort_items($field, $items);
+            // Reorder items to account for drag-n-drop reordering.
+            $items = _content_sort_items($field, $items);
         }
 
         // Filter out empty values.
         $items = content_set_empty($field, $items);
-      }
+        }
 
-      // NODE_BUILD_NORMAL is 0, and ('whatever' == 0) is TRUE, so we need a ===.
-      if ($node->build_mode === NODE_BUILD_NORMAL || $node->build_mode == NODE_BUILD_PREVIEW) {
+        // NODE_BUILD_NORMAL is 0, and ('whatever' == 0) is TRUE, so we need a ===.
+        if ($node->build_mode === NODE_BUILD_NORMAL || $node->build_mode == NODE_BUILD_PREVIEW) {
         $context = $teaser ? 'teaser' : 'full';
-      }
-      else {
+        }
+        else {
         $context = $node->build_mode;
-      }
-      // The field may be missing info for $contexts added by modules
-      // enabled after the field was last edited.
-      $formatter_name = isset($field['display_settings'][$context]) && isset($field['display_settings'][$context]['format']) ? $field['display_settings'][$context]['format'] : 'default';
-      if ($formatter = _content_get_formatter($formatter_name, $field['type'])) {
+        }
+        // The field may be missing info for $contexts added by modules
+        // enabled after the field was last edited.
+        $formatter_name = isset($field['display_settings'][$context]) && isset($field['display_settings'][$context]['format']) ? $field['display_settings'][$context]['format'] : 'default';
+        if ($formatter = _content_get_formatter($formatter_name, $field['type'])) {
         $theme = $formatter['module'] .'_formatter_'. $formatter_name;
         $single = (content_handle('formatter', 'multiple values', $formatter) == CONTENT_HANDLE_CORE);
 
         $label_display = isset($field['display_settings']['label']['format']) ? $field['display_settings']['label']['format'] : 'above';
         // Do not include field labels when indexing content.
         if ($context == NODE_BUILD_SEARCH_INDEX) {
-          $label_display = 'hidden';
+            $label_display = 'hidden';
         }
 
         $element = array(
-          '#type' => 'content_field',
-          '#title' => check_plain(t($field['widget']['label'])),
-          '#field_name' => $field['field_name'],
-          '#access' => $formatter_name != 'hidden' && content_access('view', $field, NULL, $node),
-          '#label_display' => $label_display,
-          '#node' => $node,
-          '#teaser' => $teaser,
-          '#page' => $page,
-          '#context' => $context,
-          '#single' => $single,
-          'items' => array(),
+            '#type' => 'content_field',
+            '#title' => check_plain(t($field['widget']['label'])),
+            '#field_name' => $field['field_name'],
+            '#access' => $formatter_name != 'hidden' && content_access('view', $field, NULL, $node),
+            '#label_display' => $label_display,
+            '#node' => $node,
+            '#teaser' => $teaser,
+            '#page' => $page,
+            '#context' => $context,
+            '#single' => $single,
+            'items' => array(),
         );
 
         // Fill-in items.
         foreach ($items as $delta => $item) {
-          $element['items'][$delta] = array(
+            $element['items'][$delta] = array(
             '#item' => $item,
             '#weight' => $delta,
-          );
+            );
         }
 
         // Append formatter information either on each item ('single-value' formatter)
         // or at the upper 'items' level ('multiple-value' formatter)
         $format_info = array(
-          '#theme' => $theme,
-          '#field_name' => $field['field_name'],
-          '#type_name' => $node->type,
-          '#formatter' => $formatter_name,
-          '#node' => $node,
+            '#theme' => $theme,
+            '#field_name' => $field['field_name'],
+            '#type_name' => $node->type,
+            '#formatter' => $formatter_name,
+            '#node' => $node,
         );
         if ($single) {
-          foreach ($items as $delta => $item) {
+            foreach ($items as $delta => $item) {
             $element['items'][$delta] += $format_info;
             $element['items'][$delta]['#item']['#delta'] = $delta;
-          }
+            }
         }
         else {
-          $element['items'] += $format_info;
+            $element['items'] += $format_info;
         }
 
         // The wrapper lets us get the themed output for the whole field
@@ -807,17 +807,17 @@ 
         // and hide it from the $content variable if needed.
         // See 'preprocess_node' op and theme_content_field_wrapper()?
         $wrapper = array(
-          'field' => $element,
-          '#weight' => $field['widget']['weight'],
-          '#post_render' => array('content_field_wrapper_post_render'),
-          '#field_name' => $field['field_name'],
-          '#type_name' => $node->type,
-          '#context' => $context,
+            'field' => $element,
+            '#weight' => $field['widget']['weight'],
+            '#post_render' => array('content_field_wrapper_post_render'),
+            '#field_name' => $field['field_name'],
+            '#type_name' => $node->type,
+            '#context' => $context,
         );
 
         $addition = array($field['field_name'] => $wrapper);
-      }
-      return $addition;
+        }
+        return $addition;
 
     case 'alter':
       // Add back the formatted values in the 'view' element,
@@ -827,64 +827,64 @@ 
       // 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']])) {
+        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']])) {
+        }
+        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) {
+        if ($wrapper) {
         $element = $wrapper['field'];
         // '#single' is not set if the field is hidden or inaccessible.
         if (isset($element['#single'])) {
-          if (!empty($element['#single'])) {
+            if (!empty($element['#single'])) {
             // Single value formatter.
             foreach (element_children($element['items']) as $delta) {
-              // '#chilren' is not set if the field is empty.
-              $items[$delta]['view'] = isset($element['items'][$delta]['#children']) ? $element['items'][$delta]['#children'] : '';
+                // '#chilren' is not set if the field is empty.
+                $items[$delta]['view'] = isset($element['items'][$delta]['#children']) ? $element['items'][$delta]['#children'] : '';
+            }
             }
-          }
-          elseif (isset($element['items']['#children']))  {
+            elseif (isset($element['items']['#children']))  {
             // Multiple values formatter.
             $items[0]['view'] = $element['items']['#children'];
-          }
+            }
         }
         else {
-          // Hidden or inaccessible field.
-          $items[0]['view'] = '';
+            // Hidden or inaccessible field.
+            $items[0]['view'] = '';
         }
-      }
-      break;
+        }
+        break;
 
     case 'preprocess_node':
       // Add $FIELD_NAME_rendered variables.
       $addition = array();
 
-      // 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']])) {
+        // 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']])) {
+        }
+        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) {
+        if ($wrapper) {
         // '#chilren' is not set if the field is empty.
         $addition[$field['field_name'] .'_rendered'] = isset($wrapper['#children']) ? $wrapper['#children'] : '';
-      }
+        }
 
-      return $addition;
+        return $addition;
 
     case 'prepare translation':
       $addition = array();
-      if (isset($node->translation_source->$field['field_name'])) {
+        if (isset($node->translation_source->$field['field_name'])) {
         $addition[$field['field_name']] = $node->translation_source->$field['field_name'];
-      }
-      return $addition;
-  }
+        }
+        return $addition;
+    }
 }
 
 /**
@@ -899,24 +899,24 @@ 
  *   returns filtered and adjusted item array
  */
 function content_set_empty($field, $items) {
-  // Filter out empty values.
-  $filtered = array();
-  $function = $field['module'] .'_content_is_empty';
-  foreach ((array) $items as $delta => $item) {
+    // Filter out empty values.
+    $filtered = array();
+    $function = $field['module'] .'_content_is_empty';
+    foreach ((array) $items as $delta => $item) {
     if (!$function($item, $field)) {
-      $filtered[] = $item;
+        $filtered[] = $item;
+    }
     }
-  }
 
-  // Make sure we store the right number of 'empty' values.
-  $empty = array();
-  foreach (array_keys($field['columns']) as $column) {
+    // 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);
+    }
+    $pad = $field['multiple'] > 1 ? $field['multiple'] : 1;
+    $filtered = array_pad($filtered, $pad, $empty);
 
-  return $filtered;
+    return $filtered;
 }
 
 /**
@@ -924,15 +924,15 @@ 
  * user drag-n-drop reordering.
  */
 function _content_sort_items($field, $items) {
-  if ($field['multiple'] >= 1 && isset($items[0]['_weight'])) {
+    if ($field['multiple'] >= 1 && isset($items[0]['_weight'])) {
     usort($items, '_content_sort_items_helper');
     foreach ($items as $delta => $item) {
-      if (is_array($items[$delta])) {
+        if (is_array($items[$delta])) {
         unset($items[$delta]['_weight']);
-      }
+        }
+    }
     }
-  }
-  return $items;
+    return $items;
 }
 
 /**
@@ -940,50 +940,50 @@ 
  * (copied form element_sort(), which acts on #weight keys)
  */
 function _content_sort_items_helper($a, $b) {
-  $a_weight = (is_array($a) && isset($a['_weight'])) ? $a['_weight'] : 0;
-  $b_weight = (is_array($b) && isset($b['_weight'])) ? $b['_weight'] : 0;
-  if ($a_weight == $b_weight) {
+    $a_weight = (is_array($a) && isset($a['_weight'])) ? $a['_weight'] : 0;
+    $b_weight = (is_array($b) && isset($b['_weight'])) ? $b['_weight'] : 0;
+    if ($a_weight == $b_weight) {
     return 0;
-  }
-  return ($a_weight < $b_weight) ? -1 : 1;
+    }
+    return ($a_weight < $b_weight) ? -1 : 1;
 }
 
 /**
  * Same as above, using ['_weight']['#value']
  */
 function _content_sort_items_value_helper($a, $b) {
-  $a_weight = (is_array($a) && isset($a['_weight']['#value'])) ? $a['_weight']['#value'] : 0;
-  $b_weight = (is_array($b) && isset($b['_weight']['#value'])) ? $b['_weight']['#value'] : 0;
-  if ($a_weight == $b_weight) {
+    $a_weight = (is_array($a) && isset($a['_weight']['#value'])) ? $a['_weight']['#value'] : 0;
+    $b_weight = (is_array($b) && isset($b['_weight']['#value'])) ? $b['_weight']['#value'] : 0;
+    if ($a_weight == $b_weight) {
     return 0;
-  }
-  return ($a_weight < $b_weight) ? -1 : 1;
+    }
+    return ($a_weight < $b_weight) ? -1 : 1;
 }
 
 /**
  * Handle storage ops for _content_field_invoke_default().
  */
 function content_storage($op, $node) {
-  // Don't try this before content module's update is run to add
-  // the active and module columns.
-  if (variable_get('content_schema_version', -1) < 6007) {
+    // Don't try this before content module's update is run to add
+    // the active and module columns.
+    if (variable_get('content_schema_version', -1) < 6007) {
     return FALSE;
-  }
+    }
 
-  $type_name = $node->type;
-  $type = content_types($type_name);
+    $type_name = $node->type;
+    $type = content_types($type_name);
 
-  switch ($op) {
+    switch ($op) {
     case 'load':
       // OPTIMIZE: load all non multiple fields in a single JOIN query ?
       // warning: 61-join limit in MySQL ?
       $additions = array();
-      // For each table used by this content type,
-      foreach ($type['tables'] as $table) {
+        // For each table used by this content type,
+        foreach ($type['tables'] as $table) {
         $schema = drupal_get_schema($table);
         // The per-type table might not have any fields actually stored in it.
         if (!$schema['content fields']) {
-          continue;
+            continue;
         }
         $query = 'SELECT * FROM {'. $table .'} WHERE vid = %d';
 
@@ -994,25 +994,25 @@ 
 
         // For each table row, populate the fields.
         while ($row = db_fetch_array($result)) {
-          // For each field stored in the table, add the field item.
-          foreach ($schema['content fields'] as $field_name) {
+            // For each field stored in the table, add the field item.
+            foreach ($schema['content fields'] as $field_name) {
             $item = array();
             $field = content_fields($field_name, $type_name);
             $db_info = content_database_info($field);
             // For each column declared by the field, populate the item.
             foreach ($db_info['columns'] as $column => $attributes) {
-              $item[$column] = $row[$attributes['column']];
+                $item[$column] = $row[$attributes['column']];
             }
 
             // Add the item to the field values for the node.
             if (!isset($additions[$field_name])) {
-              $additions[$field_name] = array();
+                $additions[$field_name] = array();
             }
             $additions[$field_name][] = $item;
-          }
+            }
         }
-      }
-      return $additions;
+        }
+        return $additions;
 
     case 'insert':
     case 'update':
@@ -1020,17 +1020,17 @@ 
         $schema = drupal_get_schema($table);
         $record = array();
         foreach ($schema['content fields'] as $field_name) {
-          if (isset($node->$field_name)) {
+            if (isset($node->$field_name)) {
             $field = content_fields($field_name, $type_name);
             // Multiple fields need specific handling, we'll deal with them later on.
             if ($field['multiple']) {
-              continue;
+                continue;
             }
             $db_info = content_database_info($field);
             foreach ($db_info['columns'] as $column => $attributes) {
-              $record[$attributes['column']] = $node->{$field_name}[0][$column];
+                $record[$attributes['column']] = $node->{$field_name}[0][$column];
+            }
             }
-          }
         }
         // $record might be empty because
         // - the table stores a multiple field :
@@ -1038,59 +1038,59 @@ 
         // - this is the per-type table and no field is actually stored in it :
         //   we still store the nid and vid
         if (count($record) || empty($schema['content fields'])) {
-          $record['nid'] = $node->nid;
-          $record['vid'] = $node->vid;
-          // Can't rely on the insert/update op of the node to decide if this
-          // is an insert or an update, a node or revision may have existed
-          // before any fields were created, so there may not be an entry here.
-
-          // TODO - should we auto create an entry for all existing nodes when
-          // fields are added to content types -- either a NULL value
-          // or the default value? May need to offer the user an option of
-          // how to handle that.
-          if (db_result(db_query("SELECT COUNT(*) FROM {". $table ."} WHERE vid = %d", $node->vid))) {
+            $record['nid'] = $node->nid;
+            $record['vid'] = $node->vid;
+            // Can't rely on the insert/update op of the node to decide if this
+            // is an insert or an update, a node or revision may have existed
+            // before any fields were created, so there may not be an entry here.
+
+            // TODO - should we auto create an entry for all existing nodes when
+            // fields are added to content types -- either a NULL value
+            // or the default value? May need to offer the user an option of
+            // how to handle that.
+            if (db_result(db_query("SELECT COUNT(*) FROM {". $table ."} WHERE vid = %d", $node->vid))) {
             content_write_record($table, $record, array('vid'));
-          }
-          else {
+            }
+            else {
             content_write_record($table, $record);
-          }
+            }
+        }
         }
-      }
 
-      // Handle multiple fields.
-      foreach ($type['fields'] as $field) {
+        // Handle multiple fields.
+        foreach ($type['fields'] as $field) {
         if ($field['multiple'] && isset($node->$field['field_name'])) {
-          $db_info = content_database_info($field);
-          // Delete and insert, rather than update, in case a value was added.
-          if ($op == 'update') {
+            $db_info = content_database_info($field);
+            // Delete and insert, rather than update, in case a value was added.
+            if ($op == 'update') {
             db_query('DELETE FROM {'. $db_info['table'] .'} WHERE vid = %d', $node->vid);
-          }
-          foreach ($node->$field['field_name'] as $delta => $item) {
+            }
+            foreach ($node->$field['field_name'] as $delta => $item) {
             $record = array();
             foreach ($db_info['columns'] as $column => $attributes) {
-              $record[$attributes['column']] = $item[$column];
+                $record[$attributes['column']] = $item[$column];
             }
             $record['nid'] = $node->nid;
             $record['vid'] = $node->vid;
             $record['delta'] = $delta;
             content_write_record($db_info['table'], $record);
-          }
+            }
         }
-      }
-      break;
+        }
+        break;
 
     case 'delete':
       foreach ($type['tables'] as $table) {
         db_query('DELETE FROM {'. $table .'} WHERE nid = %d', $node->nid);
-      }
-      break;
+        }
+        break;
 
     case 'delete revision':
       foreach ($type['tables'] as $table) {
         db_query('DELETE FROM {'. $table .'} WHERE vid = %d', $node->vid);
-      }
-      break;
-  }
+        }
+        break;
+    }
 }
 
 /**
@@ -1125,108 +1125,108 @@ 
  *   a new node.
  */
 function content_write_record($table, &$object, $update = array()) {
-  // Standardize $update to an array.
-  if (is_string($update)) {
+    // Standardize $update to an array.
+    if (is_string($update)) {
     $update = array($update);
-  }
+    }
 
-  // Convert to an object if needed.
-  if (is_array($object)) {
+    // Convert to an object if needed.
+    if (is_array($object)) {
     $object = (object) $object;
     $array = TRUE;
-  }
-  else {
+    }
+    else {
     $array = FALSE;
-  }
+    }
 
-  $schema = drupal_get_schema($table);
-  if (empty($schema)) {
+    $schema = drupal_get_schema($table);
+    if (empty($schema)) {
     return FALSE;
-  }
+    }
 
-  $fields = $defs = $values = $serials = $placeholders = array();
+    $fields = $defs = $values = $serials = $placeholders = array();
 
-  // Go through our schema, build SQL, and when inserting, fill in defaults for
-  // fields that are not set.
-  foreach ($schema['fields'] as $field => $info) {
+    // Go through our schema, build SQL, and when inserting, fill in defaults for
+    // fields that are not set.
+    foreach ($schema['fields'] as $field => $info) {
     // Special case -- skip serial types if we are updating.
     if ($info['type'] == 'serial' && count($update)) {
-      continue;
+        continue;
     }
 
     // For inserts, populate defaults from Schema if not already provided
     if (!isset($object->$field) && !count($update) && isset($info['default'])) {
-      $object->$field = $info['default'];
+        $object->$field = $info['default'];
     }
 
     // Track serial fields so we can helpfully populate them after the query.
     if ($info['type'] == 'serial') {
-      $serials[] = $field;
-      // Ignore values for serials when inserting data. Unsupported.
-      unset($object->$field);
+        $serials[] = $field;
+        // Ignore values for serials when inserting data. Unsupported.
+        unset($object->$field);
     }
 
     // Build arrays for the fields, placeholders, and values in our query.
     if (isset($object->$field) || array_key_exists($field, $object)) {
-      $fields[] = $field;
-      if (isset($object->$field)) {
+        $fields[] = $field;
+        if (isset($object->$field)) {
         $placeholders[] = db_type_placeholder($info['type']);
 
         if (empty($info['serialize'])) {
-          $values[] = $object->$field;
+            $values[] = $object->$field;
         }
         else {
-          $values[] = serialize($object->$field);
+            $values[] = serialize($object->$field);
+        }
         }
-      }
-      else {
+        else {
         $placeholders[] = 'NULL';
-      }
+        }
+    }
     }
-  }
 
-  // Build the SQL.
-  $query = '';
-  if (!count($update)) {
+    // Build the SQL.
+    $query = '';
+    if (!count($update)) {
     $query = "INSERT INTO {". $table ."} (". implode(', ', $fields) .') VALUES ('. implode(', ', $placeholders) .')';
     $return = SAVED_NEW;
-  }
-  else {
+    }
+    else {
     $query = '';
     foreach ($fields as $id => $field) {
-      if ($query) {
+        if ($query) {
         $query .= ', ';
-      }
-      $query .= $field .' = '. $placeholders[$id];
+        }
+        $query .= $field .' = '. $placeholders[$id];
     }
 
     foreach ($update as $key) {
-      $conditions[] = "$key = ". db_type_placeholder($schema['fields'][$key]['type']);
-      $values[] = $object->$key;
+        $conditions[] = "$key = ". db_type_placeholder($schema['fields'][$key]['type']);
+        $values[] = $object->$key;
     }
 
     $query = "UPDATE {". $table ."} SET $query WHERE ". implode(' AND ', $conditions);
     $return = SAVED_UPDATED;
-  }
+    }
 
-  // Execute the SQL.
-  if (db_query($query, $values)) {
+    // Execute the SQL.
+    if (db_query($query, $values)) {
     if ($serials) {
-      // Get last insert ids and fill them in.
-      foreach ($serials as $field) {
+        // Get last insert ids and fill them in.
+        foreach ($serials as $field) {
         $object->$field = db_last_insert_id($table, $field);
-      }
+        }
     }
 
     // If we began with an array, convert back so we don't surprise the caller.
     if ($array) {
-      $object = (array) $object;
+        $object = (array) $object;
     }
 
     return $return;
-  }
+    }
 
-  return FALSE;
+    return FALSE;
 }
 
 /**
@@ -1236,12 +1236,12 @@ 
  * called so that the default database handling can occur.
  */
 function _content_field_invoke($op, &$node, $teaser = NULL, $page = NULL) {
-  $type_name = is_string($node) ? $node : (is_array($node) ? $node['type'] : $node->type);
-  $type = content_types($type_name);
-  $field_types = _content_field_types();
+    $type_name = is_string($node) ? $node : (is_array($node) ? $node['type'] : $node->type);
+    $type = content_types($type_name);
+    $field_types = _content_field_types();
 
-  $return = array();
-  foreach ($type['fields'] as $field) {
+    $return = array();
+    foreach ($type['fields'] as $field) {
     $items = isset($node->$field['field_name']) ? $node->$field['field_name'] : array();
 
     // Make sure AHAH 'add more' button isn't sent to the fields for processing.
@@ -1250,52 +1250,52 @@ 
     $module = $field_types[$field['type']]['module'];
     $function = $module .'_field';
     if (function_exists($function)) {
-      $result = $function($op, $node, $field, $items, $teaser, $page);
-      if (is_array($result)) {
+        $result = $function($op, $node, $field, $items, $teaser, $page);
+        if (is_array($result)) {
         $return = array_merge($return, $result);
-      }
-      else if (isset($result)) {
+        }
+        else if (isset($result)) {
         $return[] = $result;
-      }
+        }
     }
     // test for values in $items in case modules added items on insert
     if (isset($node->$field['field_name']) || count($items)) {
-      $node->$field['field_name'] = $items;
+        $node->$field['field_name'] = $items;
+    }
     }
-  }
-  return $return;
+    return $return;
 }
 
 /**
  * Invoke content.module's version of a field hook.
  */
 function _content_field_invoke_default($op, &$node, $teaser = NULL, $page = NULL) {
-  $type_name = is_string($node) ? $node : (is_array($node) ? $node['type'] : $node->type);
-  $type = content_types($type_name);
-  $field_types = _content_field_types();
-
-  $return = array();
-  // The operations involving database queries are better off handled by table
-  // rather than by field.
-  if (in_array($op, array('load', 'insert', 'update', 'delete', 'delete revision'))) {
+    $type_name = is_string($node) ? $node : (is_array($node) ? $node['type'] : $node->type);
+    $type = content_types($type_name);
+    $field_types = _content_field_types();
+
+    $return = array();
+    // The operations involving database queries are better off handled by table
+    // rather than by field.
+    if (in_array($op, array('load', 'insert', 'update', 'delete', 'delete revision'))) {
     return content_storage($op, $node);
-  }
-  else {
+    }
+    else {
     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);
-      if (is_array($result)) {
+        $items = isset($node->$field['field_name']) ? $node->$field['field_name'] : array();
+        $result = content_field($op, $node, $field, $items, $teaser, $page);
+        if (is_array($result)) {
         $return = array_merge($return, $result);
-      }
-      else if (isset($result)) {
+        }
+        else if (isset($result)) {
         $return[] = $result;
-      }
-      if (isset($node->$field['field_name'])) {
+        }
+        if (isset($node->$field['field_name'])) {
         $node->$field['field_name'] = $items;
-      }
+        }
+    }
     }
-  }
-  return $return;
+    return $return;
 }
 
 /**
@@ -1308,19 +1308,19 @@ 
  * info to avoid foreach errors elsewhere in the code.
  */
 function content_types($type_name = NULL) {
-  // handle type name with either an underscore or a dash
-  $type_name = !empty($type_name) ? str_replace('-', '_', $type_name) : NULL;
+    // handle type name with either an underscore or a dash
+    $type_name = !empty($type_name) ? str_replace('-', '_', $type_name) : NULL;
 
-  $info = _content_type_info();
-  if (isset($info['content types'])) {
+    $info = _content_type_info();
+    if (isset($info['content types'])) {
     if (!isset($type_name)) {
-      return $info['content types'];
+        return $info['content types'];
     }
     if (isset($info['content types'][$type_name])) {
-      return $info['content types'][$type_name];
+        return $info['content types'][$type_name];
+    }
     }
-  }
-  return array('tables' => array(), 'fields' => array(), 'extra' => array());
+    return array('tables' => array(), 'fields' => array(), 'extra' => array());
 }
 
 /**
@@ -1337,36 +1337,36 @@ 
  * but empty, as sometimes happens in the formatter.
  */
 function content_fields($field_name = NULL, $content_type_name = NULL) {
-  $info = _content_type_info();
-  if (isset($info['fields'])) {
+    $info = _content_type_info();
+    if (isset($info['fields'])) {
     if (empty($field_name)) {
-      return $info['fields'];
+        return $info['fields'];
     }
     if (isset($info['fields'][$field_name])) {
-      if (empty($content_type_name)) {
+        if (empty($content_type_name)) {
         return $info['fields'][$field_name];
-      }
-      if (isset($info['content types'][$content_type_name]['fields'][$field_name])) {
+        }
+        if (isset($info['content types'][$content_type_name]['fields'][$field_name])) {
         return $info['content types'][$content_type_name]['fields'][$field_name];
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Return a list of field types.
  */
 function _content_field_types() {
-  $info = _content_type_info();
-  return isset($info['field types']) ? $info['field types'] : array();
+    $info = _content_type_info();
+    return isset($info['field types']) ? $info['field types'] : array();
 }
 
 /**
  * Return a list of widget types.
  */
 function _content_widget_types() {
-  $info = _content_type_info();
-  return isset($info['widget types']) ? $info['widget types'] : array();
+    $info = _content_type_info();
+    return isset($info['widget types']) ? $info['widget types'] : array();
 }
 
 /**
@@ -1374,16 +1374,16 @@ 
  * defaulting to 'default' if none is found.
  */
 function _content_get_formatter($formatter_name, $field_type) {
-  $field_types = _content_field_types();
-  $formatters = $field_types[$field_type]['formatters'];
+    $field_types = _content_field_types();
+    $formatters = $field_types[$field_type]['formatters'];
 
-  if (!isset($formatters[$formatter_name]) && $formatter_name != 'hidden') {
+    if (!isset($formatters[$formatter_name]) && $formatter_name != 'hidden') {
     // This might happen when the selected formatter has been renamed in the
     // module, or if the module has been disabled since then.
     $formatter_name = 'default';
-  }
+    }
 
-  return isset($formatters[$formatter_name]) ? $formatters[$formatter_name] : FALSE;
+    return isset($formatters[$formatter_name]) ? $formatters[$formatter_name] : FALSE;
 }
 
 /**
@@ -1393,10 +1393,10 @@ 
  *   If TRUE, clear the cache and fetch the information from the database again.
  */
 function _content_type_info($reset = FALSE) {
-  global $language;
-  static $info;
+    global $language;
+    static $info;
 
-  if ($reset || !isset($info)) {
+    if ($reset || !isset($info)) {
     // Make sure this function doesn't run until the tables have been created,
     // For instance: when first enabled and called from content_menu(),
     // or when uninstalled and some subsequent field module uninstall
@@ -1405,38 +1405,38 @@ 
     // Don't try this before content module's update is run
     // to add module and active columns to the table.
     if (variable_get('content_schema_version', -1) < 6007) {
-      return array();
+        return array();
     }
 
     if (!$reset && $cached = cache_get('content_type_info:'. $language->language, content_cache_tablename())) {
-      $info = $cached->data;
+        $info = $cached->data;
     }
     else {
-      $info = array(
+        $info = array(
         'field types' => array(),
         'widget types' => array(),
         'fields' => array(),
         'content types' => array(),
-      );
+        );
 
-      // Populate field types.
-      foreach (module_list() as $module) {
+        // Populate field types.
+        foreach (module_list() as $module) {
         $module_field_types = module_invoke($module, 'field_info');
         if ($module_field_types) {
-          foreach ($module_field_types as $name => $field_info) {
+            foreach ($module_field_types as $name => $field_info) {
             // Truncate names to match the value that is stored in the database.
             $db_name = substr($name, 0, 32);
             $info['field types'][$db_name] = $field_info;
             $info['field types'][$db_name]['module'] = $module;
             $info['field types'][$db_name]['formatters'] = array();
-          }
+            }
+        }
         }
-      }
 
-      // Populate widget types and formatters for known field types.
-      foreach (module_list() as $module) {
+        // Populate widget types and formatters for known field types.
+        foreach (module_list() as $module) {
         if ($module_widgets = module_invoke($module, 'widget_info')) {
-          foreach ($module_widgets as $name => $widget_info) {
+            foreach ($module_widgets as $name => $widget_info) {
             // Truncate names to match the value that is stored in the database.
             $db_name = substr($name, 0, 32);
             $info['widget types'][$db_name] = $widget_info;
@@ -1444,44 +1444,44 @@ 
             // Replace field types with db_compatible version of known field types.
             $info['widget types'][$db_name]['field types'] = array();
             foreach ($widget_info['field types'] as $field_type) {
-              $field_type_db_name = substr($field_type, 0, 32);
-              if (isset($info['field types'][$field_type_db_name])) {
+                $field_type_db_name = substr($field_type, 0, 32);
+                if (isset($info['field types'][$field_type_db_name])) {
                 $info['widget types'][$db_name]['field types'][] = $field_type_db_name;
-              }
+                }
+            }
             }
-          }
         }
 
         if ($module_formatters = module_invoke($module, 'field_formatter_info')) {
-          foreach ($module_formatters as $name => $formatter_info) {
+            foreach ($module_formatters as $name => $formatter_info) {
             foreach ($formatter_info['field types'] as $field_type) {
-              // Truncate names to match the value that is stored in the database.
-              $db_name = substr($field_type, 0, 32);
-              if (isset($info['field types'][$db_name])) {
+                // Truncate names to match the value that is stored in the database.
+                $db_name = substr($field_type, 0, 32);
+                if (isset($info['field types'][$db_name])) {
                 $info['field types'][$db_name]['formatters'][$name] = $formatter_info;
                 $info['field types'][$db_name]['formatters'][$name]['module'] = $module;
-              }
+                }
             }
-          }
+            }
+        }
         }
-      }
 
-      // Populate actual field instances.
-      module_load_include('inc', 'content', 'includes/content.crud');
-      foreach (node_get_types('types', NULL, TRUE) as $type_name => $data) {
+        // Populate actual field instances.
+        module_load_include('inc', 'content', 'includes/content.crud');
+        foreach (node_get_types('types', NULL, TRUE) as $type_name => $data) {
         $type = (array) $data;
         $type['url_str'] = str_replace('_', '-', $type['type']);
         $type['fields'] = array();
         $type['tables'] = array();
         if ($fields = content_field_instance_read(array('type_name' => $type_name))) {
-          foreach ($fields as $field) {
+            foreach ($fields as $field) {
             $db_info = content_database_info($field);
             $type['tables'][$db_info['table']] = $db_info['table'];
 
             // Allow external modules to translate field strings.
             $field_strings = array(
-              'widget_label' => $field['widget']['label'],
-              'widget_description' => $field['widget']['description'],
+                'widget_label' => $field['widget']['label'],
+                'widget_description' => $field['widget']['description'],
             );
             drupal_alter('content_field_strings', $field_strings, $field['type_name'], $field['field_name']);
             $field['widget']['label'] = $field_strings['widget_label'];
@@ -1491,11 +1491,11 @@ 
             // This means that content_fields($field_name) (no type name)
             // returns the last instance loaded.
             $info['fields'][$field['field_name']] = $field;
-          }
-          // Make sure the per-type table is added, even if no field is actually
-          // stored in it.
-          $table = _content_tablename($type['type'], CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
-          $type['tables'][$table] = $table;
+            }
+            // Make sure the per-type table is added, even if no field is actually
+            // stored in it.
+            $table = _content_tablename($type['type'], CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
+            $type['tables'][$table] = $table;
         }
 
         // Gather information about non-CCK 'fields'.
@@ -1503,21 +1503,21 @@ 
         drupal_alter('content_extra_fields', $extra, $type_name);
         // Add saved weights.
         foreach (variable_get('content_extra_weights_'. $type_name, array()) as $key => $value) {
-          // Some stored entries might not exist anymore, for instance if uploads
-          // have been disabled, or vocabularies removed...
-          if (isset($extra[$key])) {
+            // Some stored entries might not exist anymore, for instance if uploads
+            // have been disabled, or vocabularies removed...
+            if (isset($extra[$key])) {
             $extra[$key]['weight'] = $value;
-          }
+            }
         }
         $type['extra'] = $extra;
 
         $info['content types'][$type_name] = $type;
-      }
+        }
 
-      cache_set('content_type_info:'. $language->language, $info, content_cache_tablename());
+        cache_set('content_type_info:'. $language->language, $info, content_cache_tablename());
+    }
     }
-  }
-  return $info;
+    return $info;
 }
 
 /**
@@ -1525,20 +1525,20 @@ 
  *  React to change in node types
  */
 function content_node_type($op, $info) {
-  switch ($op) {
+    switch ($op) {
     case 'insert':
       module_load_include('inc', 'content', 'includes/content.crud');
-      content_type_create($info);
-      break;
+        content_type_create($info);
+        break;
     case 'update':
       module_load_include('inc', 'content', 'includes/content.crud');
-      content_type_update($info);
-      break;
+        content_type_update($info);
+        break;
     case 'delete':
       module_load_include('inc', 'content', 'includes/content.crud');
-      content_type_delete($info);
-      break;
-  }
+        content_type_delete($info);
+        break;
+    }
 }
 
 /**
@@ -1546,19 +1546,19 @@ 
  * information is changed.
  */
 function content_clear_type_cache($rebuild_schema = FALSE) {
-  cache_clear_all('*', content_cache_tablename(), TRUE);
-  _content_type_info(TRUE);
+    cache_clear_all('*', content_cache_tablename(), TRUE);
+    _content_type_info(TRUE);
 
-  // Refresh the schema to pick up new information.
-  if ($rebuild_schema) {
+    // Refresh the schema to pick up new information.
+    if ($rebuild_schema) {
     $schema = drupal_get_schema(NULL, TRUE);
-  }
+    }
 
-  if (module_exists('views')) {
+    if (module_exists('views')) {
     // Needed because this can be called from .install files
     module_load_include('module', 'views');
     views_invalidate_cache();
-  }
+    }
 }
 
 /**
@@ -1577,38 +1577,38 @@ 
  *       database column that stores the data.
  */
 function content_database_info($field) {
-  $db_info = array();
-  if ($field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD) {
+    $db_info = array();
+    if ($field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD) {
     $db_info['table'] = _content_tablename($field['field_name'], CONTENT_DB_STORAGE_PER_FIELD);
-  }
-  else {
+    }
+    else {
     $db_info['table'] = _content_tablename($field['type_name'], CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
-  }
+    }
 
-  $db_info['columns'] = (array) $field['columns'];
-  // Generate column names for this field from generic column names.
-  foreach ($db_info['columns'] as $column_name => $attributes) {
+    $db_info['columns'] = (array) $field['columns'];
+    // Generate column names for this field from generic column names.
+    foreach ($db_info['columns'] as $column_name => $attributes) {
     $db_info['columns'][$column_name]['column'] = $field['field_name'] .'_'. $column_name;
-  }
+    }
 
-  return $db_info;
+    return $db_info;
 }
 
 /**
  * Helper function for identifying the storage type for a field.
  */
 function content_storage_type($field) {
-  if ($field['multiple'] > 0) {
+    if ($field['multiple'] > 0) {
     return CONTENT_DB_STORAGE_PER_FIELD;
-  }
-  else {
+    }
+    else {
     module_load_include('inc', 'content', 'includes/content.crud');
     $instances = content_field_instance_read(array('field_name' => $field['field_name']));
     if (count($instances) > 1) {
-      return CONTENT_DB_STORAGE_PER_FIELD;
+        return CONTENT_DB_STORAGE_PER_FIELD;
+    }
     }
-  }
-  return CONTENT_DB_STORAGE_PER_CONTENT_TYPE;
+    return CONTENT_DB_STORAGE_PER_CONTENT_TYPE;
 }
 
 /**
@@ -1625,20 +1625,20 @@ 
  *   The transposed array.
  */
 function content_transpose_array_rows_cols($array) {
-  $result = array();
-  if (is_array($array)) {
+    $result = array();
+    if (is_array($array)) {
     foreach ($array as $key1 => $value1) {
-      if (is_array($value1)) {
+        if (is_array($value1)) {
         foreach ($value1 as $key2 => $value2) {
-          if (!isset($result[$key2])) {
+            if (!isset($result[$key2])) {
             $result[$key2] = array();
-          }
-          $result[$key2][$key1] = $value2;
+            }
+            $result[$key2][$key1] = $value2;
         }
-      }
+        }
+    }
     }
-  }
-  return $result;
+    return $result;
 }
 
 /**
@@ -1650,18 +1650,18 @@ 
  *   A flattened array.
  */
 function content_array_flatten($array) {
-  $result = array();
-  if (is_array($array)) {
+    $result = array();
+    if (is_array($array)) {
     foreach ($array as $key => $value) {
-      if (is_array($value)) {
+        if (is_array($value)) {
         $result += content_array_flatten($value);
-      }
-      else {
+        }
+        else {
         $result[$key] = $value;
-      }
+        }
+    }
     }
-  }
-  return $result;
+    return $result;
 }
 
 /**
@@ -1680,46 +1680,46 @@ 
  *   when allowed values list is generated using PHP code.
  */
 function content_allowed_values($field, $flatten = TRUE) {
-  static $allowed_values;
+    static $allowed_values;
 
-  $cid = $field['field_name'] .':'. ($flatten ? '1' : '0');
-  if (isset($allowed_values[$cid])) {
+    $cid = $field['field_name'] .':'. ($flatten ? '1' : '0');
+    if (isset($allowed_values[$cid])) {
     return $allowed_values[$cid];
-  }
+    }
 
-  $allowed_values[$cid] = array();
+    $allowed_values[$cid] = array();
 
-  if (isset($field['allowed_values_php'])) {
+    if (isset($field['allowed_values_php'])) {
     ob_start();
     $result = eval($field['allowed_values_php']);
     if (is_array($result)) {
-      if ($flatten) {
+        if ($flatten) {
         $result = content_array_flatten($result);
-      }
-      $allowed_values[$cid] = $result;
+        }
+        $allowed_values[$cid] = $result;
     }
     ob_end_clean();
-  }
+    }
 
-  if (empty($allowed_values[$cid]) && isset($field['allowed_values'])) {
+    if (empty($allowed_values[$cid]) && isset($field['allowed_values'])) {
     $list = explode("\n", $field['allowed_values']);
     $list = array_map('trim', $list);
     $list = array_filter($list, 'strlen');
     foreach ($list as $opt) {
-      // Sanitize the user input with a permissive filter.
-      $opt = content_filter_xss($opt);
-      if (strpos($opt, '|') !== FALSE) {
+        // Sanitize the user input with a permissive filter.
+        $opt = content_filter_xss($opt);
+        if (strpos($opt, '|') !== FALSE) {
         list($key, $value) = explode('|', $opt);
         $allowed_values[$cid][$key] = (isset($value) && $value !=='') ? $value : $key;
-      }
-      else {
+        }
+        else {
         $allowed_values[$cid][$opt] = $opt;
-      }
+        }
     }
     // Allow external modules to translate allowed values list.
     drupal_alter('content_allowed_values', $allowed_values[$cid], $field);
-  }
-  return $allowed_values[$cid];
+    }
+    return $allowed_values[$cid];
 }
 
 /**
@@ -1730,14 +1730,14 @@ 
  * @see content_handler_filter_many_to_one::allowed_values()
  */
 function content_allowed_values_filter_html(&$options) {
-  foreach ($options as $key => $opt) {
+    foreach ($options as $key => $opt) {
     if (is_array($opt)) {
-      content_allowed_values_filter_html($options[$key]);
+        content_allowed_values_filter_html($options[$key]);
     }
     else {
-      $options[$key] = html_entity_decode(strip_tags($opt), ENT_QUOTES);
+        $options[$key] = html_entity_decode(strip_tags($opt), ENT_QUOTES);
+    }
     }
-  }
 }
 
 /**
@@ -1748,21 +1748,21 @@ 
  * (so check_plain() is not acceptable).
  */
 function content_filter_xss($string) {
-  return filter_xss($string, _content_filter_xss_allowed_tags());
+    return filter_xss($string, _content_filter_xss_allowed_tags());
 }
 
 /**
  * List of tags allowed by content_filter_xss().
  */
 function _content_filter_xss_allowed_tags() {
-  return array('a', 'b', 'big',  'code', 'del', 'em', 'i', 'ins',  'pre', 'q', 'small', 'span', 'strong', 'sub', 'sup', 'tt', 'ol', 'ul', 'li', 'p', 'br', 'img');
+    return array('a', 'b', 'big',  'code', 'del', 'em', 'i', 'ins',  'pre', 'q', 'small', 'span', 'strong', 'sub', 'sup', 'tt', 'ol', 'ul', 'li', 'p', 'br', 'img');
 }
 
 /**
  * Human-readable list of allowed tags, for display in help texts.
  */
 function _content_filter_xss_display_allowed_tags() {
-  return '<'. implode('> <', _content_filter_xss_allowed_tags()) .'>';
+    return '<'. implode('> <', _content_filter_xss_allowed_tags()) .'>';
 }
 
 /**
@@ -1790,52 +1790,52 @@ 
  *   functions as necessary.
  */
 function content_format($field, $item, $formatter_name = 'default', $node = NULL) {
-  if (!is_array($field)) {
+    if (!is_array($field)) {
     $field = content_fields($field);
-  }
+    }
 
-  if (content_access('view', $field, NULL, $node) && $formatter = _content_get_formatter($formatter_name, $field['type'])) {
+    if (content_access('view', $field, NULL, $node) && $formatter = _content_get_formatter($formatter_name, $field['type'])) {
     $theme = $formatter['module'] .'_formatter_'. $formatter_name;
 
     $element = array(
-      '#theme' => $theme,
-      '#field_name' => $field['field_name'],
-      '#type_name' => isset($node->type) ? $node->type :'',
-      '#formatter' => $formatter_name,
-      '#node' => $node,
-      '#delta' => isset($item['#delta']) ? $item['#delta'] : NULL,
+        '#theme' => $theme,
+        '#field_name' => $field['field_name'],
+        '#type_name' => isset($node->type) ? $node->type :'',
+        '#formatter' => $formatter_name,
+        '#node' => $node,
+        '#delta' => isset($item['#delta']) ? $item['#delta'] : NULL,
     );
 
     if (content_handle('formatter', 'multiple values', $formatter) == CONTENT_HANDLE_CORE) {
-      // Single value formatter.
+        // Single value formatter.
 
-      // hook_field('sanitize') expects an array of items, so we build one.
-      $items = array($item);
-      $function = $field['module'] .'_field';
-      if (function_exists($function)) {
+        // hook_field('sanitize') expects an array of items, so we build one.
+        $items = array($item);
+        $function = $field['module'] .'_field';
+        if (function_exists($function)) {
         $function('sanitize', $node, $field, $items, FALSE, FALSE);
-      }
+        }
 
-      $element['#item'] = $items[0];
+        $element['#item'] = $items[0];
     }
     else {
-      // Multiple values formatter.
-      $items = $item;
-      $function = $field['module'] .'_field';
-      if (function_exists($function)) {
+        // Multiple values formatter.
+        $items = $item;
+        $function = $field['module'] .'_field';
+        if (function_exists($function)) {
         $function('sanitize', $node, $field, $items, FALSE, FALSE);
-      }
+        }
 
-      foreach ($items as $delta => $item) {
+        foreach ($items as $delta => $item) {
         $element[$delta] = array(
-          '#item' => $item,
-          '#weight' => $delta,
+            '#item' => $item,
+            '#weight' => $delta,
         );
-      }
+        }
     }
 
     return theme($theme, $element);
-  }
+    }
 }
 
 /**
@@ -1851,31 +1851,31 @@ 
  *   - a string tab id: the build modes in this tab.
  */
 function content_build_modes($selector = NULL) {
-  static $info;
+    static $info;
 
-  if (!isset($info)) {
+    if (!isset($info)) {
     $data = array();
     foreach (module_implements('content_build_modes') as $module) {
-      $function = $module .'_content_build_modes';
-      $data = array_merge($data, (array) $function());
+        $function = $module .'_content_build_modes';
+        $data = array_merge($data, (array) $function());
     }
     $flat = array();
     foreach ($data as $tab) {
-      // Use the + operator to preserve numeric indexes (core build modes).
-      $flat += (array) $tab['build modes'];
+        // Use the + operator to preserve numeric indexes (core build modes).
+        $flat += (array) $tab['build modes'];
     }
     $info = array('tabs' => $data, 'build modes' => $flat);
-  }
+    }
 
-  if ($selector === '_tabs') {
+    if ($selector === '_tabs') {
     return $info['tabs'];
-  }
-  elseif (isset($selector) && isset($info['tabs'][$selector])) {
+    }
+    elseif (isset($selector) && isset($info['tabs'][$selector])) {
     return isset($info['tabs'][$selector]) ? $info['tabs'][$selector]['build modes'] : array();
-  }
-  else {
+    }
+    else {
     return $info['build modes'];
-  }
+    }
 }
 
 /**
@@ -1914,60 +1914,60 @@ 
  * );
  */
 function node_content_build_modes() {
-  return array(
+    return array(
     'basic' => array(
-      'title' => t('Basic'),
-      'build modes' => array(
+        'title' => t('Basic'),
+        'build modes' => array(
         'teaser' => array(
-          'title' => t('Teaser'),
-          'views style' => TRUE,
+            'title' => t('Teaser'),
+            'views style' => TRUE,
         ),
         'full' => array(
-          'title' => t('Full node'),
-          'views style' => TRUE,
+            'title' => t('Full node'),
+            'views style' => TRUE,
+        ),
         ),
-      ),
     ),
     'rss' => array(
-      'title' => t('RSS'),
-      'build modes' => array(
+        'title' => t('RSS'),
+        'build modes' => array(
         NODE_BUILD_RSS => array(
-          'title' => t('RSS'),
-          'views style' => FALSE,
+            'title' => t('RSS'),
+            'views style' => FALSE,
+        ),
         ),
-      ),
     ),
-  );
+    );
 }
 function search_content_build_modes() {
-  return array(
+    return array(
     'search' => array(
-      'title' => t('Search'),
-      'build modes' => array(
+        'title' => t('Search'),
+        'build modes' => array(
         NODE_BUILD_SEARCH_INDEX => array(
-          'title' => t('Search Index'),
-          'views style' => FALSE,
+            'title' => t('Search Index'),
+            'views style' => FALSE,
         ),
         NODE_BUILD_SEARCH_RESULT => array(
-          'title' => t('Search Result'),
-          'views style' => FALSE,
+            'title' => t('Search Result'),
+            'views style' => FALSE,
+        ),
         ),
-      ),
     ),
-  );
+    );
 }
 function book_content_build_modes() {
-  return array(
+    return array(
     'print' => array(
-      'title' => t('Print'),
-      'build modes' => array(
+        'title' => t('Print'),
+        'build modes' => array(
         NODE_BUILD_PRINT => array(
-          'title' => t('Print'),
-          'views style' => TRUE,
+            'title' => t('Print'),
+            'views style' => TRUE,
+        ),
         ),
-      ),
     ),
-  );
+    );
 }
 
 /**
@@ -1981,19 +1981,19 @@ 
  *   A string containing the generated name for the database table
  */
 function _content_tablename($name, $storage, $version = NULL) {
-  if (is_null($version)) {
+    if (is_null($version)) {
     $version = variable_get('content_schema_version', 0);
-  }
+    }
 
-  if ($version < 1003) {
+    if ($version < 1003) {
     $version = 0;
-  }
-  else {
+    }
+    else {
     $version = 1003;
-  }
+    }
 
-  $name = str_replace('-', '_', $name);
-  switch ("$version-$storage") {
+    $name = str_replace('-', '_', $name);
+    switch ("$version-$storage") {
     case '0-'. CONTENT_DB_STORAGE_PER_CONTENT_TYPE :
       return "node_$name";
     case '0-'. CONTENT_DB_STORAGE_PER_FIELD :
@@ -2002,7 +2002,7 @@ 
       return "content_type_$name";
     case '1003-'. CONTENT_DB_STORAGE_PER_FIELD :
       return "content_$name";
-  }
+    }
 }
 
 /**
@@ -2014,10 +2014,10 @@ 
  * with 'content_field'.
  */
 function content_field_tablename($version = NULL) {
-  if (is_null($version)) {
+    if (is_null($version)) {
     $version = variable_get('content_schema_version', 0);
-  }
-  return $version < 6001 ? 'node_field' : 'content_node_field';
+    }
+    return $version < 6001 ? 'node_field' : 'content_node_field';
 }
 
 /**
@@ -2026,10 +2026,10 @@ 
  * Needed because the table name changes depending on version.
  */
 function content_instance_tablename($version = NULL) {
-  if (is_null($version)) {
+    if (is_null($version)) {
     $version = variable_get('content_schema_version', 0);
-  }
-  return $version < 6001 ? 'node_field_instance' : 'content_node_field_instance';
+    }
+    return $version < 6001 ? 'node_field_instance' : 'content_node_field_instance';
 }
 
 /**
@@ -2040,12 +2040,12 @@ 
  * update 6000 runs, so the cache table will be used instead.
  */
 function content_cache_tablename() {
-  if (variable_get('content_schema_version', -1) < 6000) {
+    if (variable_get('content_schema_version', -1) < 6000) {
     return 'cache';
-  }
-  else {
+    }
+    else {
     return 'cache_content';
-  }
+    }
 }
 
 /**
@@ -2056,45 +2056,45 @@ 
  * otherwise the function will return the whole thing.
  */
 function content_table_schema($field = NULL) {
-  $schema = array(
+    $schema = array(
     'fields' => array(
-      'vid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
-      'nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0)
+        'vid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
+        'nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0)
     ),
     'primary key' => array('vid'),
     'indexes' => array(
-      'nid'    => array('nid'),
+        'nid'    => array('nid'),
     ),
-  );
+    );
 
-  // Add delta column if needed.
-  if (!empty($field['multiple'])) {
+    // Add delta column if needed.
+    if (!empty($field['multiple'])) {
     $schema['fields']['delta'] = array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0);
     $schema['primary key'][] = 'delta';
-  }
-  $schema['content fields'] = array();
+    }
+    $schema['content fields'] = array();
 
-  // Add field columns column if needed.
-  // This function is called from install files where it is not safe
-  // to use content_fields() or content_database_info(), so we
-  // just used the column values stored in the $field.
-  // We also need the schema to include fields from disabled modules
-  // or there will be no way to delete those fields.
+    // Add field columns column if needed.
+    // This function is called from install files where it is not safe
+    // to use content_fields() or content_database_info(), so we
+    // just used the column values stored in the $field.
+    // We also need the schema to include fields from disabled modules
+    // or there will be no way to delete those fields.
 
-  if (!empty($field['columns'])) {
+    if (!empty($field['columns'])) {
     foreach ($field['columns'] as $column => $attributes) {
-      $column_name =  $field['field_name'] .'_'. $column;
-      if (isset($attributes['index']) && $attributes['index']) {
+        $column_name =  $field['field_name'] .'_'. $column;
+        if (isset($attributes['index']) && $attributes['index']) {
         $schema['indexes'][$column_name] = array($column_name);
         unset($attributes['index']);
-      }
-      unset($attributes['column']);
-      unset($attributes['sortable']);
-      $schema['fields'][$column_name] = $attributes;
+        }
+        unset($attributes['column']);
+        unset($attributes['sortable']);
+        $schema['fields'][$column_name] = $attributes;
     }
     $schema['content fields'][] = $field['field_name'];
-  }
-  return $schema;
+    }
+    return $schema;
 }
 
 /**
@@ -2112,26 +2112,26 @@ 
  *   TRUE if the table exists. Otherwise FALSE.
  */
 function content_db_index_exists($table, $name) {
-  global $db_type;
-  if ($db_type == 'mysql' || $db_type == 'mysqli') {
+    global $db_type;
+    if ($db_type == 'mysql' || $db_type == 'mysqli') {
     if (version_compare(db_version(), '5.0.3') < 0) {
-      // Earlier versions of MySQL don't support a WHERE clause for SHOW.
-      $result = db_query('SHOW INDEX FROM {'. $table .'}');
-      while ($row = db_fetch_array($result)) {
+        // Earlier versions of MySQL don't support a WHERE clause for SHOW.
+        $result = db_query('SHOW INDEX FROM {'. $table .'}');
+        while ($row = db_fetch_array($result)) {
         if ($row['Key_name'] == $name) {
-          return TRUE;
+            return TRUE;
+        }
         }
-      }
-      return FALSE;
+        return FALSE;
     }
     return (bool)db_result(db_query("SHOW INDEX FROM {". $table ."} WHERE key_name = '$name'"));
-  }
-  elseif ($db_type == 'pgsql') {
+    }
+    elseif ($db_type == 'pgsql') {
     // Note that the index names in Schema API for PostgreSQL are prefixed by
     // the table name and suffixed by '_idx'.
     return (bool)db_result(db_query("SELECT COUNT(indexname) FROM pg_indexes WHERE indexname = '{". $table ."}_{$name}_idx'"));
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -2152,15 +2152,15 @@ 
  *
  */
 function content_callback($entity, $op, $field) {
-  switch ($entity) {
+    switch ($entity) {
     case 'field':
       $info = module_invoke($field['module'], "field_info");
-      return isset($info[$field['type']]['callbacks'][$op]) ? $info[$field['type']]['callbacks'][$op] : CONTENT_CALLBACK_DEFAULT;
+        return isset($info[$field['type']]['callbacks'][$op]) ? $info[$field['type']]['callbacks'][$op] : CONTENT_CALLBACK_DEFAULT;
 
     case 'widget':
       $info = module_invoke($field['widget']['module'], "widget_info");
-      return isset($info[$field['widget']['type']]['callbacks'][$op]) ? $info[$field['widget']['type']]['callbacks'][$op] : CONTENT_CALLBACK_DEFAULT;
-  }
+        return isset($info[$field['widget']['type']]['callbacks'][$op]) ? $info[$field['widget']['type']]['callbacks'][$op] : CONTENT_CALLBACK_DEFAULT;
+    }
 }
 
 /**
@@ -2182,20 +2182,20 @@ 
  *    CONTENT_HANDLE_MODULE  - the implementing module handles this operation.
  */
 function content_handle($entity, $op, $object) {
-  switch ($entity) {
+    switch ($entity) {
     case 'field':
       $info = module_invoke($object['module'], "field_info");
-      return isset($info[$object['type']][$op]) ? $info[$object['type']][$op] : CONTENT_HANDLE_CORE;
+        return isset($info[$object['type']][$op]) ? $info[$object['type']][$op] : CONTENT_HANDLE_CORE;
 
     case 'widget':
       $info = module_invoke($object['widget']['module'], "widget_info");
-      return isset($info[$object['widget']['type']][$op]) ? $info[$object['widget']['type']][$op] : CONTENT_HANDLE_CORE;
+        return isset($info[$object['widget']['type']][$op]) ? $info[$object['widget']['type']][$op] : CONTENT_HANDLE_CORE;
 
     case 'formatter':
       // Much simpler, formatters arrays *are* the 'formatter_info' itself.
       // We let content_handle deal with them only for code consistency.
       return isset($object[$op]) ? $object[$op] : CONTENT_HANDLE_CORE;
-  }
+    }
 }
 
 /**
@@ -2211,22 +2211,22 @@ 
  *    The default value for that field.
  */
 function content_default_value(&$form, &$form_state, $field, $delta) {
-  $widget_types = _content_widget_types();
-  $module = $widget_types[$field['widget']['type']]['module'];
+    $widget_types = _content_widget_types();
+    $module = $widget_types[$field['widget']['type']]['module'];
 
-  $default_value = array();
-  if (!empty($field['widget']['default_value_php'])) {
+    $default_value = array();
+    if (!empty($field['widget']['default_value_php'])) {
     ob_start();
     $result = eval($field['widget']['default_value_php']);
     ob_end_clean();
     if (is_array($result)) {
-      $default_value = $result;
+        $default_value = $result;
+    }
     }
-  }
-  elseif (!empty($field['widget']['default_value'])) {
+    elseif (!empty($field['widget']['default_value'])) {
     $default_value = $field['widget']['default_value'];
-  }
-  return (array) $default_value;
+    }
+    return (array) $default_value;
 }
 
 /**
@@ -2247,33 +2247,33 @@ 
  *   FALSE if the operation is denied.
  */
 function content_access($op, $field, $account = NULL, $node = NULL) {
-  global $user;
+    global $user;
 
-  if (is_null($account)) {
+    if (is_null($account)) {
     $account = $user;
-  }
-  // Check for valid field data.
-  if (!isset($field['field_name'])) {
+    }
+    // Check for valid field data.
+    if (!isset($field['field_name'])) {
     return FALSE;
-  }
-  $access = module_invoke_all('field_access', $op, $field, $account, $node);
-  foreach ($access as $value) {
+    }
+    $access = module_invoke_all('field_access', $op, $field, $account, $node);
+    foreach ($access as $value) {
     if ($value === FALSE) {
-      return FALSE;
+        return FALSE;
+    }
     }
-  }
-  return TRUE;
+    return TRUE;
 }
 
- /**
- * Hide specified fields from the $content variable in node templates.
- */
+    /**
+     * Hide specified fields from the $content variable in node templates.
+     */
 function content_field_wrapper_post_render($content, $element) {
-  $field = content_fields($element['#field_name'], $element['#type_name']);
-  if (theme('content_exclude', $content, $field, $element['#context'])) {
+    $field = content_fields($element['#field_name'], $element['#type_name']);
+    if (theme('content_exclude', $content, $field, $element['#context'])) {
     return '';
-  }
-  return $content;
+    }
+    return $content;
 }
 
 
@@ -2329,17 +2329,17 @@ 
  *   as set on the Manage fields screen.
  */
 function theme_content_exclude($content, $object, $context) {
-  // The field may be missing info for $contexts added by modules
-  // enabled after the field was last edited.
-  if (empty($object['display_settings'])
+    // The field may be missing info for $contexts added by modules
+    // enabled after the field was last edited.
+    if (empty($object['display_settings'])
     || empty($object['display_settings'][$context])
     || !is_array($object['display_settings'][$context])
     || empty($object['display_settings'][$context]['exclude'])) {
     return FALSE;
-  }
-  else {
+    }
+    else {
     return TRUE;
-  }
+    }
 }
 
 /**
@@ -2358,48 +2358,48 @@ 
  * doesn't get called when the theme overrides the template. Bug in theme layer ?
  */
 function template_preprocess_content_field(&$variables) {
-  $element = $variables['element'];
-  $field = content_fields($element['#field_name'], $element['#node']->type);
+    $element = $variables['element'];
+    $field = content_fields($element['#field_name'], $element['#node']->type);
 
-  $variables['node'] = $element['#node'];
-  $variables['field'] = $field;
-  $variables['items'] = array();
+    $variables['node'] = $element['#node'];
+    $variables['field'] = $field;
+    $variables['items'] = array();
 
-  if ($element['#single']) {
+    if ($element['#single']) {
     // Single value formatter.
     foreach (element_children($element['items']) as $delta) {
-      $variables['items'][$delta] = $element['items'][$delta]['#item'];
-      // Use isset() to avoid undefined index message on #children when field values are empty.
-      $variables['items'][$delta]['view'] = isset($element['items'][$delta]['#children']) ? $element['items'][$delta]['#children'] : '';
+        $variables['items'][$delta] = $element['items'][$delta]['#item'];
+        // Use isset() to avoid undefined index message on #children when field values are empty.
+        $variables['items'][$delta]['view'] = isset($element['items'][$delta]['#children']) ? $element['items'][$delta]['#children'] : '';
     }
-  }
-  else  {
+    }
+    else  {
     // Multiple values formatter.
     // We display the 'all items' output as $items[0], as if it was the
     // output of a single valued field.
     // Raw values are still exposed for all items.
     foreach (element_children($element['items']) as $delta) {
-      $variables['items'][$delta] = $element['items'][$delta]['#item'];
+        $variables['items'][$delta] = $element['items'][$delta]['#item'];
     }
     $variables['items'][0]['view'] = $element['items']['#children'];
-  }
+    }
 
-  $variables['teaser'] = $element['#teaser'];
-  $variables['page'] = $element['#page'];
+    $variables['teaser'] = $element['#teaser'];
+    $variables['page'] = $element['#page'];
 
-  $field_empty = TRUE;
+    $field_empty = TRUE;
 
-  foreach ($variables['items'] as $delta => $item) {
+    foreach ($variables['items'] as $delta => $item) {
     if (!isset($item['view']) || (empty($item['view']) && (string)$item['view'] !== '0')) {
-      $variables['items'][$delta]['empty'] = TRUE;
+        $variables['items'][$delta]['empty'] = TRUE;
     }
     else {
-      $field_empty = FALSE;
-      $variables['items'][$delta]['empty'] = FALSE;
+        $field_empty = FALSE;
+        $variables['items'][$delta]['empty'] = FALSE;
+    }
     }
-  }
 
-  $additions = array(
+    $additions = array(
     'field_type' => $field['type'],
     'field_name' => $field['field_name'],
     'field_type_css' => strtr($field['type'], '_', '-'),
@@ -2408,13 +2408,13 @@ 
     'label_display' => $element['#label_display'],
     'field_empty' => $field_empty,
     'template_files' => array(
-      'content-field',
-      'content-field-'. $element['#field_name'],
-      'content-field-'. $element['#node']->type,
-      'content-field-'. $element['#field_name'] .'-'. $element['#node']->type,
+        'content-field',
+        'content-field-'. $element['#field_name'],
+        'content-field-'. $element['#node']->type,
+        'content-field-'. $element['#field_name'] .'-'. $element['#node']->type,
     ),
-  );
-  $variables = array_merge($variables, $additions);
+    );
+    $variables = array_merge($variables, $additions);
 }
 
 /**
@@ -2425,8 +2425,8 @@ 
  * - Adds the formatted values in the 'view' key of the items.
  */
 function content_preprocess_node(&$vars) {
-  $additions = _content_field_invoke_default('preprocess_node', $vars['node']);
-  $vars = array_merge($vars, $additions);
+    $additions = _content_field_invoke_default('preprocess_node', $vars['node']);
+    $vars = array_merge($vars, $additions);
 }
 
 /**
@@ -2438,10 +2438,10 @@ 
  * @param $field
  */
 function content_content_fieldapi($op, $field) {
-  if (module_exists('devel')) {
+    if (module_exists('devel')) {
     //dsm($op);
     //dsm($field);
-  }
+    }
 }
 
 /**
@@ -2450,115 +2450,115 @@ 
  * Informations for non-CCK 'node fields' defined in core.
  */
 function content_content_extra_fields($type_name) {
-  $type = node_get_types('type', $type_name);
-  $extra = array();
+    $type = node_get_types('type', $type_name);
+    $extra = array();
 
-  if ($type->has_title) {
+    if ($type->has_title) {
     $extra['title'] = array(
-      'label' => $type->title_label,
-      'description' => t('Node module form.'),
-      'weight' => -5
+        'label' => $type->title_label,
+        'description' => t('Node module form.'),
+        'weight' => -5
     );
-  }
-  if ($type->has_body) {
+    }
+    if ($type->has_body) {
     $extra['body_field'] = array(
-      'label' => $type->body_label,
-      'description' => t('Node module form.'),
-      'weight' => 0,
-      'view' => 'body'
+        'label' => $type->body_label,
+        'description' => t('Node module form.'),
+        'weight' => 0,
+        'view' => 'body'
     );
-  }
-  $extra['revision_information'] = array(
+    }
+    $extra['revision_information'] = array(
     'label' => t('Revision information'),
     'description' => t('Node module form.'),
     'weight' => 20
-  );
-  $extra['author'] = array(
+    );
+    $extra['author'] = array(
     'label' => t('Authoring information'),
     'description' => t('Node module form.'),
     'weight' => 20,
-  );
-  $extra['options'] = array(
+    );
+    $extra['options'] = array(
     'label' => t('Publishing options'),
     'description' => t('Node module form.'),
     'weight' => 25,
-   );
-  if (module_exists('comment')) {
+    );
+    if (module_exists('comment')) {
     $extra['comment_settings'] = array(
-      'label' => t('Comment settings'),
-      'description' => t('Comment module form.'),
-      'weight' => 30
+        'label' => t('Comment settings'),
+        'description' => t('Comment module form.'),
+        'weight' => 30
     );
-  }
-  if (module_exists('locale') && variable_get("language_content_type_$type_name", 0)) {
+    }
+    if (module_exists('locale') && variable_get("language_content_type_$type_name", 0)) {
     $extra['language'] = array(
-      'label' => t('Language'),
-      'description' => t('Locale module form.'),
-      'weight' => 0
+        'label' => t('Language'),
+        'description' => t('Locale module form.'),
+        'weight' => 0
     );
-  }
-  if (module_exists('translation') && translation_supported_type($type_name)) {
+    }
+    if (module_exists('translation') && translation_supported_type($type_name)) {
     $extra['translation'] = array(
-      'label' => t('Translation settings'),
-      'description' => t('Translation module form.'),
-      'weight' => 30
+        'label' => t('Translation settings'),
+        'description' => t('Translation module form.'),
+        'weight' => 30
     );
-  }
-  if (module_exists('menu')) {
+    }
+    if (module_exists('menu')) {
     $extra['menu'] = array(
-      'label' => t('Menu settings'),
-      'description' => t('Menu module form.'),
-      'weight' => -2
+        'label' => t('Menu settings'),
+        'description' => t('Menu module form.'),
+        'weight' => -2
     );
-  }
-  if (module_exists('taxonomy') && taxonomy_get_vocabularies($type_name)) {
+    }
+    if (module_exists('taxonomy') && taxonomy_get_vocabularies($type_name)) {
     $extra['taxonomy'] = array(
-      'label' => t('Taxonomy'),
-      'description' => t('Taxonomy module form.'),
-      'weight' => -3
+        'label' => t('Taxonomy'),
+        'description' => t('Taxonomy module form.'),
+        'weight' => -3
     );
-  }
-  if (module_exists('book')) {
+    }
+    if (module_exists('book')) {
     $extra['book'] = array(
-      'label' => t('Book'),
-      'description' => t('Book module form.'),
-      'weight' => 10
+        'label' => t('Book'),
+        'description' => t('Book module form.'),
+        'weight' => 10
     );
-  }
-  if (module_exists('path')) {
+    }
+    if (module_exists('path')) {
     $extra['path'] = array(
-      'label' => t('Path settings'),
-      'description' => t('Path module form.'),
-      'weight' => 30
+        'label' => t('Path settings'),
+        'description' => t('Path module form.'),
+        'weight' => 30
     );
-  }
-  if ($type_name == 'poll' && module_exists('poll')) {
+    }
+    if ($type_name == 'poll' && module_exists('poll')) {
     $extra['title'] = array(
-      'label' => t('Poll title'),
-      'description' => t('Poll module title.'),
-      'weight' => -5
+        'label' => t('Poll title'),
+        'description' => t('Poll module title.'),
+        'weight' => -5
     );
     $extra['choice_wrapper'] = array(
-      'label' => t('Poll choices'),
-      'description' => t('Poll module choices.'),
-      'weight' => -4
+        'label' => t('Poll choices'),
+        'description' => t('Poll module choices.'),
+        'weight' => -4
     );
     $extra['settings'] = array(
-      'label' => t('Poll settings'),
-      'description' => t('Poll module settings.'),
-      'weight' => -3
+        'label' => t('Poll settings'),
+        'description' => t('Poll module settings.'),
+        'weight' => -3
     );
-  }
-  if (module_exists('upload') && variable_get("upload_$type_name", TRUE)) {
+    }
+    if (module_exists('upload') && variable_get("upload_$type_name", TRUE)) {
     $extra['attachments'] = array(
-      'label' => t('File attachments'),
-      'description' => t('Upload module form.'),
-      'weight' => 30,
-      'view' => 'files'
+        'label' => t('File attachments'),
+        'description' => t('Upload module form.'),
+        'weight' => 30,
+        'view' => 'files'
     );
-  }
+    }
 
-  return $extra;
+    return $extra;
 }
 
 /**
@@ -2579,18 +2579,18 @@ 
  *   by content.module.
  */
 function content_extra_field_weight($type_name, $pseudo_field_name) {
-  $type = content_types($type_name);
+    $type = content_types($type_name);
 
-  // If we don't have the requested item, this may be because the cached
-  // information for 'extra' fields hasn't been refreshed yet.
-  if (!isset($type['extra'][$pseudo_field_name])) {
+    // If we don't have the requested item, this may be because the cached
+    // information for 'extra' fields hasn't been refreshed yet.
+    if (!isset($type['extra'][$pseudo_field_name])) {
     content_clear_type_cache();
     $type = content_types($type_name);
-  }
+    }
 
-  if (isset($type['extra'][$pseudo_field_name])) {
+    if (isset($type['extra'][$pseudo_field_name])) {
     return $type['extra'][$pseudo_field_name]['weight'];
-  }
+    }
 }
 
 /**
@@ -2617,68 +2617,68 @@ 
  * Do we want to eliminate them from the results?
  */
 function content_max_delta($field_name, $type_name = NULL) {
-  $fields = content_fields();
-  $field = $fields[$field_name];
+    $fields = content_fields();
+    $field = $fields[$field_name];
 
-  // Non-multiple value fields don't use the delta column,
-  // but could exist in multiple databases. If any value
-  // exists in any examined table, the max delta will be zero.
-  if (empty($field['multiple'])) {
+    // Non-multiple value fields don't use the delta column,
+    // but could exist in multiple databases. If any value
+    // exists in any examined table, the max delta will be zero.
+    if (empty($field['multiple'])) {
     $content_types = content_types();
     foreach ($content_types as $content_type) {
-      if (empty($type_name) || $content_type['type'] == $type_name) {
+        if (empty($type_name) || $content_type['type'] == $type_name) {
         foreach ($content_type['fields'] as $field) {
-          $db_info = content_database_info($field);
-          if (db_result(db_query("SELECT COUNT(*) FROM {". $db_info['table'] ."}")) >= 1) {
+            $db_info = content_database_info($field);
+            if (db_result(db_query("SELECT COUNT(*) FROM {". $db_info['table'] ."}")) >= 1) {
             return 0;
-          }
+            }
+        }
         }
-      }
     }
-  }
-  // Multiple value fields always share the same table and use the delta.
-  // If we want to find delta values for a particular type, we join
-  // in the node table to limit the type.
-  else {
+    }
+    // Multiple value fields always share the same table and use the delta.
+    // If we want to find delta values for a particular type, we join
+    // in the node table to limit the type.
+    else {
     $db_info = content_database_info($field);
     if (!empty($type_name)) {
-      $delta = db_result(db_query("SELECT MAX(delta) FROM {". $db_info['table'] ."} f LEFT JOIN {node} n ON f.vid = n.vid WHERE n.type = '%s'", $type_name));
+        $delta = db_result(db_query("SELECT MAX(delta) FROM {". $db_info['table'] ."} f LEFT JOIN {node} n ON f.vid = n.vid WHERE n.type = '%s'", $type_name));
     }
     else {
-      $delta = db_result(db_query("SELECT MAX(delta) FROM {". $db_info['table'] ."}"));
+        $delta = db_result(db_query("SELECT MAX(delta) FROM {". $db_info['table'] ."}"));
     }
     if ($delta >= 0) {
-      return $delta;
+        return $delta;
     }
-  }
-  // If we got this far, there is no data for this field.
-  return NULL;
+    }
+    // If we got this far, there is no data for this field.
+    return NULL;
 }
 
 /**
  * Helper function to identify inactive fields.
  */
 function content_inactive_fields($type_name = NULL) {
-  module_load_include('inc', 'content', 'includes/content.crud');
-  if (!empty($type_name)) {
+    module_load_include('inc', 'content', 'includes/content.crud');
+    if (!empty($type_name)) {
     $param = array('type_name' => $type_name);
     $inactive = array($type_name => array());
-  }
-  else {
+    }
+    else {
     $param = array();
     $inactive = array();
-  }
-  $all = content_field_instance_read($param, TRUE);
-  $active = array_keys(content_fields());
-  foreach ($all as $field) {
+    }
+    $all = content_field_instance_read($param, TRUE);
+    $active = array_keys(content_fields());
+    foreach ($all as $field) {
     if (!in_array($field['field_name'], $active)) {
-      $inactive[$field['type_name']][$field['field_name']] = content_field_instance_expand($field);
+        $inactive[$field['type_name']][$field['field_name']] = content_field_instance_expand($field);
+    }
     }
-  }
-  if (!empty($type_name)) {
+    if (!empty($type_name)) {
     return $inactive[$type_name];
-  }
-  return $inactive;
+    }
+    return $inactive;
 }
 
  
@@ -2689,21 +2689,21 @@ 
  * if the fields have other (shared) instances that are still active.
  */
 function content_inactive_instances($type_name = NULL) {
-  module_load_include('inc', 'content', 'includes/content.crud');
-  if (!empty($type_name)) {
+    module_load_include('inc', 'content', 'includes/content.crud');
+    if (!empty($type_name)) {
     $param = array('type_name' => $type_name);
     $inactive = array($type_name => array());
-  }
-  else {
+    }
+    else {
     $param = array();
     $inactive = array();
-  }
-  $all = content_field_instance_read($param, TRUE);
-  foreach ($all as $field) {
+    }
+    $all = content_field_instance_read($param, TRUE);
+    foreach ($all as $field) {
     $inactive[$field['type_name']][$field['field_name']] = content_field_instance_expand($field);
-  }
-  if (!empty($type_name)) {
+    }
+    if (!empty($type_name)) {
     return $inactive[$type_name];
-  }
-  return $inactive;
+    }
+    return $inactive;
 }