BOINC / boinc

drupal/sites/default/boinc/modules/contrib/cck/includes/content.admin.inc

Indentation +811 added lines, -811 removed lines

@@ -11,68 +11,68 @@ 
  * Menu callback; replacement for node_overview_types().
  */
 function content_types_overview() {
-  $types = node_get_types();
-  $names = node_get_types('names');
-  $header = array(t('Name'), t('Type'), t('Description'), array('data' => t('Operations'), 'colspan' => '4'),);
-  $rows = array();
+    $types = node_get_types();
+    $names = node_get_types('names');
+    $header = array(t('Name'), t('Type'), t('Description'), array('data' => t('Operations'), 'colspan' => '4'),);
+    $rows = array();
 
-  foreach ($names as $key => $name) {
+    foreach ($names as $key => $name) {
     $type = $types[$key];
     if (node_hook($type, 'form')) {
-      $type_url_str = str_replace('_', '-', $type->type);
-      $row = array(
+        $type_url_str = str_replace('_', '-', $type->type);
+        $row = array(
         check_plain($name),
         check_plain($type->type),
-      );
-      // Make the description smaller
-      $row[] = array('data' => filter_xss_admin($type->description), 'class' => 'description');
-      // Set the edit column.
-      $row[] = array('data' => l(t('edit'), 'admin/content/node-type/'. $type_url_str));
-      // Set links for managing fields.
-      // TODO: a hook to allow other content modules to add more stuff?
-      $row[] = array('data' => l(t('manage fields'), 'admin/content/node-type/'. $type_url_str .'/fields'));
-      // Set the delete column.
-      if ($type->custom) {
+        );
+        // Make the description smaller
+        $row[] = array('data' => filter_xss_admin($type->description), 'class' => 'description');
+        // Set the edit column.
+        $row[] = array('data' => l(t('edit'), 'admin/content/node-type/'. $type_url_str));
+        // Set links for managing fields.
+        // TODO: a hook to allow other content modules to add more stuff?
+        $row[] = array('data' => l(t('manage fields'), 'admin/content/node-type/'. $type_url_str .'/fields'));
+        // Set the delete column.
+        if ($type->custom) {
         $row[] = array('data' => l(t('delete'), 'admin/content/node-type/'. $type_url_str .'/delete'));
-      }
-      else {
+        }
+        else {
         $row[] = array('data' => '');
-      }
+        }
 
-      $rows[] = $row;
+        $rows[] = $row;
+    }
     }
-  }
 
-  // Allow external modules alter the table headers and rows.
-  foreach (module_implements('content_types_overview_alter') as $module) {
+    // Allow external modules alter the table headers and rows.
+    foreach (module_implements('content_types_overview_alter') as $module) {
     $function = $module .'_content_types_overview_alter';
     $function($header, $rows);
-  }
+    }
 
-  if (empty($rows)) {
+    if (empty($rows)) {
     $rows[] = array(array('data' => t('No content types available.'), 'colspan' => '7', 'class' => 'message'));
-  }
+    }
 
-  return theme('table', $header, $rows) .theme('content_overview_links');
+    return theme('table', $header, $rows) .theme('content_overview_links');
 }
 
 function theme_content_overview_links() {
-  return '<div class="content-overview-links">'. l(t('» Add a new content type'), 'admin/content/types/add') .'</div>';
+    return '<div class="content-overview-links">'. l(t('» Add a new content type'), 'admin/content/types/add') .'</div>';
 }
 
 /**
  * Menu callback; lists all defined fields for quick reference.
  */
 function content_fields_list() {
-  $fields = content_fields();
-  $field_types = _content_field_types();
+    $fields = content_fields();
+    $field_types = _content_field_types();
 
-  // Sort fields by field name.
-  ksort($fields);
+    // Sort fields by field name.
+    ksort($fields);
 
-  $header = array(t('Field name'), t('Field type'), t('Used in'));
-  $rows = array();
-  foreach ($fields as $field) {
+    $header = array(t('Field name'), t('Field type'), t('Used in'));
+    $rows = array();
+    foreach ($fields as $field) {
     $row = array();
     $row[] = $field['locked'] ? t('@field_name (Locked)', array('@field_name' => $field['field_name'])) : $field['field_name'];
     $row[] = t($field_types[$field['type']]['label']);
@@ -85,40 +85,40 @@ 
     "AND nfi.widget_active = 1 ".
     "ORDER BY nt.name ASC", $field['field_name']);
     while ($type = db_fetch_array($result)) {
-      $content_type = content_types($type['type']);
-      $types[] = l($type['name'], 'admin/content/node-type/'. $content_type['url_str'] .'/fields');
+        $content_type = content_types($type['type']);
+        $types[] = l($type['name'], 'admin/content/node-type/'. $content_type['url_str'] .'/fields');
     }
     $row[] = implode(', ', $types);
 
     $rows[] = array('data' => $row, 'class' => $field['locked'] ? 'menu-disabled' : '');
-  }
-  if (empty($rows)) {
+    }
+    if (empty($rows)) {
     $output = t('No fields have been defined for any content type yet.');
-  }
-  else {
+    }
+    else {
     $output = theme('table', $header, $rows);
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Helper function to display a message about inactive fields.
  */
 function content_inactive_message($type_name) {
-  $inactive_fields = content_inactive_fields($type_name);
-  if (!empty($inactive_fields)) {
+    $inactive_fields = content_inactive_fields($type_name);
+    if (!empty($inactive_fields)) {
     $field_types = _content_field_types();
     $widget_types = _content_widget_types($type_name);
     drupal_set_message(t('This content type has inactive fields. Inactive fields are not included in lists of available fields until their modules are enabled.'), 'error');
     foreach ($inactive_fields as $field_name => $field) {
-      drupal_set_message(t('!field (!field_name) is an inactive !field_type field that uses a !widget_type widget.', array(
-      '!field' => $field['widget']['label'],
-      '!field_name' => $field['field_name'],
-      '!field_type' => array_key_exists($field['type'], $field_types) ? $field_types[$field['type']]['label'] : $field['type'],
-      '!widget_type' => array_key_exists($field['widget']['type'], $widget_types) ? $widget_types[$field['widget']['type']]['label'] : $field['widget']['type'],
-      )));
-    }
-  }
+        drupal_set_message(t('!field (!field_name) is an inactive !field_type field that uses a !widget_type widget.', array(
+        '!field' => $field['widget']['label'],
+        '!field_name' => $field['field_name'],
+        '!field_type' => array_key_exists($field['type'], $field_types) ? $field_types[$field['type']]['label'] : $field['type'],
+        '!widget_type' => array_key_exists($field['widget']['type'], $widget_types) ? $widget_types[$field['widget']['type']]['label'] : $field['widget']['type'],
+        )));
+    }
+    }
 }
 
 /**
@@ -129,34 +129,34 @@ 
  */
 function content_field_overview_form(&$form_state, $type_name) {
 
-  content_inactive_message($type_name);
+    content_inactive_message($type_name);
 
-  // When displaying the form, make sure the list of fields
-  // is up-to-date.
-  if (empty($form_state['post'])) {
+    // When displaying the form, make sure the list of fields
+    // is up-to-date.
+    if (empty($form_state['post'])) {
     content_clear_type_cache();
-  }
+    }
 
-  // Gather type information.
-  $type = content_types($type_name);
-  $fields = $type['fields'];
-  $field_types = _content_field_types();
+    // Gather type information.
+    $type = content_types($type_name);
+    $fields = $type['fields'];
+    $field_types = _content_field_types();
 
-  $extra = $type['extra'];
-  $groups = $group_options = $group_types = array();
-  if (module_exists('fieldgroup')) {
+    $extra = $type['extra'];
+    $groups = $group_options = $group_types = array();
+    if (module_exists('fieldgroup')) {
     $groups = fieldgroup_groups($type['type']);
     $group_types = fieldgroup_types();
     $group_options = _fieldgroup_groups_label($type['type']);
     // Add the ability to group under the newly created row.
     $group_options['_add_new_group'] = '_add_new_group';
-  }
+    }
 
-  // Store the default weights as we meet them, to be able to put the
-  //'add new' rows after them.
-  $weights = array();
+    // Store the default weights as we meet them, to be able to put the
+    //'add new' rows after them.
+    $weights = array();
 
-  $form = array(
+    $form = array(
     '#tree' => TRUE,
     '#type_name' => $type['type'],
     '#fields' => array_keys($fields),
@@ -164,94 +164,94 @@ 
     '#extra' => array_keys($extra),
     '#field_rows' => array(),
     '#group_rows' => array(),
-  );
+    );
 
-  // Fields.
-  foreach ($fields as $name => $field) {
+    // Fields.
+    foreach ($fields as $name => $field) {
     $weight = $field['widget']['weight'];
     $form[$name] = array(
-      'label' => array('#value' => check_plain($field['widget']['label'])),
-      'field_name' => array('#value' => $field['field_name']),
-      'type' => array('#value' => t($field_types[$field['type']]['label'])),
-      'configure' => array('#value' => l(t('Configure'), 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'])),
-      'remove' => array('#value' => l(t('Remove'), 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'] .'/remove')),
-      'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
-      'parent' => array('#type' => 'select', '#options' => $group_options, '#default_value' => ''),
-      'prev_parent' => array('#type' => 'hidden', '#value' => ''),
-      'hidden_name' => array('#type' => 'hidden', '#default_value' => $field['field_name']),
-      '#leaf' => TRUE,
-      '#row_type' => 'field',
-      'field' =>  array('#type' => 'value', '#value' => $field),
+        'label' => array('#value' => check_plain($field['widget']['label'])),
+        'field_name' => array('#value' => $field['field_name']),
+        'type' => array('#value' => t($field_types[$field['type']]['label'])),
+        'configure' => array('#value' => l(t('Configure'), 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'])),
+        'remove' => array('#value' => l(t('Remove'), 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'] .'/remove')),
+        'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
+        'parent' => array('#type' => 'select', '#options' => $group_options, '#default_value' => ''),
+        'prev_parent' => array('#type' => 'hidden', '#value' => ''),
+        'hidden_name' => array('#type' => 'hidden', '#default_value' => $field['field_name']),
+        '#leaf' => TRUE,
+        '#row_type' => 'field',
+        'field' =>  array('#type' => 'value', '#value' => $field),
     );
     if ($field['locked']) {
-      $form[$name]['configure'] = array('#value' => t('Locked'));
-      $form[$name]['remove'] = array();
-      $form[$name]['#disabled_row'] = TRUE;
+        $form[$name]['configure'] = array('#value' => t('Locked'));
+        $form[$name]['remove'] = array();
+        $form[$name]['#disabled_row'] = TRUE;
     }
     $form['#field_rows'][] = $name;
     $weights[] = $weight;
-  }
+    }
 
-  // Groups.
-  foreach ($groups as $name => $group) {
+    // Groups.
+    foreach ($groups as $name => $group) {
     $weight = $group['weight'];
     $form[$name] = array(
-      'label' => array('#value' => check_plain($group['label'])),
-      'group_name' => array('#value' => $group['group_name']),
-      'group_type' => array('#value' => t($group_types[$group['group_type']])),
-      'configure' => array('#value' => l(t('Configure'), 'admin/content/node-type/'. $type['url_str'] .'/groups/'. $group['group_name'])),
-      'remove' => array('#value' => l(t('Remove'), 'admin/content/node-type/'. $type['url_str'] .'/groups/'. $group['group_name'] .'/remove')),
-      'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
-      'parent' => array('#type' => 'hidden', '#default_value' => ''),
-      'hidden_name' => array('#type' => 'hidden', '#default_value' => $group['group_name']),
-      '#root' => TRUE,
-      '#row_type' => 'group',
-      'group' => array('#type' => 'value', '#value' => $group),
+        'label' => array('#value' => check_plain($group['label'])),
+        'group_name' => array('#value' => $group['group_name']),
+        'group_type' => array('#value' => t($group_types[$group['group_type']])),
+        'configure' => array('#value' => l(t('Configure'), 'admin/content/node-type/'. $type['url_str'] .'/groups/'. $group['group_name'])),
+        'remove' => array('#value' => l(t('Remove'), 'admin/content/node-type/'. $type['url_str'] .'/groups/'. $group['group_name'] .'/remove')),
+        'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
+        'parent' => array('#type' => 'hidden', '#default_value' => ''),
+        'hidden_name' => array('#type' => 'hidden', '#default_value' => $group['group_name']),
+        '#root' => TRUE,
+        '#row_type' => 'group',
+        'group' => array('#type' => 'value', '#value' => $group),
     );
     // Adjust child fields rows.
     foreach ($group['fields'] as $field_name => $field) {
-      $form[$field_name]['parent']['#default_value'] = $name;
-      $form[$field_name]['prev_parent']['#value'] = $name;
+        $form[$field_name]['parent']['#default_value'] = $name;
+        $form[$field_name]['prev_parent']['#value'] = $name;
     }
     $form['#group_rows'][] = $name;
     $weights[] = $weight;
-  }
+    }
 
-  // Non-CCK 'fields'.
-  foreach ($extra as $name => $label) {
+    // Non-CCK 'fields'.
+    foreach ($extra as $name => $label) {
     $weight = $extra[$name]['weight'];
     $form[$name] = array(
-      'label' => array('#value' => check_plain(t($extra[$name]['label']))),
-      'description' => array('#value' => isset($extra[$name]['description']) ? $extra[$name]['description'] : ''),
-      'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
-      'parent' => array('#type' => 'hidden', '#default_value' => ''),
-      'configure' => array('#value' => isset($extra[$name]['configure']) ? $extra[$name]['configure'] : ''),
-      'remove' => array('#value' => isset($extra[$name]['remove']) ? $extra[$name]['remove'] : ''),
-      'hidden_name' => array('#type' => 'hidden', '#default_value' => $name),
-      '#leaf' => TRUE,
-      '#root' => TRUE,
-      '#disabled_row' => TRUE,
-      '#row_type' => 'extra',
+        'label' => array('#value' => check_plain(t($extra[$name]['label']))),
+        'description' => array('#value' => isset($extra[$name]['description']) ? $extra[$name]['description'] : ''),
+        'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
+        'parent' => array('#type' => 'hidden', '#default_value' => ''),
+        'configure' => array('#value' => isset($extra[$name]['configure']) ? $extra[$name]['configure'] : ''),
+        'remove' => array('#value' => isset($extra[$name]['remove']) ? $extra[$name]['remove'] : ''),
+        'hidden_name' => array('#type' => 'hidden', '#default_value' => $name),
+        '#leaf' => TRUE,
+        '#root' => TRUE,
+        '#disabled_row' => TRUE,
+        '#row_type' => 'extra',
     );
     $form['#field_rows'][] = $name;
     $weights[] = $weight;
-  }
+    }
 
-  // Additional row : add new field.
-  $weight = max($weights) + 1;
-  $field_type_options = content_field_type_options();
-  $widget_type_options = content_widget_type_options(NULL, TRUE);
-  if ($field_type_options && $widget_type_options) {
+    // Additional row : add new field.
+    $weight = max($weights) + 1;
+    $field_type_options = content_field_type_options();
+    $widget_type_options = content_widget_type_options(NULL, TRUE);
+    if ($field_type_options && $widget_type_options) {
     array_unshift($field_type_options, t('- Select a field type -'));
     array_unshift($widget_type_options, t('- Select a widget -'));
     $name = '_add_new_field';
     $form[$name] = array(
-      'label' => array(
+        'label' => array(
         '#type' => 'textfield',
         '#size' => 15,
         '#description' => t('Label'),
-      ),
-      'field_name' => array(
+        ),
+        'field_name' => array(
         '#type' => 'textfield',
         // This field should stay LTR even for RTL languages.
         '#field_prefix' => '<span dir="ltr">field_',
@@ -262,70 +262,70 @@ 
         // prefix which is 6 characters long.
         '#maxlength' => 26,
         '#description' => t('Field name (a-z, 0-9, _)'),
-      ),
-      'type' => array(
+        ),
+        'type' => array(
         '#type' => 'select',
         '#options' => $field_type_options,
         '#description' => theme('advanced_help_topic', 'content', 'fields') . t('Type of data to store.'),
-      ),
-      'widget_type' => array(
+        ),
+        'widget_type' => array(
         '#type' => 'select',
         '#options' => $widget_type_options,
         '#description' => t('Form element to edit the data.'),
-      ),
-      'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
-      'parent' => array('#type' => 'select', '#options' => $group_options, '#default_value' => ''),
-      'hidden_name' => array('#type' => 'hidden', '#default_value' => $name),
-      '#leaf' => TRUE,
-      '#add_new' => TRUE,
-      '#row_type' => 'add_new_field',
+        ),
+        'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
+        'parent' => array('#type' => 'select', '#options' => $group_options, '#default_value' => ''),
+        'hidden_name' => array('#type' => 'hidden', '#default_value' => $name),
+        '#leaf' => TRUE,
+        '#add_new' => TRUE,
+        '#row_type' => 'add_new_field',
     );
     $form['#field_rows'][] = $name;
-  }
+    }
 
-  // Additional row : add existing field.
-  $existing_field_options = content_existing_field_options($type_name);
-  if ($existing_field_options && $widget_type_options) {
+    // Additional row : add existing field.
+    $existing_field_options = content_existing_field_options($type_name);
+    if ($existing_field_options && $widget_type_options) {
     $weight++;
     array_unshift($existing_field_options, t('- Select an existing field -'));
     $name = '_add_existing_field';
     $form[$name] = array(
-      'label' => array(
+        'label' => array(
         '#type' => 'textfield',
         '#size' => 15,
         '#description' => t('Label'),
-      ),
-      'field_name' => array(
+        ),
+        'field_name' => array(
         '#type' => 'select',
         '#options' => $existing_field_options,
         '#description' => t('Field to share'),
-      ),
-      'widget_type' => array(
+        ),
+        'widget_type' => array(
         '#type' => 'select',
         '#options' => $widget_type_options,
         '#description' => t('Form element to edit the data.'),
-      ),
-      'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
-      'parent' => array('#type' => 'select', '#options' => $group_options, '#default_value' => ''),
-      'hidden_name' => array('#type' => 'hidden', '#default_value' => $name),
-      '#leaf' => TRUE,
-      '#add_new' => TRUE,
-      '#row_type' => 'add_existing_field',
+        ),
+        'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
+        'parent' => array('#type' => 'select', '#options' => $group_options, '#default_value' => ''),
+        'hidden_name' => array('#type' => 'hidden', '#default_value' => $name),
+        '#leaf' => TRUE,
+        '#add_new' => TRUE,
+        '#row_type' => 'add_existing_field',
     );
     $form['#field_rows'][] = $name;
-  }
+    }
 
-  // Additional row : add new group.
-  if (!empty($group_types)) {
+    // Additional row : add new group.
+    if (!empty($group_types)) {
     $weight++;
     $name = '_add_new_group';
     $form[$name] = array(
-      'label' => array(
+        'label' => array(
         '#type' => 'textfield',
         '#size' => 15,
         '#description' => t('Label'),
-      ),
-      'group_name' => array(
+        ),
+        'group_name' => array(
         '#type' => 'textfield',
         // This field should stay LTR even for RTL languages.
         '#field_prefix' => '<span dir="ltr">group_',
@@ -336,40 +336,40 @@ 
         // prefix which is 6 characters long.
         '#maxlength' => 26,
         '#description' => t('Group name (a-z, 0-9, _)'),
-      ),
-      'group_option' => array(
+        ),
+        'group_option' => array(
         '#type' => 'hidden',
         '#value' => '',
-      ),
-      'group_type' => array(
+        ),
+        'group_type' => array(
         '#type' => 'hidden',
         '#value' => 'standard',
-      ),
-      'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
-      'parent' => array('#type' => 'hidden', '#default_value' => ''),
-      'hidden_name' => array('#type' => 'hidden', '#default_value' => $name),
-      '#root' => TRUE,
-      '#add_new' => TRUE,
-      '#row_type' => 'add_new_group',
+        ),
+        'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
+        'parent' => array('#type' => 'hidden', '#default_value' => ''),
+        'hidden_name' => array('#type' => 'hidden', '#default_value' => $name),
+        '#root' => TRUE,
+        '#add_new' => TRUE,
+        '#row_type' => 'add_new_group',
     );
     if (count($group_types) > 1) {
-      $form[$name]['group_type'] = array(
+        $form[$name]['group_type'] = array(
         '#type' => 'select',
         '#description' => t('Type of group.'),
         '#options' => $group_types,
         '#default_value' => 'standard',
-      );
+        );
     }
     $form['#group_rows'][] = $name;
-  }
+    }
 
-  $form['submit'] = array('#type' => 'submit', '#value' => t('Save'));
-  return $form;
+    $form['submit'] = array('#type' => 'submit', '#value' => t('Save'));
+    return $form;
 }
 
 function content_field_overview_form_validate($form, &$form_state) {
-  _content_field_overview_form_validate_add_new($form, $form_state);
-  _content_field_overview_form_validate_add_existing($form, $form_state);
+    _content_field_overview_form_validate_add_new($form, $form_state);
+    _content_field_overview_form_validate_add_existing($form, $form_state);
 }
 
 /**
@@ -378,71 +378,71 @@ 
  * Validate the 'add new field' row.
  */
 function _content_field_overview_form_validate_add_new($form, &$form_state) {
-  $field = $form_state['values']['_add_new_field'];
+    $field = $form_state['values']['_add_new_field'];
 
-  // Validate if any information was provided in the 'add new field' row.
-  if (array_filter(array($field['label'], $field['field_name'], $field['type'], $field['widget_type']))) {
+    // Validate if any information was provided in the 'add new field' row.
+    if (array_filter(array($field['label'], $field['field_name'], $field['type'], $field['widget_type']))) {
     // No label.
     if (!$field['label']) {
-      form_set_error('_add_new_field][label', t('Add new field: you need to provide a label.'));
+        form_set_error('_add_new_field][label', t('Add new field: you need to provide a label.'));
     }
 
     // No field name.
     if (!$field['field_name']) {
-      form_set_error('_add_new_field][field_name', t('Add new field: you need to provide a field name.'));
+        form_set_error('_add_new_field][field_name', t('Add new field: you need to provide a field name.'));
     }
     // Field name validation.
     else {
-      $field_name = $field['field_name'];
+        $field_name = $field['field_name'];
 
-      // Add the 'field_' prefix.
-      if (substr($field_name, 0, 6) != 'field_') {
+        // Add the 'field_' prefix.
+        if (substr($field_name, 0, 6) != 'field_') {
         $field_name = 'field_'. $field_name;
         form_set_value($form['_add_new_field']['field_name'], $field_name, $form_state);
-      }
+        }
 
-      // Invalid field name.
-      if (!preg_match('!^field_[a-z0-9_]+$!', $field_name)) {
+        // Invalid field name.
+        if (!preg_match('!^field_[a-z0-9_]+$!', $field_name)) {
         form_set_error('_add_new_field][field_name', t('Add new field: the field name %field_name is invalid. The name must include only lowercase unaccentuated letters, numbers, and underscores.', array('%field_name' => $field_name)));
-      }
-      if (strlen($field_name) > 32) {
+        }
+        if (strlen($field_name) > 32) {
         form_set_error('_add_new_field][field_name', t('Add new field: the field name %field_name is too long. The name is limited to 32 characters, including the \'field_\' prefix.', array('%field_name' => $field_name)));
-      }
-      // A field named 'field_instance' would cause a tablename clash with {content_field_instance}
-      if ($field_name == 'field_instance') {
+        }
+        // A field named 'field_instance' would cause a tablename clash with {content_field_instance}
+        if ($field_name == 'field_instance') {
         form_set_error('_add_new_field][field_name', t("Add new field: the name 'field_instance' is a reserved name."));
-      }
-
-      // Field name already exists.
-      // We need to check inactive fields as well, so we can't use content_fields().
-      module_load_include('inc', 'content', 'includes/content.crud');
-      $fields = content_field_instance_read(array(), TRUE);
-      $used = FALSE;
-      foreach ($fields as $existing_field) {
+        }
+
+        // Field name already exists.
+        // We need to check inactive fields as well, so we can't use content_fields().
+        module_load_include('inc', 'content', 'includes/content.crud');
+        $fields = content_field_instance_read(array(), TRUE);
+        $used = FALSE;
+        foreach ($fields as $existing_field) {
         $used |= ($existing_field['field_name'] == $field_name);
-      }
-      if ($used) {
+        }
+        if ($used) {
         form_set_error('_add_new_field][field_name', t('Add new field: the field name %field_name already exists.', array('%field_name' => $field_name)));
-      }
+        }
     }
 
     // No field type.
     if (!$field['type']) {
-      form_set_error('_add_new_field][type', t('Add new field: you need to select a field type.'));
+        form_set_error('_add_new_field][type', t('Add new field: you need to select a field type.'));
     }
 
     // No widget type.
     if (!$field['widget_type']) {
-      form_set_error('_add_new_field][widget_type', t('Add new field: you need to select a widget.'));
+        form_set_error('_add_new_field][widget_type', t('Add new field: you need to select a widget.'));
     }
     // Wrong widget type.
     elseif ($field['type']) {
-      $widget_types = content_widget_type_options($field['type']);
-      if (!isset($widget_types[$field['widget_type']])) {
+        $widget_types = content_widget_type_options($field['type']);
+        if (!isset($widget_types[$field['widget_type']])) {
         form_set_error('_add_new_field][widget_type', t('Add new field: invalid widget.'));
-      }
+        }
+    }
     }
-  }
 }
 
 /**
@@ -451,112 +451,112 @@ 
  * Validate the 'add existing field' row.
  */
 function _content_field_overview_form_validate_add_existing($form, &$form_state) {
-  // The form element might be absent if no existing fields can be added to
-  // this content type
-  if (isset($form_state['values']['_add_existing_field'])) {
+    // The form element might be absent if no existing fields can be added to
+    // this content type
+    if (isset($form_state['values']['_add_existing_field'])) {
     $field = $form_state['values']['_add_existing_field'];
 
     // Validate if any information was provided in the 'add existing field' row.
     if (array_filter(array($field['label'], $field['field_name'], $field['widget_type']))) {
-      // No label.
-      if (!$field['label']) {
+        // No label.
+        if (!$field['label']) {
         form_set_error('_add_existing_field][label', t('Add existing field: you need to provide a label.'));
-      }
+        }
 
-      // No existing field.
-      if (!$field['field_name']) {
+        // No existing field.
+        if (!$field['field_name']) {
         form_set_error('_add_existing_field][field_name', t('Add existing field: you need to select a field.'));
-      }
+        }
 
-      // No widget type.
-      if (!$field['widget_type']) {
+        // No widget type.
+        if (!$field['widget_type']) {
         form_set_error('_add_existing_field][widget_type', t('Add existing field: you need to select a widget.'));
-      }
-      // Wrong widget type.
-      elseif ($field['field_name'] && ($existing_field = content_fields($field['field_name']))) {
+        }
+        // Wrong widget type.
+        elseif ($field['field_name'] && ($existing_field = content_fields($field['field_name']))) {
         $widget_types = content_widget_type_options($existing_field['type']);
         if (!isset($widget_types[$field['widget_type']])) {
-          form_set_error('_add_existing_field][widget_type', t('Add existing field: invalid widget.'));
+            form_set_error('_add_existing_field][widget_type', t('Add existing field: invalid widget.'));
+        }
         }
-      }
     }
-  }
+    }
 }
 
 function content_field_overview_form_submit($form, &$form_state) {
-  $form_values = $form_state['values'];
+    $form_values = $form_state['values'];
 
-  $type_name = $form['#type_name'];
-  $type = content_types($type_name);
+    $type_name = $form['#type_name'];
+    $type = content_types($type_name);
 
-  // Update field weights.
-  $extra = array();
-  foreach ($form_values as $key => $values) {
+    // Update field weights.
+    $extra = array();
+    foreach ($form_values as $key => $values) {
     // Groups are handled in fieldgroup_content_overview_form_submit().
     if (in_array($key, $form['#fields'])) {
-      db_query("UPDATE {". content_instance_tablename() ."} SET weight = %d WHERE type_name = '%s' AND field_name = '%s'",
+        db_query("UPDATE {". content_instance_tablename() ."} SET weight = %d WHERE type_name = '%s' AND field_name = '%s'",
         $values['weight'], $type_name, $key);
     }
     elseif (in_array($key, $form['#extra'])) {
-      $extra[$key] = $values['weight'];
+        $extra[$key] = $values['weight'];
+    }
     }
-  }
 
-  if ($extra) {
+    if ($extra) {
     variable_set('content_extra_weights_'. $type_name, $extra);
-  }
-  else {
+    }
+    else {
     variable_del('content_extra_weights_'. $type_name);
-  }
+    }
 
-  content_clear_type_cache();
+    content_clear_type_cache();
 
-  $destinations = array();
+    $destinations = array();
 
-  // Create new field.
-  if (!empty($form_values['_add_new_field']['field_name'])) {
+    // Create new field.
+    if (!empty($form_values['_add_new_field']['field_name'])) {
     $field = $form_values['_add_new_field'];
     $field['type_name'] = $type_name;
 
     module_load_include('inc', 'content', 'includes/content.crud');
     if (content_field_instance_create($field)) {
-      // Store new field information for fieldgroup submit handler.
-      $form_state['fields_added']['_add_new_field'] = $field['field_name'];
-      $destinations[] = 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'];
+        // Store new field information for fieldgroup submit handler.
+        $form_state['fields_added']['_add_new_field'] = $field['field_name'];
+        $destinations[] = 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'];
     }
     else {
-      drupal_set_message(t('There was a problem creating field %label.', array(
+        drupal_set_message(t('There was a problem creating field %label.', array(
         '%label' => $field['label'])));
     }
-  }
+    }
 
-  // Add existing field.
-  if (!empty($form_values['_add_existing_field']['field_name'])) {
+    // Add existing field.
+    if (!empty($form_values['_add_existing_field']['field_name'])) {
     $field = $form_values['_add_existing_field'];
     $field['type_name'] = $type_name;
     $existing_field = content_fields($field['field_name']);
 
     if ($existing_field['locked']) {
-      drupal_set_message(t('The field %label cannot be added to a content type because it is locked.', array('%label' => $field['field_name'])));
+        drupal_set_message(t('The field %label cannot be added to a content type because it is locked.', array('%label' => $field['field_name'])));
     }
     else {
-      module_load_include('inc', 'content', 'includes/content.crud');
-      if (content_field_instance_create($field)) {
+        module_load_include('inc', 'content', 'includes/content.crud');
+        if (content_field_instance_create($field)) {
         // Store new field information for fieldgroup submit handler.
         $form_state['fields_added']['_add_existing_field'] = $field['field_name'];
         $destinations[] = 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'];
-      }
-      else {
+        }
+        else {
         drupal_set_message(t('There was a problem adding field %label.', array('%label' => $field['field_name'])));
-      }
+        }
+    }
     }
-  }
 
-  if ($destinations) {
+    if ($destinations) {
     $destinations[] = urldecode(substr(drupal_get_destination(), 12));
     unset($_REQUEST['destination']);
     $form_state['redirect'] = content_get_destinations($destinations);
-  }
+    }
 
 }
 
@@ -567,173 +567,173 @@ 
  * and how the field labels should be rendered.
  */
 function content_display_overview_form(&$form_state, $type_name, $contexts_selector = 'basic') {
-  content_inactive_message($type_name);
+    content_inactive_message($type_name);
 
-  // Gather type information.
-  $type = content_types($type_name);
-  $field_types = _content_field_types();
-  $fields = $type['fields'];
+    // Gather type information.
+    $type = content_types($type_name);
+    $field_types = _content_field_types();
+    $fields = $type['fields'];
 
-  $groups = array();
-  if (module_exists('fieldgroup')) {
+    $groups = array();
+    if (module_exists('fieldgroup')) {
     $groups = fieldgroup_groups($type['type']);
-  }
-  $contexts = content_build_modes($contexts_selector);
+    }
+    $contexts = content_build_modes($contexts_selector);
 
-  $form = array(
+    $form = array(
     '#tree' => TRUE,
     '#type_name' => $type['type'],
     '#fields' => array_keys($fields),
     '#groups' => array_keys($groups),
     '#contexts' => $contexts_selector,
-  );
+    );
 
-  if (empty($fields)) {
+    if (empty($fields)) {
     drupal_set_message(t('There are no fields configured for this content type. You can add new fields on the <a href="@link">Manage fields</a> page.', array(
-      '@link' => url('admin/content/node-type/'. $type['url_str'] .'/fields'))), 'warning');
+        '@link' => url('admin/content/node-type/'. $type['url_str'] .'/fields'))), 'warning');
     return $form;
-  }
+    }
 
-  // Fields.
-  $label_options = array(
+    // Fields.
+    $label_options = array(
     'above' => t('Above'),
     'inline' => t('Inline'),
     'hidden' => t('<Hidden>'),
-  );
-  foreach ($fields as $name => $field) {
+    );
+    foreach ($fields as $name => $field) {
     $field_type = $field_types[$field['type']];
     $defaults = $field['display_settings'];
     $weight = $field['widget']['weight'];
 
     $form[$name] = array(
-      'human_name' => array('#value' => check_plain($field['widget']['label'])),
-      'weight' => array('#type' => 'value', '#value' => $weight),
-      'parent' => array('#type' => 'value', '#value' => ''),
+        'human_name' => array('#value' => check_plain($field['widget']['label'])),
+        'weight' => array('#type' => 'value', '#value' => $weight),
+        'parent' => array('#type' => 'value', '#value' => ''),
     );
 
     // Label
     if ($contexts_selector == 'basic') {
-      $form[$name]['label']['format'] = array(
+        $form[$name]['label']['format'] = array(
         '#type' => 'select',
         '#options' => $label_options,
         '#default_value' => isset($defaults['label']['format']) ? $defaults['label']['format'] : 'above',
-      );
+        );
     }
 
     // Formatters.
     $options = array();
     foreach ($field_type['formatters'] as $formatter_name => $formatter_info) {
-      $options[$formatter_name] = $formatter_info['label'];
+        $options[$formatter_name] = $formatter_info['label'];
     }
     $options['hidden'] = t('<Hidden>');
 
     foreach ($contexts as $key => $value) {
-      $form[$name][$key]['format'] = array(
+        $form[$name][$key]['format'] = array(
         '#type' => 'select',
         '#options' => $options,
         '#default_value' => isset($defaults[$key]['format']) ? $defaults[$key]['format'] : 'default',
-      );
-      // exclude from $content
-      $form[$name][$key]['exclude'] = array(
+        );
+        // exclude from $content
+        $form[$name][$key]['exclude'] = array(
         '#type' => 'checkbox',
         '#options' => array(0 => t('Include'), 1 => t('Exclude')),
         '#default_value' => isset($defaults[$key]['exclude']) ? $defaults[$key]['exclude'] : 0,
-      );
+        );
+    }
     }
-  }
 
-  // Groups.
-  $label_options = array(
+    // Groups.
+    $label_options = array(
     'above' => t('Above'),
     'hidden' => t('<Hidden>'),
-  );
-  $options = array(
+    );
+    $options = array(
     'no_style' => t('no styling'),
     'simple' => t('simple'),
     'fieldset' => t('fieldset'),
     'fieldset_collapsible' => t('fieldset - collapsible'),
     'fieldset_collapsed' => t('fieldset - collapsed'),
     'hidden' => t('<Hidden>'),
-  );
-  foreach ($groups as $name => $group) {
+    );
+    foreach ($groups as $name => $group) {
     $defaults = $group['settings']['display'];
     $weight = $group['weight'];
 
     $form[$name] = array(
-      'human_name' => array('#value' => check_plain($group['label'])),
-      'weight' => array('#type' => 'value', '#value' => $weight),
+        'human_name' => array('#value' => check_plain($group['label'])),
+        'weight' => array('#type' => 'value', '#value' => $weight),
     );
     if ($contexts_selector == 'basic') {
-      $form[$name]['label'] = array(
+        $form[$name]['label'] = array(
         '#type' => 'select',
         '#options' => $label_options,
         '#default_value' => isset($defaults['label']) ? $defaults['label'] : 'above',
-      );
+        );
     }
     foreach ($contexts as $key => $title) {
-      $form[$name][$key]['format'] = array(
+        $form[$name][$key]['format'] = array(
         '#type' => 'select',
         '#options' => $options,
         '#default_value' => isset($defaults[$key]['format']) ? $defaults[$key]['format'] : 'fieldset',
-      );
-      // exclude in $content
-      $form[$name][$key]['exclude'] = array(
+        );
+        // exclude in $content
+        $form[$name][$key]['exclude'] = array(
         '#type' => 'checkbox',
         '#options' => array(0 => t('Include'), 1 => t('Exclude')),
         '#default_value' => isset($defaults[$key]['exclude']) ? $defaults[$key]['exclude'] : 0,
-      );
+        );
     }
     foreach ($group['fields'] as $field_name => $field) {
-      $form[$field_name]['parent']['#value'] = $name;
+        $form[$field_name]['parent']['#value'] = $name;
+    }
     }
-  }
 
-  $form['submit'] = array('#type' => 'submit', '#value' => t('Save'));
-  return $form;
+    $form['submit'] = array('#type' => 'submit', '#value' => t('Save'));
+    return $form;
 }
 
 /**
  * Submit handler for the display overview form.
  */
 function content_display_overview_form_submit($form, &$form_state) {
-  module_load_include('inc', 'content', 'includes/content.crud');
-  $form_values = $form_state['values'];
-  foreach ($form_values as $key => $values) {
+    module_load_include('inc', 'content', 'includes/content.crud');
+    $form_values = $form_state['values'];
+    foreach ($form_values as $key => $values) {
     // Groups are handled in fieldgroup_display_overview_form_submit().
     if (in_array($key, $form['#fields'])) {
-      $field = content_fields($key, $form['#type_name']);
-      // We have some numeric keys here, so we can't use array_merge.
-      $field['display_settings'] = $values + $field['display_settings'];
-      content_field_instance_update($field, FALSE);
+        $field = content_fields($key, $form['#type_name']);
+        // We have some numeric keys here, so we can't use array_merge.
+        $field['display_settings'] = $values + $field['display_settings'];
+        content_field_instance_update($field, FALSE);
+    }
     }
-  }
 
-  // Clear caches and rebuild menu.
-  content_clear_type_cache(TRUE);
-  menu_rebuild();
+    // Clear caches and rebuild menu.
+    content_clear_type_cache(TRUE);
+    menu_rebuild();
 
-  drupal_set_message(t('Your settings have been saved.'));
+    drupal_set_message(t('Your settings have been saved.'));
 }
 
 /**
  * Return an array of field_type options.
  */
 function content_field_type_options() {
-  static $options;
+    static $options;
 
-  if (!isset($options)) {
+    if (!isset($options)) {
     $options = array();
     $field_types = _content_field_types();
     $field_type_options = array();
     foreach ($field_types as $field_type_name => $field_type) {
-      // skip field types which have no widget types.
-      if (content_widget_type_options($field_type_name)) {
+        // skip field types which have no widget types.
+        if (content_widget_type_options($field_type_name)) {
         $options[$field_type_name] = t($field_type['label']);
-      }
+        }
     }
     asort($options);
-  }
-  return $options;
+    }
+    return $options;
 }
 
 /**
@@ -743,320 +743,320 @@ 
  * all widget types, keyed by field type human name
  */
 function content_widget_type_options($field_type = NULL, $by_label = FALSE) {
-  static $options;
+    static $options;
 
-  if (!isset($options)) {
+    if (!isset($options)) {
     $options = array();
     foreach (_content_widget_types() as $widget_type_name => $widget_type) {
-      foreach ($widget_type['field types'] as $widget_field_type) {
+        foreach ($widget_type['field types'] as $widget_field_type) {
         $options[$widget_field_type][$widget_type_name] = t($widget_type['label']);
-      }
+        }
+    }
     }
-  }
 
-  if ($field_type) {
+    if ($field_type) {
     return !empty($options[$field_type]) ? $options[$field_type] : array();
-  }
-  elseif ($by_label) {
+    }
+    elseif ($by_label) {
     $field_types = _content_field_types();
     $options_by_label = array();
     foreach ($options as $field_type => $widgets) {
-      $options_by_label[t($field_types[$field_type]['label'])] = $widgets;
+        $options_by_label[t($field_types[$field_type]['label'])] = $widgets;
     }
     return $options_by_label;
-  }
-  else {
+    }
+    else {
     return $options;
-  }
+    }
 }
 
 /**
  * Return an array of existing field to be added to a node type.
  */
 function content_existing_field_options($type_name) {
-  $type = content_types($type_name);
-  $fields = content_fields();
-  $field_types = _content_field_types();
+    $type = content_types($type_name);
+    $fields = content_fields();
+    $field_types = _content_field_types();
 
-  $options = array();
-  foreach ($fields as $field) {
+    $options = array();
+    foreach ($fields as $field) {
     if (!isset($type['fields'][$field['field_name']]) && !$field['locked']) {
-      $field_type = $field_types[$field['type']];
-      $text = t('@type: @field (@label)', array('@type' => t($field_type['label']), '@label' => t($field['widget']['label']), '@field' => $field['field_name']));
-      $options[$field['field_name']] = (drupal_strlen($text) > 80) ? truncate_utf8($text, 77) . '...' : $text;
+        $field_type = $field_types[$field['type']];
+        $text = t('@type: @field (@label)', array('@type' => t($field_type['label']), '@label' => t($field['widget']['label']), '@field' => $field['field_name']));
+        $options[$field['field_name']] = (drupal_strlen($text) > 80) ? truncate_utf8($text, 77) . '...' : $text;
     }
-  }
-  // Sort the list by type, then by field name, then by label.
-  asort($options);
+    }
+    // Sort the list by type, then by field name, then by label.
+    asort($options);
 
-  return $options;
+    return $options;
 }
 
 /**
  * A form element for selecting field, widget, and label.
  */
 function content_field_basic_form(&$form_state, $form_values) {
-  module_load_include('inc', 'content', 'includes/content.crud');
+    module_load_include('inc', 'content', 'includes/content.crud');
 
-  $type_name = $form_values['type_name'];
-  $type = content_types($form_values['type_name']);
-  $field_name = $form_values['field_name'];
-  $field_type = $form_values['type'];
-  $label = $form_values['label'];
+    $type_name = $form_values['type_name'];
+    $type = content_types($form_values['type_name']);
+    $field_name = $form_values['field_name'];
+    $field_type = $form_values['type'];
+    $label = $form_values['label'];
 
-  $form = array();
+    $form = array();
 
-  $form['basic'] = array(
+    $form['basic'] = array(
     '#type' => 'fieldset',
     '#title' => t('Edit basic information'),
-  );
-  $form['basic']['field_name'] = array(
+    );
+    $form['basic']['field_name'] = array(
     '#title' => t('Field name'),
     '#type' => 'textfield',
     '#value' => $field_name,
     '#description' => t("The machine-readable name of the field. This name cannot be changed."),
     '#disabled' => TRUE,
-  );
-  $form['basic']['label'] = array(
+    );
+    $form['basic']['label'] = array(
     '#type' => 'textfield',
     '#title' => t('Label'),
     '#default_value' => $label,
     '#required' => TRUE,
     '#description' => t('A human-readable name to be used as the label for this field in the %type content type.', array('%type' => $type['name'])),
-  );
-  $form['basic']['type'] = array(
+    );
+    $form['basic']['type'] = array(
     '#type' => 'select',
     '#title' => t('Field type'),
     '#options' => content_field_type_options(),
     '#default_value' => $field_type,
     '#description' => t('The type of data you would like to store in the database with this field. This option cannot be changed.'),
     '#disabled' => TRUE,
-  );
-  $form['basic']['widget_type'] = array(
+    );
+    $form['basic']['widget_type'] = array(
     '#type' => 'select',
     '#title' => t('Widget type'),
     '#required' => TRUE,
     '#options' => content_widget_type_options($field_type),
     '#default_value' => $form_values['widget_type'],
     '#description' => t('The type of form element you would like to present to the user when creating this field in the %type content type.', array('%type' => $type['name'])),
-  );
+    );
 
-  $form['type_name'] = array(
+    $form['type_name'] = array(
     '#type' => 'value',
     '#value' => $type_name,
-  );
+    );
 
-  $form['submit'] = array(
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Continue'),
-  );
+    );
 
-  $form['#validate'] = array();
-  $form['#submit'] = array('content_field_basic_form_submit');
+    $form['#validate'] = array();
+    $form['#submit'] = array('content_field_basic_form_submit');
 
-  return $form;
+    return $form;
 }
 
 /**
  * Create a new field for a content type.
  */
 function content_field_basic_form_submit($form, &$form_state) {
-  $form_values = $form_state['values'];
+    $form_values = $form_state['values'];
 
-  $label = $form_values['label'];
+    $label = $form_values['label'];
 
-  // Set the right module information
-  $field_types = _content_field_types();
-  $widget_types = _content_widget_types();
-  $form_values['module'] = $field_types[$form_values['type']]['module'];
-  $form_values['widget_module'] = $widget_types[$form_values['widget_type']]['module'];
+    // Set the right module information
+    $field_types = _content_field_types();
+    $widget_types = _content_widget_types();
+    $form_values['module'] = $field_types[$form_values['type']]['module'];
+    $form_values['widget_module'] = $widget_types[$form_values['widget_type']]['module'];
 
-  // Make sure we retain previous values and only over-write changed values.
-  module_load_include('inc', 'content', 'includes/content.crud');
-  $instances = content_field_instance_read(array('field_name' => $form_values['field_name'], 'type_name' => $form_values['type_name']));
-  $field = array_merge(content_field_instance_collapse($instances[0]), $form_values);
-  if (content_field_instance_update($field)) {
+    // Make sure we retain previous values and only over-write changed values.
+    module_load_include('inc', 'content', 'includes/content.crud');
+    $instances = content_field_instance_read(array('field_name' => $form_values['field_name'], 'type_name' => $form_values['type_name']));
+    $field = array_merge(content_field_instance_collapse($instances[0]), $form_values);
+    if (content_field_instance_update($field)) {
     drupal_set_message(t('Updated basic settings for field %label.', array(
-      '%label' => $label)));
-  }
-  else {
+        '%label' => $label)));
+    }
+    else {
     drupal_set_message(t('There was a problem updating the basic settings for field %label.', array(
-      '%label' => $label)));
-  }
+        '%label' => $label)));
+    }
 
-  $type = content_types($form_values['type_name']);
-  $form_state['redirect'] = 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $form_values['field_name'];
-  $form_state['rebuild'] = FALSE;
+    $type = content_types($form_values['type_name']);
+    $form_state['redirect'] = 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $form_values['field_name'];
+    $form_state['rebuild'] = FALSE;
 }
 
 /**
  * Menu callback; present a form for removing a field from a content type.
  */
 function content_field_remove_form(&$form_state, $type_name, $field_name) {
-  $type = content_types($type_name);
-  $field = $type['fields'][$field_name];
+    $type = content_types($type_name);
+    $field = $type['fields'][$field_name];
 
-  $form = array();
-  $form['type_name'] = array(
+    $form = array();
+    $form['type_name'] = array(
     '#type' => 'value',
     '#value' => $type_name,
-  );
-  $form['field_name'] = array(
+    );
+    $form['field_name'] = array(
     '#type' => 'value',
     '#value' => $field_name,
-  );
+    );
 
-  $output = confirm_form($form,
+    $output = confirm_form($form,
     t('Are you sure you want to remove the field %field?', array('%field' => $field['widget']['label'])),
     'admin/content/node-type/'. $type['url_str'] .'/fields',
     t('If you have any content left in this field, it will be lost. This action cannot be undone.'),
     t('Remove'), t('Cancel'),
     'confirm'
-  );
+    );
 
-  if ($field['locked']) {
+    if ($field['locked']) {
     unset($output['actions']['submit']);
     $output['description']['#value'] = t('This field is <strong>locked</strong> and cannot be removed.');
-  }
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
  * Remove a field from a content type.
  */
 function content_field_remove_form_submit($form, &$form_state) {
-  module_load_include('inc', 'content', 'includes/content.crud');
-  $form_values = $form_state['values'];
+    module_load_include('inc', 'content', 'includes/content.crud');
+    $form_values = $form_state['values'];
 
-  $type = content_types($form_values['type_name']);
-  $field = $type['fields'][$form_values['field_name']];
-  if ($field['locked']) {
+    $type = content_types($form_values['type_name']);
+    $field = $type['fields'][$form_values['field_name']];
+    if ($field['locked']) {
     return;
-  }
+    }
 
-  if ($type && $field && $form_values['confirm']) {
+    if ($type && $field && $form_values['confirm']) {
     if (content_field_instance_delete($form_values['field_name'], $form_values['type_name'])) {
-      drupal_set_message(t('Removed field %field from %type.', array(
+        drupal_set_message(t('Removed field %field from %type.', array(
         '%field' => $field['widget']['label'],
         '%type' => $type['name'])));
     }
     else {
-      drupal_set_message(t('There was a problem deleting %field from %type.', array(
+        drupal_set_message(t('There was a problem deleting %field from %type.', array(
         '%field' => $field['widget']['label'],
         '%type' => $type['name'])));
     }
     $form_state['redirect'] = 'admin/content/node-type/'. $type['url_str'] .'/fields';
-  }
+    }
 }
 
 /**
  * Menu callback; presents the field editing page.
  */
 function content_field_edit_form(&$form_state, $type_name, $field_name) {
-  $output = '';
-  $type = content_types($type_name);
-  $field = $type['fields'][$field_name];
+    $output = '';
+    $type = content_types($type_name);
+    $field = $type['fields'][$field_name];
 
-  if ($field['locked']) {
+    if ($field['locked']) {
     $output = array();
     $output['locked'] = array(
-       '#value' => t('The field %field is locked and cannot be edited.', array('%field' => $field['widget']['label'])),
+        '#value' => t('The field %field is locked and cannot be edited.', array('%field' => $field['widget']['label'])),
     );
     return $output;
-  }
+    }
 
-  $field_types = _content_field_types();
-  $field_type = $field_types[$field['type']];
-  $widget_types = _content_widget_types();
-  $widget_type = $widget_types[$field['widget']['type']];
+    $field_types = _content_field_types();
+    $field_type = $field_types[$field['type']];
+    $widget_types = _content_widget_types();
+    $widget_type = $widget_types[$field['widget']['type']];
 
-  $title = isset($field['widget']['label']) ? $field['widget']['label'] : $field['field_name'];
-  drupal_set_title(check_plain($title));
+    $title = isset($field['widget']['label']) ? $field['widget']['label'] : $field['field_name'];
+    drupal_set_title(check_plain($title));
 
-  // See if we need to change the widget type or label.
-  if (isset($form_state['change_basic'])) {
+    // See if we need to change the widget type or label.
+    if (isset($form_state['change_basic'])) {
     module_load_include('inc', 'content', 'includes/content.crud');
     $field_values = content_field_instance_collapse($field);
     return content_field_basic_form($form_state, $field_values);
-  }
+    }
 
-  $add_new_sequence = isset($_REQUEST['destinations']);
+    $add_new_sequence = isset($_REQUEST['destinations']);
 
-  // Remove menu tabs when we are in an 'add new' sequence.
-  if ($add_new_sequence) {
+    // Remove menu tabs when we are in an 'add new' sequence.
+    if ($add_new_sequence) {
     menu_set_item(NULL, menu_get_item('node'));
-  }
+    }
 
-  $form = array();
-  $form['#field'] = $field;
-  $form['#type'] = $type;
+    $form = array();
+    $form['#field'] = $field;
+    $form['#type'] = $type;
 
-  // Basic iformation : hide when we are in an 'add new' sequence.
-  $form['basic'] = array(
+    // Basic iformation : hide when we are in an 'add new' sequence.
+    $form['basic'] = array(
     '#type' => 'fieldset',
     '#title' => t('%type basic information', array('%type' => $type['name'])),
     '#access' => !$add_new_sequence,
-  );
-  $form['basic']['label'] = array(
+    );
+    $form['basic']['label'] = array(
     '#type' => 'textfield',
     '#title' => t('Label'),
     '#value' => $field['widget']['label'],
     '#disabled' => TRUE,
-  );
-  $form['basic']['field_name'] = array(
+    );
+    $form['basic']['field_name'] = array(
     '#type' => 'hidden',
     '#title' => t('Field name'),
     '#value' => $field['field_name'],
     '#disabled' => TRUE,
-  );
-  $form['basic']['type'] = array(
+    );
+    $form['basic']['type'] = array(
     '#type' => 'hidden',
     '#title' => t('Field type'),
     '#value' => $field['type'],
     '#disabled' => TRUE,
-  );
-  $widget_options = content_widget_type_options($field['type']);
-  $form['basic']['widget_type'] = array(
+    );
+    $widget_options = content_widget_type_options($field['type']);
+    $form['basic']['widget_type'] = array(
     '#type' => 'select',
     '#title' => t('Widget type'),
     '#options' => $widget_options,
     '#default_value' => $field['widget']['type'] ? $field['widget']['type'] : key($widget_options),
     '#disabled' => TRUE,
-  );
-  $form['basic']['change'] = array(
+    );
+    $form['basic']['change'] = array(
     '#type' => 'submit',
     '#value' => t('Change basic information'),
     '#submit' => array('content_field_edit_form_submit_update_basic'),
-  );
+    );
 
-  $form['widget'] = array(
+    $form['widget'] = array(
     '#type' => 'fieldset',
     '#title' => t('%type settings', array('%type' => $type['name'])),
     '#description' => t('These settings apply only to the %field field as it appears in the %type content type.', array(
-      '%field' => $field['widget']['label'],
-      '%type' => $type['name'])),
-  );
-  $form['widget']['weight'] = array(
+        '%field' => $field['widget']['label'],
+        '%type' => $type['name'])),
+    );
+    $form['widget']['weight'] = array(
     '#type' => 'hidden',
     '#default_value' => $field['widget']['weight'],
-  );
+    );
 
-  $additions = (array) module_invoke($widget_type['module'], 'widget_settings', 'form', $field['widget']);
-  drupal_alter('widget_settings', $additions, 'form', $field['widget']);
-  $form['widget'] = array_merge($form['widget'], $additions);
+    $additions = (array) module_invoke($widget_type['module'], 'widget_settings', 'form', $field['widget']);
+    drupal_alter('widget_settings', $additions, 'form', $field['widget']);
+    $form['widget'] = array_merge($form['widget'], $additions);
 
-  $form['widget']['description'] = array(
+    $form['widget']['description'] = array(
     '#type' => 'textarea',
     '#title' => t('Help text'),
     '#default_value' => $field['widget']['description'],
     '#rows' => 5,
     '#description' => t('Instructions to present to the user below this field on the editing form.<br />Allowed HTML tags: @tags', array('@tags' => _content_filter_xss_display_allowed_tags())),
     '#required' => FALSE,
-  );
+    );
 
-  // Add handling for default value if not provided by field.
-  if (content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_DEFAULT) {
+    // Add handling for default value if not provided by field.
+    if (content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_DEFAULT) {
 
     // Store the original default value for use in programmed forms.
     // Set '#default_value' instead of '#value' so programmed values
@@ -1064,22 +1064,22 @@ 
     $default_value = isset($field['widget']['default_value']) ? $field['widget']['default_value'] : array();
     $default_value_php = isset($field['widget']['default_value_php']) ? $field['widget']['default_value_php'] : '';
     $form['widget']['default_value'] = array(
-      '#type' => 'value',
-      '#default_value' => $default_value,
+        '#type' => 'value',
+        '#default_value' => $default_value,
     );
     $form['widget']['default_value_php'] = array(
-      '#type' => 'value',
-      '#default_value' => $default_value_php,
+        '#type' => 'value',
+        '#default_value' => $default_value_php,
     );
 
     // We can't tell at the time we build the form if this is a programmed
     // form or not, so we always end up adding the default value widget
     // even if we won't use it.
     $form['widget']['default_value_fieldset'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Default value'),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
+        '#type' => 'fieldset',
+        '#title' => t('Default value'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
     );
 
     // Default value widget.
@@ -1097,264 +1097,264 @@ 
 
     // Advanced: PHP code.
     $form['widget']['default_value_fieldset']['advanced_options'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('PHP code'),
-      '#collapsible' => TRUE,
-      '#collapsed' => empty($field['widget']['default_value_php']),
+        '#type' => 'fieldset',
+        '#title' => t('PHP code'),
+        '#collapsible' => TRUE,
+        '#collapsed' => empty($field['widget']['default_value_php']),
     );
 
     if (user_access('Use PHP input for field settings (dangerous - grant with care)')) {
-      $db_info = content_database_info($field);
-      $columns = array_keys($db_info['columns']);
-      foreach ($columns as $key => $column) {
+        $db_info = content_database_info($field);
+        $columns = array_keys($db_info['columns']);
+        foreach ($columns as $key => $column) {
         $columns[$key] = t("'@column' => value for @column", array('@column' => $column));
-      }
-      $sample = t("return array(\n  0 => array(@columns),\n  // You'll usually want to stop here. Provide more values\n  // if you want your 'default value' to be multi-valued:\n  1 => array(@columns),\n  2 => ...\n);", array('@columns' => implode(', ', $columns)));
+        }
+        $sample = t("return array(\n  0 => array(@columns),\n  // You'll usually want to stop here. Provide more values\n  // if you want your 'default value' to be multi-valued:\n  1 => array(@columns),\n  2 => ...\n);", array('@columns' => implode(', ', $columns)));
 
-      $form['widget']['default_value_fieldset']['advanced_options']['default_value_php'] = array(
+        $form['widget']['default_value_fieldset']['advanced_options']['default_value_php'] = array(
         '#type' => 'textarea',
         '#title' => t('Code'),
         '#default_value' => isset($field['widget']['default_value_php']) ? $field['widget']['default_value_php'] : '',
         '#rows' => 6,
         '#tree' => TRUE,
         '#description' => t('Advanced usage only: PHP code that returns a default value. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>To figure out the expected format, you can use the <em>devel load</em> tab provided by <a href="@link_devel">devel module</a> on a %type content page.', array(
-          '!sample' => $sample,
-          '@link_devel' => 'http://www.drupal.org/project/devel',
-          '%type' => $type_name)),
-      );
+            '!sample' => $sample,
+            '@link_devel' => 'http://www.drupal.org/project/devel',
+            '%type' => $type_name)),
+        );
     }
     else {
-      $form['widget']['default_value_fieldset']['advanced_options']['markup_default_value_php'] = array(
+        $form['widget']['default_value_fieldset']['advanced_options']['markup_default_value_php'] = array(
         '#type' => 'item',
         '#title' => t('Code'),
         '#value' => !empty($field['widget']['default_value_php']) ? '<code>'. check_plain($field['widget']['default_value_php']) .'</code>' : t('&lt;none&gt;'),
         '#description' => empty($field['widget']['default_value_php']) ? t("You're not allowed to input PHP code.") : t('This PHP code was set by an administrator and will override any value specified above.'),
-      );
+        );
+    }
     }
-  }
 
-  $form['field'] = array(
+    $form['field'] = array(
     '#type' => 'fieldset',
     '#title' => t('Global settings'),
     '#description' => t('These settings apply to the %field field in every content type in which it appears.', array('%field' => $field['widget']['label'])),
-  );
-  $form['field']['required'] = array(
+    );
+    $form['field']['required'] = array(
     '#type' => 'checkbox',
     '#title' => t('Required'),
     '#default_value' => $field['required'],
-  );
-  $description = t('Maximum number of values users can enter for this field.');
-  if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
+    );
+    $description = t('Maximum number of values users can enter for this field.');
+    if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
     $description .= '<br/>'. t("'Unlimited' will provide an 'Add more' button so the users can add as many values as they like.");
-  }
-  $description .= '<br/><strong>'. t('Warning! Changing this setting after data has been created could result in the loss of data!') .'</strong>';
-  $form['field']['multiple'] = array(
+    }
+    $description .= '<br/><strong>'. t('Warning! Changing this setting after data has been created could result in the loss of data!') .'</strong>';
+    $form['field']['multiple'] = array(
     '#type' => 'select',
     '#title' => t('Number of values'),
     '#options' => array(1 => t('Unlimited'), 0 => 1) + drupal_map_assoc(range(2, 10)),
     '#default_value' => $field['multiple'],
     '#description' => $description,
-  );
+    );
 
-  $form['field']['previous_field'] = array(
+    $form['field']['previous_field'] = array(
     '#type' => 'hidden',
     '#value' => serialize($field),
-  );
+    );
 
-  $additions = (array) module_invoke($field_type['module'], 'field_settings', 'form', $field);
-  drupal_alter('field_settings', $additions, 'form', $field);
-  $form['field'] = array_merge($form['field'], $additions);
+    $additions = (array) module_invoke($field_type['module'], 'field_settings', 'form', $field);
+    drupal_alter('field_settings', $additions, 'form', $field);
+    $form['field'] = array_merge($form['field'], $additions);
 
-  $form['submit'] = array(
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save field settings'),
-  );
-  $form['type_name'] = array(
+    );
+    $form['type_name'] = array(
     '#type' => 'value',
     '#value' => $type_name,
-  );
-  $form['field_name'] = array(
+    );
+    $form['field_name'] = array(
     '#type' => 'value',
     '#value' => $field_name,
-  );
-  $form['type'] = array(
+    );
+    $form['type'] = array(
     '#type' => 'value',
     '#value' => $field['type'],
-  );
-  $form['module'] = array(
+    );
+    $form['module'] = array(
     '#type' => 'value',
     '#value' => $field['module'],
-  );
-  $form['widget']['label'] = array(
+    );
+    $form['widget']['label'] = array(
     '#type' => 'value',
     '#value' => $field['widget']['label'],
-  );
-  $form['widget_module'] = array(
+    );
+    $form['widget_module'] = array(
     '#type' => 'value',
     '#value' => $field['widget']['module'],
-  );
-  $form['columns'] = array(
+    );
+    $form['columns'] = array(
     '#type' => 'value',
     '#value' => $field['columns'],
-  );
-  return $form;
+    );
+    return $form;
 }
 
 /**
  * Validate a field's settings.
  */
 function content_field_edit_form_validate($form, &$form_state) {
-  $form_values = $form_state['values'];
-  if (isset($form_state['change_basic']) || $form_values['op'] == t('Change basic information')) {
+    $form_values = $form_state['values'];
+    if (isset($form_state['change_basic']) || $form_values['op'] == t('Change basic information')) {
     return;
-  }
+    }
 
-  module_load_include('inc', 'content', 'includes/content.crud');
-  $previous_field = unserialize($form_values['previous_field']);
-  $field = content_field_instance_expand($form_values);
-  $field['db_storage'] = content_storage_type($field);
+    module_load_include('inc', 'content', 'includes/content.crud');
+    $previous_field = unserialize($form_values['previous_field']);
+    $field = content_field_instance_expand($form_values);
+    $field['db_storage'] = content_storage_type($field);
 
-  $field_types = _content_field_types();
-  $field_type = $field_types[$field['type']];
-  $widget_types = _content_widget_types();
-  $widget_type = $widget_types[$field['widget']['type']];
+    $field_types = _content_field_types();
+    $field_type = $field_types[$field['type']];
+    $widget_types = _content_widget_types();
+    $widget_type = $widget_types[$field['widget']['type']];
 
-  if ($dropped_data = content_alter_db_analyze($previous_field, $field)) {
+    if ($dropped_data = content_alter_db_analyze($previous_field, $field)) {
     // @TODO
     // This is a change that might result in loss of data.
     // Add a confirmation form here.
     // dsm($dropped_data);
-  }
+    }
 
-  module_invoke($widget_type['module'], 'widget_settings', 'validate', array_merge($field, $form_values));
-  module_invoke($field_type['module'], 'field_settings', 'validate', array_merge($field, $form_values));
+    module_invoke($widget_type['module'], 'widget_settings', 'validate', array_merge($field, $form_values));
+    module_invoke($field_type['module'], 'field_settings', 'validate', array_merge($field, $form_values));
 
-  // If content.module is handling the default value,
-  // validate the result using the field validation.
-  if (content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_DEFAULT) {
+    // If content.module is handling the default value,
+    // validate the result using the field validation.
+    if (content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_DEFAULT) {
 
     // If this is a programmed form, get rid of the default value widget,
     // we have the default values already.
     if ($form['#programmed']) {
-      form_set_value(array('#parents' => array('default_value_widget')), NULL, $form_state);
-      return;
+        form_set_value(array('#parents' => array('default_value_widget')), NULL, $form_state);
+        return;
     }
 
     if (isset($form_values['default_value_php']) &&
     ($php = trim($form_values['default_value_php']))) {
-      $error = FALSE;
-      ob_start();
-      $return = eval($php);
-      ob_end_clean();
-      if (!is_array($return)) {
+        $error = FALSE;
+        ob_start();
+        $return = eval($php);
+        ob_end_clean();
+        if (!is_array($return)) {
         $error = TRUE;
-      }
-      else {
+        }
+        else {
         foreach ($return as $item) {
-          if (!is_array($item)) {
+            if (!is_array($item)) {
             $error = TRUE;
             break;
-          }
+            }
         }
-      }
-      if ($error) {
+        }
+        if ($error) {
         $db_info = content_database_info($field);
         $columns = array_keys($db_info['columns']);
         foreach ($columns as $key => $column) {
-          $columns[$key] = t("'@column' => value for @column", array('@column' => $column));
+            $columns[$key] = t("'@column' => value for @column", array('@column' => $column));
         }
         $sample = t("return array(\n  0 => array(@columns),\n  // You'll usually want to stop here. Provide more values\n  // if you want your 'default value' to be multi-valued:\n  1 => array(@columns),\n  2 => ...\n);", array('@columns' => implode(', ', $columns)));
 
         form_set_error('default_value_php', t('The default value PHP code returned an incorrect value.<br/>Expected format: <pre>!sample</pre> Returned value: @value', array(
-          '!sample' => $sample,
-          '@value' => print_r($return, TRUE))));
+            '!sample' => $sample,
+            '@value' => print_r($return, TRUE))));
         return;
-      }
-      else {
+        }
+        else {
         $default_value = $return;
         $is_code = TRUE;
         form_set_value(array('#parents' => array('default_value_php')), $php, $form_state);
         form_set_value(array('#parents' => array('default_value')), array(), $form_state);
-      }
+        }
     }
     elseif (!empty($form_values['default_value_widget'])) {
-      // Fields that handle their own multiple values may use an expected
-      // value as the top-level key, so just pop off the top element.
-      $key = array_shift(array_keys($form_values['default_value_widget']));
-      $default_value = $form_values['default_value_widget'][$key];
-      $is_code = FALSE;
-      form_set_value(array('#parents' => array('default_value_php')), '', $form_state);
-      form_set_value(array('#parents' => array('default_value')), $default_value, $form_state);
+        // Fields that handle their own multiple values may use an expected
+        // value as the top-level key, so just pop off the top element.
+        $key = array_shift(array_keys($form_values['default_value_widget']));
+        $default_value = $form_values['default_value_widget'][$key];
+        $is_code = FALSE;
+        form_set_value(array('#parents' => array('default_value_php')), '', $form_state);
+        form_set_value(array('#parents' => array('default_value')), $default_value, $form_state);
     }
     if (isset($default_value)) {
-      $node = array();
-      $node[$form_values['field_name']] = $default_value;
-      $field['required'] = FALSE;
-      $field_function = $field_type['module'] .'_field';
+        $node = array();
+        $node[$form_values['field_name']] = $default_value;
+        $field['required'] = FALSE;
+        $field_function = $field_type['module'] .'_field';
 
-      $errors_before = form_get_errors();
+        $errors_before = form_get_errors();
 
-      // Widget now does its own validation, should be no need
-      // to add anything for widget validation here.
-      if (function_exists($field_function)) {
+        // Widget now does its own validation, should be no need
+        // to add anything for widget validation here.
+        if (function_exists($field_function)) {
         $field_function('validate', $node, $field, $default_value, $form, NULL);
-      }
-      // The field validation routine won't set an error on the right field,
-      // so set it here.
-      $errors_after = form_get_errors();
-      if (count($errors_after) > count($errors_before)) {
+        }
+        // The field validation routine won't set an error on the right field,
+        // so set it here.
+        $errors_after = form_get_errors();
+        if (count($errors_after) > count($errors_before)) {
         if (trim($form_values['default_value_php'])) {
-          form_set_error('default_value_php', t("The PHP code for 'default value' returned @value, which is invalid.", array(
+            form_set_error('default_value_php', t("The PHP code for 'default value' returned @value, which is invalid.", array(
             '@value' => print_r($default_value, TRUE))));
         }
         else {
-          form_set_error('default_value', t('The default value is invalid.'));
+            form_set_error('default_value', t('The default value is invalid.'));
         }
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Button submit handler.
  */
 function content_field_edit_form_submit_update_basic($form, &$form_state) {
-  $form_state['change_basic'] = TRUE;
-  $form_state['rebuild'] = TRUE;
+    $form_state['change_basic'] = TRUE;
+    $form_state['rebuild'] = TRUE;
 }
 
 /**
  * Save a field's settings after editing.
  */
 function content_field_edit_form_submit($form, &$form_state) {
-  module_load_include('inc', 'content', 'includes/content.crud');
-  $form_values = $form_state['values'];
-  content_field_instance_update($form_values);
-
-  $destinations = !empty($_REQUEST['destinations']) ? $_REQUEST['destinations'] : array();
-  // Remove any external URLs.
-  $destinations = array_diff($destinations, array_filter($destinations, 'menu_path_is_external'));
-  if ($destinations) {
+    module_load_include('inc', 'content', 'includes/content.crud');
+    $form_values = $form_state['values'];
+    content_field_instance_update($form_values);
+
+    $destinations = !empty($_REQUEST['destinations']) ? $_REQUEST['destinations'] : array();
+    // Remove any external URLs.
+    $destinations = array_diff($destinations, array_filter($destinations, 'menu_path_is_external'));
+    if ($destinations) {
     drupal_set_message(t('Added field %label.', array('%label' => $form_values['label'])));
     $form_state['redirect'] = content_get_destinations($destinations);
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Saved field %label.', array('%label' => $form_values['label'])));
     $type = content_types($form_values['type_name']);
     $form_state['redirect'] = 'admin/content/node-type/'. $type['url_str'] .'/fields';
-  }
+    }
 }
 
 /**
  * Helper function to handle multipage redirects.
  */
 function content_get_destinations($destinations) {
-  $query = array();
-  $path = array_shift($destinations);
-  if ($destinations) {
+    $query = array();
+    $path = array_shift($destinations);
+    if ($destinations) {
     $query['destinations'] = $destinations;
-  }
-  return array($path, $query);
+    }
+    return array($path, $query);
 }
 
 /**
@@ -1367,7 +1367,7 @@ 
  *
  */
 function content_alter_schema($previous_field, $new_field) {
-  content_alter_db($previous_field, $new_field);
+    content_alter_db($previous_field, $new_field);
 }
 
 /**
@@ -1378,37 +1378,37 @@ 
  * we actually alter the schema.
  */
 function content_alter_db_analyze($previous_field, $new_field) {
-  $dropped = array();
-  // There is no loss of data if there was no previous data.
-  if (empty($previous_field)) {
+    $dropped = array();
+    // There is no loss of data if there was no previous data.
+    if (empty($previous_field)) {
     return $dropped;
-  }
+    }
 
-  // Analyze possible data loss from changes in storage type.
-  if (!empty($previous_field) && !empty($new_field)) {
+    // Analyze possible data loss from changes in storage type.
+    if (!empty($previous_field) && !empty($new_field)) {
     // Changing from multiple to not multiple data, will cause loss of all
     // values greater than zero.
     if ($previous_field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD &&
     $new_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE) {
-      $dropped['delta'] = 0;
+        $dropped['delta'] = 0;
     }
     // Changing from one multiple value to another will cause loss of all
     // values for deltas greater than or equal to the new multiple value.
     elseif (isset($previous_field['multiple']) && isset($new_field['multiple'])) {
-      if ($previous_field['multiple'] > $new_field['multiple'] &&
+        if ($previous_field['multiple'] > $new_field['multiple'] &&
       $new_field['multiple'] > 1) {
         $dropped['delta'] = $new_field['multiple'];
-      }
+        }
+    }
     }
-  }
 
-  // Analyze possible data loss from changes in field columns.
-  $previous_schema = !empty($previous_field) ? content_table_schema($previous_field) : array('fields' => array());
-  $new_schema = !empty($new_field) ? content_table_schema($new_field) : array('fields' => array());
-  $dropped_columns = array_diff(array_keys($previous_schema['fields']), array_keys($new_schema['fields']));
-  if ($dropped_columns) {
+    // Analyze possible data loss from changes in field columns.
+    $previous_schema = !empty($previous_field) ? content_table_schema($previous_field) : array('fields' => array());
+    $new_schema = !empty($new_field) ? content_table_schema($new_field) : array('fields' => array());
+    $dropped_columns = array_diff(array_keys($previous_schema['fields']), array_keys($new_schema['fields']));
+    if ($dropped_columns) {
     $dropped['columns'] = $dropped_columns;
-  }
+    }
 //  if (empty($new_schema['fields'])) {
 //    // No new columns, will lose all columns for a field.
 //    foreach ($previous_schema['fields'] as $column => $attributes) {
@@ -1424,7 +1424,7 @@ 
 //    }
 //  }
 
-  return $dropped;
+    return $dropped;
 }
 
 /**
@@ -1432,214 +1432,214 @@ 
  * new field definitions.
  */
 function content_alter_db($previous_field, $new_field) {
-  $ret = array();
+    $ret = array();
 
-  // One or the other of these must be valid.
-  if (empty($previous_field) && empty($new_field)) {
+    // One or the other of these must be valid.
+    if (empty($previous_field) && empty($new_field)) {
     return $ret;
-  }
+    }
 
-  // Gather relevant information : schema, table name...
-  $previous_schema = !empty($previous_field) ? content_table_schema($previous_field) : array();
-  $new_schema = !empty($new_field) ? content_table_schema($new_field) : array();
-  if (!empty($previous_field)) {
+    // Gather relevant information : schema, table name...
+    $previous_schema = !empty($previous_field) ? content_table_schema($previous_field) : array();
+    $new_schema = !empty($new_field) ? content_table_schema($new_field) : array();
+    if (!empty($previous_field)) {
     $previous_db_info = content_database_info($previous_field);
     $previous_table = $previous_db_info['table'];
-  }
-  if (!empty($new_field)) {
+    }
+    if (!empty($new_field)) {
     $new_db_info = content_database_info($new_field);
     $new_table = $new_db_info['table'];
-  }
+    }
 
-  // Deletion of a field instance: drop relevant columns and tables and return.
-  if (empty($new_field)) {
+    // Deletion of a field instance: drop relevant columns and tables and return.
+    if (empty($new_field)) {
     if ($previous_field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD) {
-      db_drop_table($ret, $previous_table);
+        db_drop_table($ret, $previous_table);
     }
     else {
-      foreach ($previous_schema['fields'] as $column => $attributes) {
+        foreach ($previous_schema['fields'] as $column => $attributes) {
         if (!in_array($column, array('nid', 'vid', 'delta'))) {
-          db_drop_field($ret, $previous_table, $column);
+            db_drop_field($ret, $previous_table, $column);
+        }
         }
-      }
     }
     content_alter_db_cleanup();
     return $ret;
-  }
+    }
 
-  // Check that content types that have fields do have a per-type table.
-  if (!empty($new_field)) {
+    // Check that content types that have fields do have a per-type table.
+    if (!empty($new_field)) {
     $base_tablename = _content_tablename($new_field['type_name'], CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
     if (!db_table_exists($base_tablename)) {
-      db_create_table($ret, $base_tablename, content_table_schema());
+        db_create_table($ret, $base_tablename, content_table_schema());
+    }
     }
-  }
 
-  // Create new table and columns, if not already created.
-  if (!db_table_exists($new_table)) {
+    // Create new table and columns, if not already created.
+    if (!db_table_exists($new_table)) {
     db_create_table($ret, $new_table, $new_schema);
-  }
-  else {
+    }
+    else {
     // Or add fields and/or indexes to an existing table.
     foreach ($new_schema['fields'] as $column => $attributes) {
-      if (!in_array($column, array('nid', 'vid', 'delta'))) {
+        if (!in_array($column, array('nid', 'vid', 'delta'))) {
         // Create the column if it does not exist.
         if (!db_column_exists($new_table, $column)) {
-          db_add_field($ret, $new_table, $column, $attributes);
+            db_add_field($ret, $new_table, $column, $attributes);
         }
         // Create the index if requested to, and it does not exist.
         if (isset($new_schema['indexes'][$column]) && !content_db_index_exists($new_table, $column)) {
-          db_add_index($ret, $new_table, $column, $new_schema['indexes'][$column]);
+            db_add_index($ret, $new_table, $column, $new_schema['indexes'][$column]);
+        }
         }
-      }
     }
-  }
+    }
 
-  // If this is a new field, we're done.
-  if (empty($previous_field)) {
+    // If this is a new field, we're done.
+    if (empty($previous_field)) {
     content_alter_db_cleanup();
     return $ret;
-  }
+    }
 
-  // If the previous table doesn't exist, we're done.
-  // Could happen if someone tries to run a schema update from an
-  // content.install update function more than once.
-  if (!db_table_exists($previous_table)) {
+    // If the previous table doesn't exist, we're done.
+    // Could happen if someone tries to run a schema update from an
+    // content.install update function more than once.
+    if (!db_table_exists($previous_table)) {
     content_alter_db_cleanup();
     return $ret;
-  }
+    }
 
-  // If changing data from one schema to another, see if changes require that
-  // we drop multiple values or migrate data from one storage type to another.
-  $migrate_columns = array_intersect_assoc($new_schema['fields'], $previous_schema['fields']);
-  unset($migrate_columns['nid'], $migrate_columns['vid'], $migrate_columns['delta']);
+    // If changing data from one schema to another, see if changes require that
+    // we drop multiple values or migrate data from one storage type to another.
+    $migrate_columns = array_intersect_assoc($new_schema['fields'], $previous_schema['fields']);
+    unset($migrate_columns['nid'], $migrate_columns['vid'], $migrate_columns['delta']);
 
-  // If we're going from one multiple value a smaller one or to single,
-  // drop all delta values higher than the new maximum delta value.
-  // Not needed if the new multiple is unlimited or if the new table is the content table.
-  if ($new_table != $base_tablename && $new_field['multiple'] < $previous_field['multiple'] && $new_field['multiple'] != 1) {
+    // If we're going from one multiple value a smaller one or to single,
+    // drop all delta values higher than the new maximum delta value.
+    // Not needed if the new multiple is unlimited or if the new table is the content table.
+    if ($new_table != $base_tablename && $new_field['multiple'] < $previous_field['multiple'] && $new_field['multiple'] != 1) {
     db_query("DELETE FROM {". $new_table ."} WHERE delta >= ". max(1, $new_field['multiple']));
-  }
+    }
 
-  // If going from multiple to non-multiple, make sure the field tables have
-  // the right database structure to accept migrated data.
-  if ($new_field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD) {
+    // If going from multiple to non-multiple, make sure the field tables have
+    // the right database structure to accept migrated data.
+    if ($new_field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD) {
     if ($previous_field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD && count($previous_schema['fields'])) {
-      // Already using per-field storage; change multiplicity if needed.
-      if ($previous_field['multiple'] > 0 && $new_field['multiple'] == 0) {
+        // Already using per-field storage; change multiplicity if needed.
+        if ($previous_field['multiple'] > 0 && $new_field['multiple'] == 0) {
         db_drop_field($ret, $new_table, 'delta');
         db_drop_primary_key($ret, $new_table);
         db_add_primary_key($ret, $new_table, array('vid'));
-      }
-      else if ($previous_field['multiple'] == 0 && $new_field['multiple'] > 0) {
+        }
+        else if ($previous_field['multiple'] == 0 && $new_field['multiple'] > 0) {
         db_add_field($ret, $new_table, 'delta', array(
-          'type' => 'int',
-          'unsigned' => TRUE,
-          'not null' => TRUE,
-          'default' => 0));
+            'type' => 'int',
+            'unsigned' => TRUE,
+            'not null' => TRUE,
+            'default' => 0));
         db_drop_primary_key($ret, $new_table);
         db_add_primary_key($ret, $new_table, array('vid', 'delta'));
-      }
+        }
+    }
     }
-  }
 
-  // Migrate data from per-content-type storage.
-  if ($previous_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE &&
+    // Migrate data from per-content-type storage.
+    if ($previous_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE &&
   $new_field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD) {
     $columns = array_keys($migrate_columns);
     if ($new_field['multiple']) {
-      db_query('INSERT INTO {'. $new_table .'} (vid, nid, delta, '. implode(', ', $columns) .') '.
+        db_query('INSERT INTO {'. $new_table .'} (vid, nid, delta, '. implode(', ', $columns) .') '.
         ' SELECT vid, nid, 0, '. implode(', ', $columns) .' FROM {'. $previous_table .'}');
     }
     else {
-      db_query('INSERT INTO {'. $new_table .'} (vid, nid, '. implode(', ', $columns) .') '.
+        db_query('INSERT INTO {'. $new_table .'} (vid, nid, '. implode(', ', $columns) .') '.
         ' SELECT vid, nid, '. implode(', ', $columns) .' FROM {'. $previous_table .'}');
     }
     foreach ($columns as $column_name) {
-      db_drop_field($ret, $previous_table, $column_name);
+        db_drop_field($ret, $previous_table, $column_name);
+    }
     }
-  }
 
-  // Migrate data from per-field storage, and drop per-field table.
-  if ($previous_field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD &&
+    // Migrate data from per-field storage, and drop per-field table.
+    if ($previous_field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD &&
   $new_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE) {
     // In order to be able to use drupal_write_record, we need to
     // rebuild the schema now.
     content_alter_db_cleanup();
     if ($previous_field['multiple']) {
-      $result = db_query("SELECT * FROM {". $previous_table ."} c JOIN {node} n ON c.nid = n.nid WHERE delta = 0 AND n.type = '%s'", $new_field['type_name']);
+        $result = db_query("SELECT * FROM {". $previous_table ."} c JOIN {node} n ON c.nid = n.nid WHERE delta = 0 AND n.type = '%s'", $new_field['type_name']);
     }
     else {
-      $result = db_query("SELECT * FROM {". $previous_table ."} c JOIN {node} n ON c.nid = n.nid WHERE n.type = '%s'", $new_field['type_name']);
+        $result = db_query("SELECT * FROM {". $previous_table ."} c JOIN {node} n ON c.nid = n.nid WHERE n.type = '%s'", $new_field['type_name']);
     }
     $record = array();
     while ($data = db_fetch_array($result)) {
-      $record['nid'] = $data['nid'];
-      $record['vid'] = $data['vid'];
-      if ($previous_field['multiple']) {
+        $record['nid'] = $data['nid'];
+        $record['vid'] = $data['vid'];
+        if ($previous_field['multiple']) {
         $record['delta'] = $data['delta'];
-      }
-      foreach ($migrate_columns as $column => $attributes) {
+        }
+        foreach ($migrate_columns as $column => $attributes) {
         if (is_null($data[$column])) {
-          $record[$column] = NULL;
+            $record[$column] = NULL;
         }
         else {
-          $record[$column] = $data[$column];
-          // Prevent double serializtion in drupal_write_record.
-          if (isset($attributes['serialize']) && $attributes['serialize']) {
+            $record[$column] = $data[$column];
+            // Prevent double serializtion in drupal_write_record.
+            if (isset($attributes['serialize']) && $attributes['serialize']) {
             $record[$column] = unserialize($record[$column]);
-          }
+            }
         }
-      }
-      if (db_result(db_query('SELECT COUNT(*) FROM {'. $new_table .
-      '} WHERE vid = %d AND nid = %d', $data['vid'], $data['nid']))) {
+        }
+        if (db_result(db_query('SELECT COUNT(*) FROM {'. $new_table .
+        '} WHERE vid = %d AND nid = %d', $data['vid'], $data['nid']))) {
         $keys = $new_field['multiple'] ? array('vid', 'delta') : array('vid');
         drupal_write_record($new_table, $record, $keys);
-      }
-      else {
+        }
+        else {
         drupal_write_record($new_table, $record);
-      }
+        }
     }
     db_drop_table($ret, $previous_table);
-  }
+    }
 
-  // Change modified columns that don't involve storage changes.
-  foreach ($new_schema['fields'] as $column => $attributes) {
+    // Change modified columns that don't involve storage changes.
+    foreach ($new_schema['fields'] as $column => $attributes) {
     if (isset($previous_schema['fields'][$column]) &&
     $previous_field['db_storage'] == $new_field['db_storage']) {
-      if ($attributes != $previous_schema['fields'][$column]) {
+        if ($attributes != $previous_schema['fields'][$column]) {
         if (!in_array($column, array('nid', 'vid', 'delta'))) {
-          db_change_field($ret, $new_table, $column, $column, $attributes);
+            db_change_field($ret, $new_table, $column, $column, $attributes);
+        }
         }
-      }
     }
-  }
+    }
 
-  // Remove obsolete columns.
-  foreach ($previous_schema['fields'] as $column => $attributes) {
+    // Remove obsolete columns.
+    foreach ($previous_schema['fields'] as $column => $attributes) {
     if (!isset($new_schema['fields'][$column])) {
-      if (!in_array($column, array('nid', 'vid', 'delta'))) {
+        if (!in_array($column, array('nid', 'vid', 'delta'))) {
         db_drop_field($ret, $previous_table, $column);
-      }
+        }
+    }
     }
-  }
 
-  // TODO: debugging stuff - should be removed
-  if (module_exists('devel')) {
+    // TODO: debugging stuff - should be removed
+    if (module_exists('devel')) {
     //dsm($ret);
-  }
-  return $ret;
+    }
+    return $ret;
 }
 
 /**
  * Helper function for handling cleanup operations when schema changes are made.
  */
 function content_alter_db_cleanup() {
-  // Rebuild the whole database schema.
-  // TODO: this could be optimized. We don't need to rebuild in *every case*...
-  // Or do we? This affects the schema and menu and may have unfortunate
-  // delayed effects if we don't clear everything out at this point.
-  content_clear_type_cache(TRUE);
+    // Rebuild the whole database schema.
+    // TODO: this could be optimized. We don't need to rebuild in *every case*...
+    // Or do we? This affects the schema and menu and may have unfortunate
+    // delayed effects if we don't clear everything out at this point.
+    content_clear_type_cache(TRUE);
 }
 
 /**
@@ -1650,27 +1650,27 @@ 
  * relationships are sorted out.
  */
 function _content_overview_order(&$form, $field_rows, $group_rows) {
-  // Put weight and parenting values into a $dummy render structure
-  // and let drupal_render figure out the corresponding row order.
-  $dummy = array();
-  // Group rows: account for weight.
-  if (module_exists('fieldgroup')) {
+    // Put weight and parenting values into a $dummy render structure
+    // and let drupal_render figure out the corresponding row order.
+    $dummy = array();
+    // Group rows: account for weight.
+    if (module_exists('fieldgroup')) {
     foreach ($group_rows as $name) {
-      $dummy[$name] = array('#weight' => $form[$name]['weight']['#value'], '#value' => $name .' ');
+        $dummy[$name] = array('#weight' => $form[$name]['weight']['#value'], '#value' => $name .' ');
     }
-  }
-  // Field rows : account for weight and parenting.
-  foreach ($field_rows as $name) {
+    }
+    // Field rows : account for weight and parenting.
+    foreach ($field_rows as $name) {
     $dummy[$name] = array('#weight' => $form[$name]['weight']['#value'], '#value' => $name .' ');
     if (module_exists('fieldgroup')) {
-      if ($parent = $form[$name]['parent']['#value']) {
+        if ($parent = $form[$name]['parent']['#value']) {
         $form[$name]['#depth'] = 1;
         $dummy[$parent][$name] = $dummy[$name];
         unset($dummy[$name]);
-      }
+        }
     }
-  }
-  return $dummy ? explode(' ', trim(drupal_render($dummy))) : array();
+    }
+    return $dummy ? explode(' ', trim(drupal_render($dummy))) : array();
 }
 
 /**
@@ -1683,50 +1683,50 @@ 
  * this and get it working properly when the fields are altered via the API.
  */
 function content_alter_fields($previous_field, $new_field) {
-  // See what values need to be updated in the field data.
-  $mask = content_alter_db_mask($previous_field, $new_field);
-
-  // We use batch processing to prevent timeout when updating a large number
-  // of nodes. If there is no previous data to adjust, we can just go straight
-  // to altering the schema, otherwise use batch processing to update
-  // the database one node at a time, then update the schema.
-  if (empty($mask)) {
+    // See what values need to be updated in the field data.
+    $mask = content_alter_db_mask($previous_field, $new_field);
+
+    // We use batch processing to prevent timeout when updating a large number
+    // of nodes. If there is no previous data to adjust, we can just go straight
+    // to altering the schema, otherwise use batch processing to update
+    // the database one node at a time, then update the schema.
+    if (empty($mask)) {
     return content_alter_db($previous_field, $new_field);
-  }
-  $updates = array(
+    }
+    $updates = array(
     'mask' => $mask['mask'],
     'alt_mask' => $mask['alt_mask'],
     'delta' => $mask['delta'],
     );
-  $batch = array(
+    $batch = array(
     'operations' => array(
-      array('content_field_batch_update', array($previous_field['field_name'] => $updates)),
-      array('content_alter_db', array($previous_field, $new_field))
+        array('content_field_batch_update', array($previous_field['field_name'] => $updates)),
+        array('content_alter_db', array($previous_field, $new_field))
     ),
     'finished' => '_content_alter_fields_finished',
     'title' => t('Processing'),
     'error_message' => t('The update has encountered an error.'),
     'file' => './'. drupal_get_path('module', 'content') .'/includes/content.admin.inc',
-  );
-  batch_set($batch);
-  if (!empty($url)) {
+    );
+    batch_set($batch);
+    if (!empty($url)) {
     batch_process($url, $url);
-  }
+    }
 }
 
 /**
  * Content Replace Fields 'finished' callback.
  */
 function _content_alter_fields_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     drupal_set_message(t('The database has been altered and data has been migrated or deleted.'));
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('An error occurred and database alteration did not complete.'), 'error');
     $message = format_plural(count($results), '1 item successfully processed:', '@count items successfully processed:');
     $message .= theme('item_list', $results);
     drupal_set_message($message);
-  }
+    }
 }
 
 /**
@@ -1741,28 +1741,28 @@ 
  * some columns still have values, so all these things need to be tested.
  */
 function content_alter_db_mask($previous_field, $new_field) {
-  // Get an array of column values that will be dropped by this
-  // schema change and create a mask to feed to content_batch_update.
+    // Get an array of column values that will be dropped by this
+    // schema change and create a mask to feed to content_batch_update.
 
-  $dropped = content_alter_db_analyze($previous_field, $new_field);
-  if (empty($dropped)) {
+    $dropped = content_alter_db_analyze($previous_field, $new_field);
+    if (empty($dropped)) {
     return array();
-  }
-  $mask = array('mask' => array());
-  foreach (array_keys($previous_field['columns']) as $column_name) {
+    }
+    $mask = array('mask' => array());
+    foreach (array_keys($previous_field['columns']) as $column_name) {
     // The basic mask will empty the dropped columns.
     if (isset($dropped['columns']) && in_array($column_name, $dropped['columns'])) {
-      $mask['mask'][$column_name] = NULL;
+        $mask['mask'][$column_name] = NULL;
     }
     // Over the delta we'll empty all columns.
     if (isset($dropped['delta'])) {
-      $mask['alt_mask'][$column_name] = NULL;
+        $mask['alt_mask'][$column_name] = NULL;
+    }
     }
-  }
-  if (isset($dropped['delta'])) {
+    if (isset($dropped['delta'])) {
     $mask['delta'] = $dropped['delta'];
-  }
-  return $mask;
+    }
+    return $mask;
 }
 
 /**
@@ -1785,36 +1785,36 @@ 
  *     ),
  */
 function content_field_batch_update($updates, &$context) {
-  if (empty($field)) {
+    if (empty($field)) {
     $context['finished'] = 1;
     return;
-  }
-  $field_name = $updates['field_name'];
-  $field = content_fields($field_name);
+    }
+    $field_name = $updates['field_name'];
+    $field = content_fields($field_name);
 
-  if (!isset($context['sandbox']['progress'])) {
+    if (!isset($context['sandbox']['progress'])) {
     $db_info = content_database_info($field);
 
     // Might run into non-existent tables when cleaning up a corrupted
     // database, like some of the old content storage changes in the
     // .install files.
     if (!db_table_exists($db_info['table'])) {
-      return $context['finished'] = 1;
+        return $context['finished'] = 1;
     }
     $nodes = array();
     $result = db_query("SELECT nid FROM {". $db_info['table'] ."}");
     while ($node = db_fetch_array($result)) {
-      $nodes[] = $node['nid'];
+        $nodes[] = $node['nid'];
     }
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['max'] = count($nodes);
     $context['sandbox']['nodes'] = $nodes;
-  }
+    }
 
-  // Process nodes by groups of 5.
-  $count = min(5, count($context['sandbox']['nodes']));
+    // Process nodes by groups of 5.
+    $count = min(5, count($context['sandbox']['nodes']));
 
-  for ($i = 1; $i <= $count; $i++) {
+    for ($i = 1; $i <= $count; $i++) {
     // For each nid, load the node, empty the column values
     // or the whole field, and re-save it.
     $nid = array_shift($context['sandbox']['nodes']);
@@ -1826,13 +1826,13 @@ 
     // Update our progress information.
     $context['sandbox']['progress']++;
     $context['message'] = t('Processing %title', array('%title' => $node->title));
-  }
+    }
 
-  // Inform the batch engine that we are not finished,
-  // and provide an estimation of the completion level we reached.
-  if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
+    // Inform the batch engine that we are not finished,
+    // and provide an estimation of the completion level we reached.
+    if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
-  }
+    }
 }
 
 /**
@@ -1869,48 +1869,48 @@ 
  *     ),
  */
 function content_field_replace($nid, $updates) {
-  $node = node_load($nid, NULL, TRUE);
-  foreach ($updates as $field_name => $update) {
+    $node = node_load($nid, NULL, TRUE);
+    foreach ($updates as $field_name => $update) {
     $items = isset($node->$field_name) ? $node->$field_name : array();
     foreach ($items as $delta => $value) {
-      $field_mask = (isset($update['delta']) && isset($update['alt_mask']) && $delta >= $update['delta']) ? $update['alt_mask'] : $mask['mask'];
-      // Merge the mask into the field values to do the replacements.
-      $items[$delta] = array_merge($items[$delta], $field_mask);
+        $field_mask = (isset($update['delta']) && isset($update['alt_mask']) && $delta >= $update['delta']) ? $update['alt_mask'] : $mask['mask'];
+        // Merge the mask into the field values to do the replacements.
+        $items[$delta] = array_merge($items[$delta], $field_mask);
     }
     // Test if the new values will make items qualify as empty.
     $items = content_set_empty($field, $items);
     $node->$field_name = $items;
-  }
-  node_save($node);
-  return $node;
+    }
+    node_save($node);
+    return $node;
 }
 
 /**
  * Helper form element validator : integer.
  */
 function _element_validate_integer($element, &$form_state) {
-  $value = $element['#value'];
-  if ($value !== '' && (!is_numeric($value) || intval($value) != $value)) {
+    $value = $element['#value'];
+    if ($value !== '' && (!is_numeric($value) || intval($value) != $value)) {
     form_error($element, t('%name must be an integer.', array('%name' => $element['#title'])));
-  }
+    }
 }
 
 /**
  * Helper form element validator : integer > 0.
  */
 function _element_validate_integer_positive($element, &$form_state) {
-  $value = $element['#value'];
-  if ($value !== '' && (!is_numeric($value) || intval($value) != $value || $value <= 0)) {
+    $value = $element['#value'];
+    if ($value !== '' && (!is_numeric($value) || intval($value) != $value || $value <= 0)) {
     form_error($element, t('%name must be a positive integer.', array('%name' => $element['#title'])));
-  }
+    }
 }
 
 /**
  * Helper form element validator : number.
  */
 function _element_validate_number($element, &$form_state) {
-  $value = $element['#value'];
-  if ($value != '' && !is_numeric($value)) {
+    $value = $element['#value'];
+    if ($value != '' && !is_numeric($value)) {
     form_error($element, t('%name must be a number.', array('%name' => $element['#title'])));
-  }
+    }
 }

Spacing +46 added lines, -46 removed lines

@@ -27,13 +27,13 @@ 
       // Make the description smaller
       $row[] = array('data' => filter_xss_admin($type->description), 'class' => 'description');
       // Set the edit column.
-      $row[] = array('data' => l(t('edit'), 'admin/content/node-type/'. $type_url_str));
+      $row[] = array('data' => l(t('edit'), 'admin/content/node-type/'.$type_url_str));
       // Set links for managing fields.
       // TODO: a hook to allow other content modules to add more stuff?
-      $row[] = array('data' => l(t('manage fields'), 'admin/content/node-type/'. $type_url_str .'/fields'));
+      $row[] = array('data' => l(t('manage fields'), 'admin/content/node-type/'.$type_url_str.'/fields'));
       // Set the delete column.
       if ($type->custom) {
-        $row[] = array('data' => l(t('delete'), 'admin/content/node-type/'. $type_url_str .'/delete'));
+        $row[] = array('data' => l(t('delete'), 'admin/content/node-type/'.$type_url_str.'/delete'));
       }
       else {
         $row[] = array('data' => '');
@@ -45,7 +45,7 @@ 
 
   // Allow external modules alter the table headers and rows.
   foreach (module_implements('content_types_overview_alter') as $module) {
-    $function = $module .'_content_types_overview_alter';
+    $function = $module.'_content_types_overview_alter';
     $function($header, $rows);
   }
 
@@ -53,11 +53,11 @@ 
     $rows[] = array(array('data' => t('No content types available.'), 'colspan' => '7', 'class' => 'message'));
   }
 
-  return theme('table', $header, $rows) .theme('content_overview_links');
+  return theme('table', $header, $rows).theme('content_overview_links');
 }
 
 function theme_content_overview_links() {
-  return '<div class="content-overview-links">'. l(t('» Add a new content type'), 'admin/content/types/add') .'</div>';
+  return '<div class="content-overview-links">'.l(t('» Add a new content type'), 'admin/content/types/add').'</div>';
 }
 
 /**
@@ -78,7 +78,7 @@ 
     $row[] = t($field_types[$field['type']]['label']);
 
     $types = array();
-    $result = db_query("SELECT nt.name, nt.type FROM {". content_instance_tablename() ."} nfi ".
+    $result = db_query("SELECT nt.name, nt.type FROM {".content_instance_tablename()."} nfi ".
     "LEFT JOIN {node_type} nt ON nt.type = nfi.type_name ".
     "WHERE nfi.field_name = '%s' ".
     // Keep disabled modules out of table.
@@ -86,7 +86,7 @@ 
     "ORDER BY nt.name ASC", $field['field_name']);
     while ($type = db_fetch_array($result)) {
       $content_type = content_types($type['type']);
-      $types[] = l($type['name'], 'admin/content/node-type/'. $content_type['url_str'] .'/fields');
+      $types[] = l($type['name'], 'admin/content/node-type/'.$content_type['url_str'].'/fields');
     }
     $row[] = implode(', ', $types);
 
@@ -173,8 +173,8 @@ 
       'label' => array('#value' => check_plain($field['widget']['label'])),
       'field_name' => array('#value' => $field['field_name']),
       'type' => array('#value' => t($field_types[$field['type']]['label'])),
-      'configure' => array('#value' => l(t('Configure'), 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'])),
-      'remove' => array('#value' => l(t('Remove'), 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'] .'/remove')),
+      'configure' => array('#value' => l(t('Configure'), 'admin/content/node-type/'.$type['url_str'].'/fields/'.$field['field_name'])),
+      'remove' => array('#value' => l(t('Remove'), 'admin/content/node-type/'.$type['url_str'].'/fields/'.$field['field_name'].'/remove')),
       'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
       'parent' => array('#type' => 'select', '#options' => $group_options, '#default_value' => ''),
       'prev_parent' => array('#type' => 'hidden', '#value' => ''),
@@ -199,8 +199,8 @@ 
       'label' => array('#value' => check_plain($group['label'])),
       'group_name' => array('#value' => $group['group_name']),
       'group_type' => array('#value' => t($group_types[$group['group_type']])),
-      'configure' => array('#value' => l(t('Configure'), 'admin/content/node-type/'. $type['url_str'] .'/groups/'. $group['group_name'])),
-      'remove' => array('#value' => l(t('Remove'), 'admin/content/node-type/'. $type['url_str'] .'/groups/'. $group['group_name'] .'/remove')),
+      'configure' => array('#value' => l(t('Configure'), 'admin/content/node-type/'.$type['url_str'].'/groups/'.$group['group_name'])),
+      'remove' => array('#value' => l(t('Remove'), 'admin/content/node-type/'.$type['url_str'].'/groups/'.$group['group_name'].'/remove')),
       'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
       'parent' => array('#type' => 'hidden', '#default_value' => ''),
       'hidden_name' => array('#type' => 'hidden', '#default_value' => $group['group_name']),
@@ -266,7 +266,7 @@ 
       'type' => array(
         '#type' => 'select',
         '#options' => $field_type_options,
-        '#description' => theme('advanced_help_topic', 'content', 'fields') . t('Type of data to store.'),
+        '#description' => theme('advanced_help_topic', 'content', 'fields').t('Type of data to store.'),
       ),
       'widget_type' => array(
         '#type' => 'select',
@@ -397,7 +397,7 @@ 
 
       // Add the 'field_' prefix.
       if (substr($field_name, 0, 6) != 'field_') {
-        $field_name = 'field_'. $field_name;
+        $field_name = 'field_'.$field_name;
         form_set_value($form['_add_new_field']['field_name'], $field_name, $form_state);
       }
 
@@ -494,7 +494,7 @@ 
   foreach ($form_values as $key => $values) {
     // Groups are handled in fieldgroup_content_overview_form_submit().
     if (in_array($key, $form['#fields'])) {
-      db_query("UPDATE {". content_instance_tablename() ."} SET weight = %d WHERE type_name = '%s' AND field_name = '%s'",
+      db_query("UPDATE {".content_instance_tablename()."} SET weight = %d WHERE type_name = '%s' AND field_name = '%s'",
         $values['weight'], $type_name, $key);
     }
     elseif (in_array($key, $form['#extra'])) {
@@ -503,10 +503,10 @@ 
   }
 
   if ($extra) {
-    variable_set('content_extra_weights_'. $type_name, $extra);
+    variable_set('content_extra_weights_'.$type_name, $extra);
   }
   else {
-    variable_del('content_extra_weights_'. $type_name);
+    variable_del('content_extra_weights_'.$type_name);
   }
 
   content_clear_type_cache();
@@ -522,7 +522,7 @@ 
     if (content_field_instance_create($field)) {
       // Store new field information for fieldgroup submit handler.
       $form_state['fields_added']['_add_new_field'] = $field['field_name'];
-      $destinations[] = 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'];
+      $destinations[] = 'admin/content/node-type/'.$type['url_str'].'/fields/'.$field['field_name'];
     }
     else {
       drupal_set_message(t('There was a problem creating field %label.', array(
@@ -544,7 +544,7 @@ 
       if (content_field_instance_create($field)) {
         // Store new field information for fieldgroup submit handler.
         $form_state['fields_added']['_add_existing_field'] = $field['field_name'];
-        $destinations[] = 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'];
+        $destinations[] = 'admin/content/node-type/'.$type['url_str'].'/fields/'.$field['field_name'];
       }
       else {
         drupal_set_message(t('There was a problem adding field %label.', array('%label' => $field['field_name'])));
@@ -590,7 +590,7 @@ 
 
   if (empty($fields)) {
     drupal_set_message(t('There are no fields configured for this content type. You can add new fields on the <a href="@link">Manage fields</a> page.', array(
-      '@link' => url('admin/content/node-type/'. $type['url_str'] .'/fields'))), 'warning');
+      '@link' => url('admin/content/node-type/'.$type['url_str'].'/fields'))), 'warning');
     return $form;
   }
 
@@ -783,7 +783,7 @@ 
     if (!isset($type['fields'][$field['field_name']]) && !$field['locked']) {
       $field_type = $field_types[$field['type']];
       $text = t('@type: @field (@label)', array('@type' => t($field_type['label']), '@label' => t($field['widget']['label']), '@field' => $field['field_name']));
-      $options[$field['field_name']] = (drupal_strlen($text) > 80) ? truncate_utf8($text, 77) . '...' : $text;
+      $options[$field['field_name']] = (drupal_strlen($text) > 80) ? truncate_utf8($text, 77).'...' : $text;
     }
   }
   // Sort the list by type, then by field name, then by label.
@@ -885,7 +885,7 @@ 
   }
 
   $type = content_types($form_values['type_name']);
-  $form_state['redirect'] = 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $form_values['field_name'];
+  $form_state['redirect'] = 'admin/content/node-type/'.$type['url_str'].'/fields/'.$form_values['field_name'];
   $form_state['rebuild'] = FALSE;
 }
 
@@ -908,7 +908,7 @@ 
 
   $output = confirm_form($form,
     t('Are you sure you want to remove the field %field?', array('%field' => $field['widget']['label'])),
-    'admin/content/node-type/'. $type['url_str'] .'/fields',
+    'admin/content/node-type/'.$type['url_str'].'/fields',
     t('If you have any content left in this field, it will be lost. This action cannot be undone.'),
     t('Remove'), t('Cancel'),
     'confirm'
@@ -946,7 +946,7 @@ 
         '%field' => $field['widget']['label'],
         '%type' => $type['name'])));
     }
-    $form_state['redirect'] = 'admin/content/node-type/'. $type['url_str'] .'/fields';
+    $form_state['redirect'] = 'admin/content/node-type/'.$type['url_str'].'/fields';
   }
 }
 
@@ -1042,7 +1042,7 @@ 
     '#default_value' => $field['widget']['weight'],
   );
 
-  $additions = (array) module_invoke($widget_type['module'], 'widget_settings', 'form', $field['widget']);
+  $additions = (array)module_invoke($widget_type['module'], 'widget_settings', 'form', $field['widget']);
   drupal_alter('widget_settings', $additions, 'form', $field['widget']);
   $form['widget'] = array_merge($form['widget'], $additions);
 
@@ -1083,7 +1083,7 @@ 
     );
 
     // Default value widget.
-    $widget_form = array('#node' => (object) array('type' => $type_name));
+    $widget_form = array('#node' => (object)array('type' => $type_name));
     $widget_form_state = array('values' => array($field['field_name'] => $default_value));
     // Make sure the default value is not a required field.
     $widget_field = $field;
@@ -1127,7 +1127,7 @@ 
       $form['widget']['default_value_fieldset']['advanced_options']['markup_default_value_php'] = array(
         '#type' => 'item',
         '#title' => t('Code'),
-        '#value' => !empty($field['widget']['default_value_php']) ? '<code>'. check_plain($field['widget']['default_value_php']) .'</code>' : t('&lt;none&gt;'),
+        '#value' => !empty($field['widget']['default_value_php']) ? '<code>'.check_plain($field['widget']['default_value_php']).'</code>' : t('&lt;none&gt;'),
         '#description' => empty($field['widget']['default_value_php']) ? t("You're not allowed to input PHP code.") : t('This PHP code was set by an administrator and will override any value specified above.'),
       );
     }
@@ -1145,9 +1145,9 @@ 
   );
   $description = t('Maximum number of values users can enter for this field.');
   if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
-    $description .= '<br/>'. t("'Unlimited' will provide an 'Add more' button so the users can add as many values as they like.");
+    $description .= '<br/>'.t("'Unlimited' will provide an 'Add more' button so the users can add as many values as they like.");
   }
-  $description .= '<br/><strong>'. t('Warning! Changing this setting after data has been created could result in the loss of data!') .'</strong>';
+  $description .= '<br/><strong>'.t('Warning! Changing this setting after data has been created could result in the loss of data!').'</strong>';
   $form['field']['multiple'] = array(
     '#type' => 'select',
     '#title' => t('Number of values'),
@@ -1161,7 +1161,7 @@ 
     '#value' => serialize($field),
   );
 
-  $additions = (array) module_invoke($field_type['module'], 'field_settings', 'form', $field);
+  $additions = (array)module_invoke($field_type['module'], 'field_settings', 'form', $field);
   drupal_alter('field_settings', $additions, 'form', $field);
   $form['field'] = array_merge($form['field'], $additions);
 
@@ -1290,7 +1290,7 @@ 
       $node = array();
       $node[$form_values['field_name']] = $default_value;
       $field['required'] = FALSE;
-      $field_function = $field_type['module'] .'_field';
+      $field_function = $field_type['module'].'_field';
 
       $errors_before = form_get_errors();
 
@@ -1341,7 +1341,7 @@ 
   else {
     drupal_set_message(t('Saved field %label.', array('%label' => $form_values['label'])));
     $type = content_types($form_values['type_name']);
-    $form_state['redirect'] = 'admin/content/node-type/'. $type['url_str'] .'/fields';
+    $form_state['redirect'] = 'admin/content/node-type/'.$type['url_str'].'/fields';
   }
 }
 
@@ -1518,7 +1518,7 @@ 
   // drop all delta values higher than the new maximum delta value.
   // Not needed if the new multiple is unlimited or if the new table is the content table.
   if ($new_table != $base_tablename && $new_field['multiple'] < $previous_field['multiple'] && $new_field['multiple'] != 1) {
-    db_query("DELETE FROM {". $new_table ."} WHERE delta >= ". max(1, $new_field['multiple']));
+    db_query("DELETE FROM {".$new_table."} WHERE delta >= ".max(1, $new_field['multiple']));
   }
 
   // If going from multiple to non-multiple, make sure the field tables have
@@ -1548,12 +1548,12 @@ 
   $new_field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD) {
     $columns = array_keys($migrate_columns);
     if ($new_field['multiple']) {
-      db_query('INSERT INTO {'. $new_table .'} (vid, nid, delta, '. implode(', ', $columns) .') '.
-        ' SELECT vid, nid, 0, '. implode(', ', $columns) .' FROM {'. $previous_table .'}');
+      db_query('INSERT INTO {'.$new_table.'} (vid, nid, delta, '.implode(', ', $columns).') '.
+        ' SELECT vid, nid, 0, '.implode(', ', $columns).' FROM {'.$previous_table.'}');
     }
     else {
-      db_query('INSERT INTO {'. $new_table .'} (vid, nid, '. implode(', ', $columns) .') '.
-        ' SELECT vid, nid, '. implode(', ', $columns) .' FROM {'. $previous_table .'}');
+      db_query('INSERT INTO {'.$new_table.'} (vid, nid, '.implode(', ', $columns).') '.
+        ' SELECT vid, nid, '.implode(', ', $columns).' FROM {'.$previous_table.'}');
     }
     foreach ($columns as $column_name) {
       db_drop_field($ret, $previous_table, $column_name);
@@ -1567,10 +1567,10 @@ 
     // rebuild the schema now.
     content_alter_db_cleanup();
     if ($previous_field['multiple']) {
-      $result = db_query("SELECT * FROM {". $previous_table ."} c JOIN {node} n ON c.nid = n.nid WHERE delta = 0 AND n.type = '%s'", $new_field['type_name']);
+      $result = db_query("SELECT * FROM {".$previous_table."} c JOIN {node} n ON c.nid = n.nid WHERE delta = 0 AND n.type = '%s'", $new_field['type_name']);
     }
     else {
-      $result = db_query("SELECT * FROM {". $previous_table ."} c JOIN {node} n ON c.nid = n.nid WHERE n.type = '%s'", $new_field['type_name']);
+      $result = db_query("SELECT * FROM {".$previous_table."} c JOIN {node} n ON c.nid = n.nid WHERE n.type = '%s'", $new_field['type_name']);
     }
     $record = array();
     while ($data = db_fetch_array($result)) {
@@ -1591,7 +1591,7 @@ 
           }
         }
       }
-      if (db_result(db_query('SELECT COUNT(*) FROM {'. $new_table .
+      if (db_result(db_query('SELECT COUNT(*) FROM {'.$new_table.
       '} WHERE vid = %d AND nid = %d', $data['vid'], $data['nid']))) {
         $keys = $new_field['multiple'] ? array('vid', 'delta') : array('vid');
         drupal_write_record($new_table, $record, $keys);
@@ -1656,12 +1656,12 @@ 
   // Group rows: account for weight.
   if (module_exists('fieldgroup')) {
     foreach ($group_rows as $name) {
-      $dummy[$name] = array('#weight' => $form[$name]['weight']['#value'], '#value' => $name .' ');
+      $dummy[$name] = array('#weight' => $form[$name]['weight']['#value'], '#value' => $name.' ');
     }
   }
   // Field rows : account for weight and parenting.
   foreach ($field_rows as $name) {
-    $dummy[$name] = array('#weight' => $form[$name]['weight']['#value'], '#value' => $name .' ');
+    $dummy[$name] = array('#weight' => $form[$name]['weight']['#value'], '#value' => $name.' ');
     if (module_exists('fieldgroup')) {
       if ($parent = $form[$name]['parent']['#value']) {
         $form[$name]['#depth'] = 1;
@@ -1706,7 +1706,7 @@ 
     'finished' => '_content_alter_fields_finished',
     'title' => t('Processing'),
     'error_message' => t('The update has encountered an error.'),
-    'file' => './'. drupal_get_path('module', 'content') .'/includes/content.admin.inc',
+    'file' => './'.drupal_get_path('module', 'content').'/includes/content.admin.inc',
   );
   batch_set($batch);
   if (!empty($url)) {
@@ -1802,7 +1802,7 @@ 
       return $context['finished'] = 1;
     }
     $nodes = array();
-    $result = db_query("SELECT nid FROM {". $db_info['table'] ."}");
+    $result = db_query("SELECT nid FROM {".$db_info['table']."}");
     while ($node = db_fetch_array($result)) {
       $nodes[] = $node['nid'];
     }
@@ -1821,7 +1821,7 @@ 
     $node = content_field_replace($nid, array($updates));
 
     // Store result for post-processing in the finished callback.
-    $context['results'][] = l($node->title, 'node/'. $node->nid);
+    $context['results'][] = l($node->title, 'node/'.$node->nid);
 
     // Update our progress information.
     $context['sandbox']['progress']++;
@@ -1831,7 +1831,7 @@ 
   // Inform the batch engine that we are not finished,
   // and provide an estimation of the completion level we reached.
   if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 

Braces +25 added lines, -50 removed lines

@@ -34,8 +34,7 @@ 
       // Set the delete column.
       if ($type->custom) {
         $row[] = array('data' => l(t('delete'), 'admin/content/node-type/'. $type_url_str .'/delete'));
-      }
-      else {
+      } else {
         $row[] = array('data' => '');
       }
 
@@ -94,8 +93,7 @@ 
   }
   if (empty($rows)) {
     $output = t('No fields have been defined for any content type yet.');
-  }
-  else {
+  } else {
     $output = theme('table', $header, $rows);
   }
   return $output;
@@ -496,16 +494,14 @@ 
     if (in_array($key, $form['#fields'])) {
       db_query("UPDATE {". content_instance_tablename() ."} SET weight = %d WHERE type_name = '%s' AND field_name = '%s'",
         $values['weight'], $type_name, $key);
-    }
-    elseif (in_array($key, $form['#extra'])) {
+    } elseif (in_array($key, $form['#extra'])) {
       $extra[$key] = $values['weight'];
     }
   }
 
   if ($extra) {
     variable_set('content_extra_weights_'. $type_name, $extra);
-  }
-  else {
+  } else {
     variable_del('content_extra_weights_'. $type_name);
   }
 
@@ -523,8 +519,7 @@ 
       // Store new field information for fieldgroup submit handler.
       $form_state['fields_added']['_add_new_field'] = $field['field_name'];
       $destinations[] = 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'];
-    }
-    else {
+    } else {
       drupal_set_message(t('There was a problem creating field %label.', array(
         '%label' => $field['label'])));
     }
@@ -538,15 +533,13 @@ 
 
     if ($existing_field['locked']) {
       drupal_set_message(t('The field %label cannot be added to a content type because it is locked.', array('%label' => $field['field_name'])));
-    }
-    else {
+    } else {
       module_load_include('inc', 'content', 'includes/content.crud');
       if (content_field_instance_create($field)) {
         // Store new field information for fieldgroup submit handler.
         $form_state['fields_added']['_add_existing_field'] = $field['field_name'];
         $destinations[] = 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $field['field_name'];
-      }
-      else {
+      } else {
         drupal_set_message(t('There was a problem adding field %label.', array('%label' => $field['field_name'])));
       }
     }
@@ -756,16 +749,14 @@ 
 
   if ($field_type) {
     return !empty($options[$field_type]) ? $options[$field_type] : array();
-  }
-  elseif ($by_label) {
+  } elseif ($by_label) {
     $field_types = _content_field_types();
     $options_by_label = array();
     foreach ($options as $field_type => $widgets) {
       $options_by_label[t($field_types[$field_type]['label'])] = $widgets;
     }
     return $options_by_label;
-  }
-  else {
+  } else {
     return $options;
   }
 }
@@ -878,8 +869,7 @@ 
   if (content_field_instance_update($field)) {
     drupal_set_message(t('Updated basic settings for field %label.', array(
       '%label' => $label)));
-  }
-  else {
+  } else {
     drupal_set_message(t('There was a problem updating the basic settings for field %label.', array(
       '%label' => $label)));
   }
@@ -940,8 +930,7 @@ 
       drupal_set_message(t('Removed field %field from %type.', array(
         '%field' => $field['widget']['label'],
         '%type' => $type['name'])));
-    }
-    else {
+    } else {
       drupal_set_message(t('There was a problem deleting %field from %type.', array(
         '%field' => $field['widget']['label'],
         '%type' => $type['name'])));
@@ -1122,8 +1111,7 @@ 
           '@link_devel' => 'http://www.drupal.org/project/devel',
           '%type' => $type_name)),
       );
-    }
-    else {
+    } else {
       $form['widget']['default_value_fieldset']['advanced_options']['markup_default_value_php'] = array(
         '#type' => 'item',
         '#title' => t('Code'),
@@ -1248,8 +1236,7 @@ 
       ob_end_clean();
       if (!is_array($return)) {
         $error = TRUE;
-      }
-      else {
+      } else {
         foreach ($return as $item) {
           if (!is_array($item)) {
             $error = TRUE;
@@ -1269,15 +1256,13 @@ 
           '!sample' => $sample,
           '@value' => print_r($return, TRUE))));
         return;
-      }
-      else {
+      } else {
         $default_value = $return;
         $is_code = TRUE;
         form_set_value(array('#parents' => array('default_value_php')), $php, $form_state);
         form_set_value(array('#parents' => array('default_value')), array(), $form_state);
       }
-    }
-    elseif (!empty($form_values['default_value_widget'])) {
+    } elseif (!empty($form_values['default_value_widget'])) {
       // Fields that handle their own multiple values may use an expected
       // value as the top-level key, so just pop off the top element.
       $key = array_shift(array_keys($form_values['default_value_widget']));
@@ -1306,8 +1291,7 @@ 
         if (trim($form_values['default_value_php'])) {
           form_set_error('default_value_php', t("The PHP code for 'default value' returned @value, which is invalid.", array(
             '@value' => print_r($default_value, TRUE))));
-        }
-        else {
+        } else {
           form_set_error('default_value', t('The default value is invalid.'));
         }
       }
@@ -1337,8 +1321,7 @@ 
   if ($destinations) {
     drupal_set_message(t('Added field %label.', array('%label' => $form_values['label'])));
     $form_state['redirect'] = content_get_destinations($destinations);
-  }
-  else {
+  } else {
     drupal_set_message(t('Saved field %label.', array('%label' => $form_values['label'])));
     $type = content_types($form_values['type_name']);
     $form_state['redirect'] = 'admin/content/node-type/'. $type['url_str'] .'/fields';
@@ -1455,8 +1438,7 @@ 
   if (empty($new_field)) {
     if ($previous_field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD) {
       db_drop_table($ret, $previous_table);
-    }
-    else {
+    } else {
       foreach ($previous_schema['fields'] as $column => $attributes) {
         if (!in_array($column, array('nid', 'vid', 'delta'))) {
           db_drop_field($ret, $previous_table, $column);
@@ -1478,8 +1460,7 @@ 
   // Create new table and columns, if not already created.
   if (!db_table_exists($new_table)) {
     db_create_table($ret, $new_table, $new_schema);
-  }
-  else {
+  } else {
     // Or add fields and/or indexes to an existing table.
     foreach ($new_schema['fields'] as $column => $attributes) {
       if (!in_array($column, array('nid', 'vid', 'delta'))) {
@@ -1530,8 +1511,7 @@ 
         db_drop_field($ret, $new_table, 'delta');
         db_drop_primary_key($ret, $new_table);
         db_add_primary_key($ret, $new_table, array('vid'));
-      }
-      else if ($previous_field['multiple'] == 0 && $new_field['multiple'] > 0) {
+      } else if ($previous_field['multiple'] == 0 && $new_field['multiple'] > 0) {
         db_add_field($ret, $new_table, 'delta', array(
           'type' => 'int',
           'unsigned' => TRUE,
@@ -1550,8 +1530,7 @@ 
     if ($new_field['multiple']) {
       db_query('INSERT INTO {'. $new_table .'} (vid, nid, delta, '. implode(', ', $columns) .') '.
         ' SELECT vid, nid, 0, '. implode(', ', $columns) .' FROM {'. $previous_table .'}');
-    }
-    else {
+    } else {
       db_query('INSERT INTO {'. $new_table .'} (vid, nid, '. implode(', ', $columns) .') '.
         ' SELECT vid, nid, '. implode(', ', $columns) .' FROM {'. $previous_table .'}');
     }
@@ -1568,8 +1547,7 @@ 
     content_alter_db_cleanup();
     if ($previous_field['multiple']) {
       $result = db_query("SELECT * FROM {". $previous_table ."} c JOIN {node} n ON c.nid = n.nid WHERE delta = 0 AND n.type = '%s'", $new_field['type_name']);
-    }
-    else {
+    } else {
       $result = db_query("SELECT * FROM {". $previous_table ."} c JOIN {node} n ON c.nid = n.nid WHERE n.type = '%s'", $new_field['type_name']);
     }
     $record = array();
@@ -1582,8 +1560,7 @@ 
       foreach ($migrate_columns as $column => $attributes) {
         if (is_null($data[$column])) {
           $record[$column] = NULL;
-        }
-        else {
+        } else {
           $record[$column] = $data[$column];
           // Prevent double serializtion in drupal_write_record.
           if (isset($attributes['serialize']) && $attributes['serialize']) {
@@ -1595,8 +1572,7 @@ 
       '} WHERE vid = %d AND nid = %d', $data['vid'], $data['nid']))) {
         $keys = $new_field['multiple'] ? array('vid', 'delta') : array('vid');
         drupal_write_record($new_table, $record, $keys);
-      }
-      else {
+      } else {
         drupal_write_record($new_table, $record);
       }
     }
@@ -1720,8 +1696,7 @@ 
 function _content_alter_fields_finished($success, $results, $operations) {
   if ($success) {
     drupal_set_message(t('The database has been altered and data has been migrated or deleted.'));
-  }
-  else {
+  } else {
     drupal_set_message(t('An error occurred and database alteration did not complete.'), 'error');
     $message = format_plural(count($results), '1 item successfully processed:', '@count items successfully processed:');
     $message .= theme('item_list', $results);

Upper-Lower-Casing +56 added lines, -56 removed lines

@@ -157,7 +157,7 @@ 
   $weights = array();
 
   $form = array(
-    '#tree' => TRUE,
+    '#tree' => true,
     '#type_name' => $type['type'],
     '#fields' => array_keys($fields),
     '#groups' => array_keys($groups),
@@ -179,14 +179,14 @@ 
       'parent' => array('#type' => 'select', '#options' => $group_options, '#default_value' => ''),
       'prev_parent' => array('#type' => 'hidden', '#value' => ''),
       'hidden_name' => array('#type' => 'hidden', '#default_value' => $field['field_name']),
-      '#leaf' => TRUE,
+      '#leaf' => true,
       '#row_type' => 'field',
       'field' =>  array('#type' => 'value', '#value' => $field),
     );
     if ($field['locked']) {
       $form[$name]['configure'] = array('#value' => t('Locked'));
       $form[$name]['remove'] = array();
-      $form[$name]['#disabled_row'] = TRUE;
+      $form[$name]['#disabled_row'] = true;
     }
     $form['#field_rows'][] = $name;
     $weights[] = $weight;
@@ -204,7 +204,7 @@ 
       'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
       'parent' => array('#type' => 'hidden', '#default_value' => ''),
       'hidden_name' => array('#type' => 'hidden', '#default_value' => $group['group_name']),
-      '#root' => TRUE,
+      '#root' => true,
       '#row_type' => 'group',
       'group' => array('#type' => 'value', '#value' => $group),
     );
@@ -228,9 +228,9 @@ 
       'configure' => array('#value' => isset($extra[$name]['configure']) ? $extra[$name]['configure'] : ''),
       'remove' => array('#value' => isset($extra[$name]['remove']) ? $extra[$name]['remove'] : ''),
       'hidden_name' => array('#type' => 'hidden', '#default_value' => $name),
-      '#leaf' => TRUE,
-      '#root' => TRUE,
-      '#disabled_row' => TRUE,
+      '#leaf' => true,
+      '#root' => true,
+      '#disabled_row' => true,
       '#row_type' => 'extra',
     );
     $form['#field_rows'][] = $name;
@@ -240,7 +240,7 @@ 
   // Additional row : add new field.
   $weight = max($weights) + 1;
   $field_type_options = content_field_type_options();
-  $widget_type_options = content_widget_type_options(NULL, TRUE);
+  $widget_type_options = content_widget_type_options(null, true);
   if ($field_type_options && $widget_type_options) {
     array_unshift($field_type_options, t('- Select a field type -'));
     array_unshift($widget_type_options, t('- Select a widget -'));
@@ -276,8 +276,8 @@ 
       'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
       'parent' => array('#type' => 'select', '#options' => $group_options, '#default_value' => ''),
       'hidden_name' => array('#type' => 'hidden', '#default_value' => $name),
-      '#leaf' => TRUE,
-      '#add_new' => TRUE,
+      '#leaf' => true,
+      '#add_new' => true,
       '#row_type' => 'add_new_field',
     );
     $form['#field_rows'][] = $name;
@@ -308,8 +308,8 @@ 
       'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
       'parent' => array('#type' => 'select', '#options' => $group_options, '#default_value' => ''),
       'hidden_name' => array('#type' => 'hidden', '#default_value' => $name),
-      '#leaf' => TRUE,
-      '#add_new' => TRUE,
+      '#leaf' => true,
+      '#add_new' => true,
       '#row_type' => 'add_existing_field',
     );
     $form['#field_rows'][] = $name;
@@ -348,8 +348,8 @@ 
       'weight' => array('#type' => 'textfield', '#default_value' => $weight, '#size' => 3),
       'parent' => array('#type' => 'hidden', '#default_value' => ''),
       'hidden_name' => array('#type' => 'hidden', '#default_value' => $name),
-      '#root' => TRUE,
-      '#add_new' => TRUE,
+      '#root' => true,
+      '#add_new' => true,
       '#row_type' => 'add_new_group',
     );
     if (count($group_types) > 1) {
@@ -416,8 +416,8 @@ 
       // Field name already exists.
       // We need to check inactive fields as well, so we can't use content_fields().
       module_load_include('inc', 'content', 'includes/content.crud');
-      $fields = content_field_instance_read(array(), TRUE);
-      $used = FALSE;
+      $fields = content_field_instance_read(array(), true);
+      $used = false;
       foreach ($fields as $existing_field) {
         $used |= ($existing_field['field_name'] == $field_name);
       }
@@ -581,7 +581,7 @@ 
   $contexts = content_build_modes($contexts_selector);
 
   $form = array(
-    '#tree' => TRUE,
+    '#tree' => true,
     '#type_name' => $type['type'],
     '#fields' => array_keys($fields),
     '#groups' => array_keys($groups),
@@ -704,12 +704,12 @@ 
       $field = content_fields($key, $form['#type_name']);
       // We have some numeric keys here, so we can't use array_merge.
       $field['display_settings'] = $values + $field['display_settings'];
-      content_field_instance_update($field, FALSE);
+      content_field_instance_update($field, false);
     }
   }
 
   // Clear caches and rebuild menu.
-  content_clear_type_cache(TRUE);
+  content_clear_type_cache(true);
   menu_rebuild();
 
   drupal_set_message(t('Your settings have been saved.'));
@@ -742,7 +742,7 @@ 
  * If no field type is provided, returns a nested array of
  * all widget types, keyed by field type human name
  */
-function content_widget_type_options($field_type = NULL, $by_label = FALSE) {
+function content_widget_type_options($field_type = null, $by_label = false) {
   static $options;
 
   if (!isset($options)) {
@@ -815,13 +815,13 @@ 
     '#type' => 'textfield',
     '#value' => $field_name,
     '#description' => t("The machine-readable name of the field. This name cannot be changed."),
-    '#disabled' => TRUE,
+    '#disabled' => true,
   );
   $form['basic']['label'] = array(
     '#type' => 'textfield',
     '#title' => t('Label'),
     '#default_value' => $label,
-    '#required' => TRUE,
+    '#required' => true,
     '#description' => t('A human-readable name to be used as the label for this field in the %type content type.', array('%type' => $type['name'])),
   );
   $form['basic']['type'] = array(
@@ -830,12 +830,12 @@ 
     '#options' => content_field_type_options(),
     '#default_value' => $field_type,
     '#description' => t('The type of data you would like to store in the database with this field. This option cannot be changed.'),
-    '#disabled' => TRUE,
+    '#disabled' => true,
   );
   $form['basic']['widget_type'] = array(
     '#type' => 'select',
     '#title' => t('Widget type'),
-    '#required' => TRUE,
+    '#required' => true,
     '#options' => content_widget_type_options($field_type),
     '#default_value' => $form_values['widget_type'],
     '#description' => t('The type of form element you would like to present to the user when creating this field in the %type content type.', array('%type' => $type['name'])),
@@ -886,7 +886,7 @@ 
 
   $type = content_types($form_values['type_name']);
   $form_state['redirect'] = 'admin/content/node-type/'. $type['url_str'] .'/fields/'. $form_values['field_name'];
-  $form_state['rebuild'] = FALSE;
+  $form_state['rebuild'] = false;
 }
 
 /**
@@ -985,7 +985,7 @@ 
 
   // Remove menu tabs when we are in an 'add new' sequence.
   if ($add_new_sequence) {
-    menu_set_item(NULL, menu_get_item('node'));
+    menu_set_item(null, menu_get_item('node'));
   }
 
   $form = array();
@@ -1002,19 +1002,19 @@ 
     '#type' => 'textfield',
     '#title' => t('Label'),
     '#value' => $field['widget']['label'],
-    '#disabled' => TRUE,
+    '#disabled' => true,
   );
   $form['basic']['field_name'] = array(
     '#type' => 'hidden',
     '#title' => t('Field name'),
     '#value' => $field['field_name'],
-    '#disabled' => TRUE,
+    '#disabled' => true,
   );
   $form['basic']['type'] = array(
     '#type' => 'hidden',
     '#title' => t('Field type'),
     '#value' => $field['type'],
-    '#disabled' => TRUE,
+    '#disabled' => true,
   );
   $widget_options = content_widget_type_options($field['type']);
   $form['basic']['widget_type'] = array(
@@ -1022,7 +1022,7 @@ 
     '#title' => t('Widget type'),
     '#options' => $widget_options,
     '#default_value' => $field['widget']['type'] ? $field['widget']['type'] : key($widget_options),
-    '#disabled' => TRUE,
+    '#disabled' => true,
   );
   $form['basic']['change'] = array(
     '#type' => 'submit',
@@ -1052,7 +1052,7 @@ 
     '#default_value' => $field['widget']['description'],
     '#rows' => 5,
     '#description' => t('Instructions to present to the user below this field on the editing form.<br />Allowed HTML tags: @tags', array('@tags' => _content_filter_xss_display_allowed_tags())),
-    '#required' => FALSE,
+    '#required' => false,
   );
 
   // Add handling for default value if not provided by field.
@@ -1078,8 +1078,8 @@ 
     $form['widget']['default_value_fieldset'] = array(
       '#type' => 'fieldset',
       '#title' => t('Default value'),
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
+      '#collapsible' => true,
+      '#collapsed' => true,
     );
 
     // Default value widget.
@@ -1087,11 +1087,11 @@ 
     $widget_form_state = array('values' => array($field['field_name'] => $default_value));
     // Make sure the default value is not a required field.
     $widget_field = $field;
-    $widget_field['required'] = FALSE;
+    $widget_field['required'] = false;
     module_load_include('inc', 'content', 'includes/content.node_form');
     $form_element = content_field_form($widget_form, $widget_form_state, $widget_field, 0);
     $form['widget']['default_value_fieldset']['default_value_widget'] = $form_element;
-    $form['widget']['default_value_fieldset']['default_value_widget']['#tree'] = TRUE;
+    $form['widget']['default_value_fieldset']['default_value_widget']['#tree'] = true;
     // Set up form info that the default value widget will need to find in the form.
     $form['#field_info'] = array($widget_field['field_name'] => $widget_field);
 
@@ -1099,7 +1099,7 @@ 
     $form['widget']['default_value_fieldset']['advanced_options'] = array(
       '#type' => 'fieldset',
       '#title' => t('PHP code'),
-      '#collapsible' => TRUE,
+      '#collapsible' => true,
       '#collapsed' => empty($field['widget']['default_value_php']),
     );
 
@@ -1116,7 +1116,7 @@ 
         '#title' => t('Code'),
         '#default_value' => isset($field['widget']['default_value_php']) ? $field['widget']['default_value_php'] : '',
         '#rows' => 6,
-        '#tree' => TRUE,
+        '#tree' => true,
         '#description' => t('Advanced usage only: PHP code that returns a default value. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>To figure out the expected format, you can use the <em>devel load</em> tab provided by <a href="@link_devel">devel module</a> on a %type content page.', array(
           '!sample' => $sample,
           '@link_devel' => 'http://www.drupal.org/project/devel',
@@ -1236,23 +1236,23 @@ 
     // If this is a programmed form, get rid of the default value widget,
     // we have the default values already.
     if ($form['#programmed']) {
-      form_set_value(array('#parents' => array('default_value_widget')), NULL, $form_state);
+      form_set_value(array('#parents' => array('default_value_widget')), null, $form_state);
       return;
     }
 
     if (isset($form_values['default_value_php']) &&
     ($php = trim($form_values['default_value_php']))) {
-      $error = FALSE;
+      $error = false;
       ob_start();
       $return = eval($php);
       ob_end_clean();
       if (!is_array($return)) {
-        $error = TRUE;
+        $error = true;
       }
       else {
         foreach ($return as $item) {
           if (!is_array($item)) {
-            $error = TRUE;
+            $error = true;
             break;
           }
         }
@@ -1267,12 +1267,12 @@ 
 
         form_set_error('default_value_php', t('The default value PHP code returned an incorrect value.<br/>Expected format: <pre>!sample</pre> Returned value: @value', array(
           '!sample' => $sample,
-          '@value' => print_r($return, TRUE))));
+          '@value' => print_r($return, true))));
         return;
       }
       else {
         $default_value = $return;
-        $is_code = TRUE;
+        $is_code = true;
         form_set_value(array('#parents' => array('default_value_php')), $php, $form_state);
         form_set_value(array('#parents' => array('default_value')), array(), $form_state);
       }
@@ -1282,14 +1282,14 @@ 
       // value as the top-level key, so just pop off the top element.
       $key = array_shift(array_keys($form_values['default_value_widget']));
       $default_value = $form_values['default_value_widget'][$key];
-      $is_code = FALSE;
+      $is_code = false;
       form_set_value(array('#parents' => array('default_value_php')), '', $form_state);
       form_set_value(array('#parents' => array('default_value')), $default_value, $form_state);
     }
     if (isset($default_value)) {
       $node = array();
       $node[$form_values['field_name']] = $default_value;
-      $field['required'] = FALSE;
+      $field['required'] = false;
       $field_function = $field_type['module'] .'_field';
 
       $errors_before = form_get_errors();
@@ -1297,7 +1297,7 @@ 
       // Widget now does its own validation, should be no need
       // to add anything for widget validation here.
       if (function_exists($field_function)) {
-        $field_function('validate', $node, $field, $default_value, $form, NULL);
+        $field_function('validate', $node, $field, $default_value, $form, null);
       }
       // The field validation routine won't set an error on the right field,
       // so set it here.
@@ -1305,7 +1305,7 @@ 
       if (count($errors_after) > count($errors_before)) {
         if (trim($form_values['default_value_php'])) {
           form_set_error('default_value_php', t("The PHP code for 'default value' returned @value, which is invalid.", array(
-            '@value' => print_r($default_value, TRUE))));
+            '@value' => print_r($default_value, true))));
         }
         else {
           form_set_error('default_value', t('The default value is invalid.'));
@@ -1319,8 +1319,8 @@ 
  * Button submit handler.
  */
 function content_field_edit_form_submit_update_basic($form, &$form_state) {
-  $form_state['change_basic'] = TRUE;
-  $form_state['rebuild'] = TRUE;
+  $form_state['change_basic'] = true;
+  $form_state['rebuild'] = true;
 }
 
 /**
@@ -1534,8 +1534,8 @@ 
       else if ($previous_field['multiple'] == 0 && $new_field['multiple'] > 0) {
         db_add_field($ret, $new_table, 'delta', array(
           'type' => 'int',
-          'unsigned' => TRUE,
-          'not null' => TRUE,
+          'unsigned' => true,
+          'not null' => true,
           'default' => 0));
         db_drop_primary_key($ret, $new_table);
         db_add_primary_key($ret, $new_table, array('vid', 'delta'));
@@ -1581,7 +1581,7 @@ 
       }
       foreach ($migrate_columns as $column => $attributes) {
         if (is_null($data[$column])) {
-          $record[$column] = NULL;
+          $record[$column] = null;
         }
         else {
           $record[$column] = $data[$column];
@@ -1639,7 +1639,7 @@ 
   // TODO: this could be optimized. We don't need to rebuild in *every case*...
   // Or do we? This affects the schema and menu and may have unfortunate
   // delayed effects if we don't clear everything out at this point.
-  content_clear_type_cache(TRUE);
+  content_clear_type_cache(true);
 }
 
 /**
@@ -1752,11 +1752,11 @@ 
   foreach (array_keys($previous_field['columns']) as $column_name) {
     // The basic mask will empty the dropped columns.
     if (isset($dropped['columns']) && in_array($column_name, $dropped['columns'])) {
-      $mask['mask'][$column_name] = NULL;
+      $mask['mask'][$column_name] = null;
     }
     // Over the delta we'll empty all columns.
     if (isset($dropped['delta'])) {
-      $mask['alt_mask'][$column_name] = NULL;
+      $mask['alt_mask'][$column_name] = null;
     }
   }
   if (isset($dropped['delta'])) {
@@ -1869,7 +1869,7 @@ 
  *     ),
  */
 function content_field_replace($nid, $updates) {
-  $node = node_load($nid, NULL, TRUE);
+  $node = node_load($nid, null, true);
   foreach ($updates as $field_name => $update) {
     $items = isset($node->$field_name) ? $node->$field_name : array();
     foreach ($items as $delta => $value) {

drupal/sites/default/boinc/modules/contrib/cck/includes/panels/content_types/content_field.inc

Indentation +99 added lines, -99 removed lines

@@ -10,54 +10,54 @@ 
  * Callback function to supply a list of content types.
  */
 function content_content_field_ctools_content_types() {
-  return array(
+    return array(
     'title' => t('Content field'),
     'defaults' => array('label' => '', 'formatter' => ''),
     'content type' => 'content_content_field_content_type_content_type',
-  );
+    );
 }
 
 /**
  * Return all field content types available.
  */
 function content_content_field_content_type_content_types() {
-  // This will hold all the individual field content types.
-  $types = array();
+    // This will hold all the individual field content types.
+    $types = array();
 
-  // Get all fields on the site.
-  $field_types = _content_field_types();
+    // Get all fields on the site.
+    $field_types = _content_field_types();
 
-  foreach (content_types() as $type_name => $type) {
+    foreach (content_types() as $type_name => $type) {
     foreach ($type['fields'] as $field_name => $field) {
-      if (!isset($types[$field_name])) {
+        if (!isset($types[$field_name])) {
         $types[$field_name] = array(
-          'category' => t('Node'),
-          'icon' => 'icon_cck_field.png',
-          'title' => t('Field: @widget_label (@field_name) - @field_type', array(
+            'category' => t('Node'),
+            'icon' => 'icon_cck_field.png',
+            'title' => t('Field: @widget_label (@field_name) - @field_type', array(
             '@widget_label' => t($field['widget']['label']),
             '@field_name' => $field_name,
             '@field_type' => t($field_types[$field['type']]['label']),
-          )),
-          'description' => t('Field on the referenced node.'),
-          'types' => array(),
+            )),
+            'description' => t('Field on the referenced node.'),
+            'types' => array(),
         );
         if (isset($field_types[$field['type']]['content_icon'])) {
-          $types[$field_name]['icon'] = $field_types[$field['type']]['content_icon'];
+            $types[$field_name]['icon'] = $field_types[$field['type']]['content_icon'];
         }
-      }
-      $types[$field_name]['types'][$type_name] = $type['name'];
+        }
+        $types[$field_name]['types'][$type_name] = $type['name'];
+    }
     }
-  }
 
-  // Create the required context for each field related to the content types.
-  foreach ($types as $field_name => $field_content_type) {
+    // Create the required context for each field related to the content types.
+    foreach ($types as $field_name => $field_content_type) {
     $types[$field_name]['required context'] = new ctools_context_required(t('Node'), 'node', array(
-      'type' => array_keys($types[$field_name]['types']),
+        'type' => array_keys($types[$field_name]['types']),
     ));
     unset($types[$field_name]['types']);
-  }
+    }
 
-  return $types;
+    return $types;
 }
 
 /**
@@ -68,148 +68,148 @@ 
  * lets us translate the name properly.
  */
 function content_content_field_content_type_content_type($subtype) {
-  // Previous versions of CCK included the content type as part of the subtype.
-  // This allows those to continue to sort of work, at least during render.
-  if (strpos($subtype, ':') !== FALSE) {
+    // Previous versions of CCK included the content type as part of the subtype.
+    // This allows those to continue to sort of work, at least during render.
+    if (strpos($subtype, ':') !== FALSE) {
     list($content_type, $subtype) = explode(':', $subtype, 2);
-  }
+    }
 
-  $types = content_content_field_content_type_content_types();
-  if (isset($types[$subtype])) {
+    $types = content_content_field_content_type_content_types();
+    if (isset($types[$subtype])) {
     return $types[$subtype];
-  }
+    }
 }
 
 /**
  * Output function for the 'field' content type.
  */
 function content_content_field_content_type_render($subtype, $conf, $panel_args, $context) {
-  // Previous versions of CCK included the content type as part of the subtype.
-  // This allows those to continue to sort of work, at least during render.
-  if (strpos($subtype, ':') !== FALSE) {
+    // Previous versions of CCK included the content type as part of the subtype.
+    // This allows those to continue to sort of work, at least during render.
+    if (strpos($subtype, ':') !== FALSE) {
     list($content_type, $subtype) = explode(':', $subtype, 2);
-  }
+    }
 
-  if (is_array($context)) {
+    if (is_array($context)) {
     $context = array_pop($context);
-  }
-  // If we do not have a node, then we cannot generate output.
-  if (!isset($context->data)) {
+    }
+    // If we do not have a node, then we cannot generate output.
+    if (!isset($context->data)) {
     return;
-  }
-  $node = drupal_clone($context->data);
+    }
+    $node = drupal_clone($context->data);
 
-  // Extract the node type from the node in context, the field name from the
-  // panels content type subtype, and get the content field structure.
-  $field_name = $subtype;
-  $field = content_fields($field_name, $node->type);
+    // Extract the node type from the node in context, the field name from the
+    // panels content type subtype, and get the content field structure.
+    $field_name = $subtype;
+    $field = content_fields($field_name, $node->type);
 
-  // Get the formatter that was selected in the settings dialog.
-  $formatter = $conf['formatter'];
+    // Get the formatter that was selected in the settings dialog.
+    $formatter = $conf['formatter'];
 
-  // Check view access to the field.
-  if (!content_access('view', $field, NULL, $node)) {
+    // Check view access to the field.
+    if (!content_access('view', $field, NULL, $node)) {
     return;
-  }
+    }
 
-  // Force panel settings into the field's display settings.
-  $field['display_settings']['label']['format'] = $conf['label'] == 'normal' || !empty($conf['override_title']) ? 'hidden' : $conf['label'];
-  $field['display_settings']['full']['format'] = $formatter;
-  $node->build_mode = NODE_BUILD_NORMAL;
-  // TODO : allow panel-specific template suggestions for content-field.tpl.php ?
+    // Force panel settings into the field's display settings.
+    $field['display_settings']['label']['format'] = $conf['label'] == 'normal' || !empty($conf['override_title']) ? 'hidden' : $conf['label'];
+    $field['display_settings']['full']['format'] = $formatter;
+    $node->build_mode = NODE_BUILD_NORMAL;
+    // TODO : allow panel-specific template suggestions for content-field.tpl.php ?
 
-  $output = content_view_field($field, $node);
+    $output = content_view_field($field, $node);
 
-  $block = new stdClass();
-  $block->module = 'content';
-  $block->delta = $field_name;
-  if ($conf['label'] == 'normal') {
+    $block = new stdClass();
+    $block->module = 'content';
+    $block->delta = $field_name;
+    if ($conf['label'] == 'normal') {
     $block->title = t($field['widget']['label']);
-  }
-  $block->content = $output;
+    }
+    $block->content = $output;
 
-  return $block;
+    return $block;
 }
 
 /**
  * Returns a settings form for the custom type.
  */
 function content_content_field_content_type_edit_form(&$form, &$form_state) {
-  $conf = $form_state['conf'];
+    $conf = $form_state['conf'];
 
-  $form['label'] = array(
+    $form['label'] = array(
     '#type' => 'select',
     '#title' => t('Field label'),
     '#default_value' => isset($conf['label']) ? $conf['label'] : '',
     '#options' => array(
-      'normal' => t('Block title'),
-      'above' => t('Above'),
-      'inline' => t('Inline'),
+        'normal' => t('Block title'),
+        'above' => t('Above'),
+        'inline' => t('Inline'),
     ),
     '#description' => t('Configure how the label is going to be displayed. This option takes no effect when "Override title" option is enabled, the specified block title is displayed instead.'),
-  );
+    );
 
-  // Extract the field name from the panels content type subtype.
-  $field_name = $form_state['subtype_name'];
+    // Extract the field name from the panels content type subtype.
+    $field_name = $form_state['subtype_name'];
 
-  // Previous versions of CCK included the content type as part of the subtype.
-  // This allows those to continue to sort of work.
-  if (strpos($field_name, ':') !== FALSE) {
+    // Previous versions of CCK included the content type as part of the subtype.
+    // This allows those to continue to sort of work.
+    if (strpos($field_name, ':') !== FALSE) {
     list($content_type, $field_name) = explode(':', $field_name, 2);
-  }
+    }
 
-  // Get all the information about our field.
-  $field = content_fields($field_name);
+    // Get all the information about our field.
+    $field = content_fields($field_name);
 
-  // Get information about all the field types on the site.
-  $field_types = _content_field_types();
+    // Get information about all the field types on the site.
+    $field_types = _content_field_types();
 
-  // Get the information about the type that our field is.
-  $type_info = $field_types[$field['type']];
+    // Get the information about the type that our field is.
+    $type_info = $field_types[$field['type']];
 
-  // Put the possible formatters for our type into an array.
-  $options = array();
-  foreach ($type_info['formatters'] as $formatter_name => $formatter) {
+    // Put the possible formatters for our type into an array.
+    $options = array();
+    foreach ($type_info['formatters'] as $formatter_name => $formatter) {
     $options[$formatter_name] = $formatter['label'];
-  }
+    }
 
-  $form['formatter'] = array(
+    $form['formatter'] = array(
     '#type' => 'select',
     '#title' => t('Field formatter'),
     '#default_value' => isset($conf['formatter']) ? $conf['formatter'] : 'default',
     '#options' => $options,
     '#description' => t('Select a formatter.'),
     '#required' => TRUE,
-  );
+    );
 }
 
 function content_content_field_content_type_edit_form_submit(&$form, &$form_state) {
-  // Copy everything from our defaults.
-  foreach (array_keys($form_state['plugin']['defaults']) as $key) {
+    // Copy everything from our defaults.
+    foreach (array_keys($form_state['plugin']['defaults']) as $key) {
     $form_state['conf'][$key] = $form_state['values'][$key];
-  }
+    }
 }
 
 /**
  * Admin title for field content type.
  */
 function content_content_field_content_type_admin_title($subtype, $conf, $context) {
-  // Previous versions of CCK included the content type as part of the subtype.
-  // This allows those to continue to sort of work, at least during render.
-  if (strpos($subtype, ':') !== FALSE) {
+    // Previous versions of CCK included the content type as part of the subtype.
+    // This allows those to continue to sort of work, at least during render.
+    if (strpos($subtype, ':') !== FALSE) {
     list($content_type, $subtype) = explode(':', $subtype, 2);
-  }
+    }
 
-  // Get all fields on the site.
-  $field_types = _content_field_types();
+    // Get all fields on the site.
+    $field_types = _content_field_types();
 
-  // Get all the information about our field.
-  $field = content_fields($subtype);
+    // Get all the information about our field.
+    $field = content_fields($subtype);
 
-  return t('"@s" field: @widget_label (@field_name) - @field_type', array(
+    return t('"@s" field: @widget_label (@field_name) - @field_type', array(
     '@s' => $context->identifier,
     '@widget_label' => t($field['widget']['label']),
     '@field_name' => $subtype,
     '@field_type' => t($field_types[$field['type']]['label']),
-  ));
+    ));
 }

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -70,7 +70,7 @@ 
 function content_content_field_content_type_content_type($subtype) {
   // Previous versions of CCK included the content type as part of the subtype.
   // This allows those to continue to sort of work, at least during render.
-  if (strpos($subtype, ':') !== FALSE) {
+  if (strpos($subtype, ':') !== false) {
     list($content_type, $subtype) = explode(':', $subtype, 2);
   }
 
@@ -86,7 +86,7 @@ 
 function content_content_field_content_type_render($subtype, $conf, $panel_args, $context) {
   // Previous versions of CCK included the content type as part of the subtype.
   // This allows those to continue to sort of work, at least during render.
-  if (strpos($subtype, ':') !== FALSE) {
+  if (strpos($subtype, ':') !== false) {
     list($content_type, $subtype) = explode(':', $subtype, 2);
   }
 
@@ -108,7 +108,7 @@ 
   $formatter = $conf['formatter'];
 
   // Check view access to the field.
-  if (!content_access('view', $field, NULL, $node)) {
+  if (!content_access('view', $field, null, $node)) {
     return;
   }
 
@@ -154,7 +154,7 @@ 
 
   // Previous versions of CCK included the content type as part of the subtype.
   // This allows those to continue to sort of work.
-  if (strpos($field_name, ':') !== FALSE) {
+  if (strpos($field_name, ':') !== false) {
     list($content_type, $field_name) = explode(':', $field_name, 2);
   }
 
@@ -179,7 +179,7 @@ 
     '#default_value' => isset($conf['formatter']) ? $conf['formatter'] : 'default',
     '#options' => $options,
     '#description' => t('Select a formatter.'),
-    '#required' => TRUE,
+    '#required' => true,
   );
 }
 
@@ -196,7 +196,7 @@ 
 function content_content_field_content_type_admin_title($subtype, $conf, $context) {
   // Previous versions of CCK included the content type as part of the subtype.
   // This allows those to continue to sort of work, at least during render.
-  if (strpos($subtype, ':') !== FALSE) {
+  if (strpos($subtype, ':') !== false) {
     list($content_type, $subtype) = explode(':', $subtype, 2);
   }
 

drupal/sites/default/boinc/modules/contrib/cck/includes/content.diff.inc

Indentation +53 added lines, -53 removed lines

@@ -12,40 +12,40 @@ 
  * Implementation of hook_diff()
  */
 function content_diff($old_node, $new_node) {
-  $result = array();
-  // Prevent against invalid 'nodes' built by broken 3rd party code.
-  if (isset($new_node->type)) {
+    $result = array();
+    // Prevent against invalid 'nodes' built by broken 3rd party code.
+    if (isset($new_node->type)) {
     $type = content_types($new_node->type);
     $field_types = _content_field_types();
     foreach ($type['fields'] as $field) {
-      // Ignore fields the current user is not allowed to view.
-      if (!content_access('view', $field, NULL, $new_node)) {
+        // Ignore fields the current user is not allowed to view.
+        if (!content_access('view', $field, NULL, $new_node)) {
         continue;
-      }
-      $function = $field_types[$field['type']]['module'] . '_content_diff_values';
-      $function = function_exists($function) ? $function : 'content_content_diff_values';
-      $old_values = array();
-      $new_values = array();
-      if (isset($old_node->$field['field_name'])) {
+        }
+        $function = $field_types[$field['type']]['module'] . '_content_diff_values';
+        $function = function_exists($function) ? $function : 'content_content_diff_values';
+        $old_values = array();
+        $new_values = array();
+        if (isset($old_node->$field['field_name'])) {
         $old_values = $function($old_node, $field, $old_node->$field['field_name']);
-      }
-      if (isset($new_node->$field['field_name'])) {
+        }
+        if (isset($new_node->$field['field_name'])) {
         $new_values = $function($new_node, $field, $new_node->$field['field_name']);
-      }
-      if ($old_values || $new_values) {
+        }
+        if ($old_values || $new_values) {
         $result[$field['field_name']] = array(
-          '#name' => $field['widget']['label'],
-          '#old' => $old_values,
-          '#new' => $new_values,
-          '#weight' => $field['widget']['weight'],
-          '#format' => array(
+            '#name' => $field['widget']['label'],
+            '#old' => $old_values,
+            '#new' => $new_values,
+            '#weight' => $field['widget']['weight'],
+            '#format' => array(
             'show_header' => FALSE,
-          ),
+            ),
         );
-      }
+        }
     }
-  }
-  return $result;
+    }
+    return $result;
 }
 
 /**
@@ -54,75 +54,75 @@ 
  * Note that diff.module takes care of running check_plain on the output.
  */
 function content_content_diff_values($node, $field, $items) {
-  $return = array();
-  foreach ($items as $item) {
+    $return = array();
+    foreach ($items as $item) {
     foreach (explode("\n", $item['value']) as $i) {
-      $return[] = $i;
+        $return[] = $i;
+    }
     }
-  }
-  return $return;
+    return $return;
 }
 
 if (module_exists('userreference')) {
-  /**
-   * Implementation of hook_content_diff_values.
-   */
-  function userreference_content_diff_values($node, $field, $items) {
+    /**
+     * Implementation of hook_content_diff_values.
+     */
+    function userreference_content_diff_values($node, $field, $items) {
     static $titles = array();
     // Gather ids.
     $ids = array();
     foreach ($items as $item) {
-      if ($item['uid'] && is_numeric($item['uid'])) {
+        if ($item['uid'] && is_numeric($item['uid'])) {
         $ids[] = $item['uid'];
-      }
+        }
     }
     // Fetch titles we don't know yet.
     $queried_ids = array_diff($ids, array_keys($titles));
     if ($queried_ids) {
-      $result = db_query('SELECT uid, name FROM {users} WHERE uid IN ('. db_placeholders($queried_ids) .')', $queried_ids);
-      while ($row = db_fetch_array($result)) {
+        $result = db_query('SELECT uid, name FROM {users} WHERE uid IN ('. db_placeholders($queried_ids) .')', $queried_ids);
+        while ($row = db_fetch_array($result)) {
         $titles[$row['uid']] = $row['name'];
-      }
+        }
     }
     // Return result.
     $return = array();
     foreach ($items as $item) {
-      if ($item['uid'] && isset($titles[$item['uid']])) {
+        if ($item['uid'] && isset($titles[$item['uid']])) {
         $return[] = $titles[$item['uid']];
-      }
+        }
     }
     return $return;
-  }
+    }
 }
 
 if (module_exists('nodereference')) {
-  /**
-   * Implementation of hook_content_diff_values.
-   */
-  function nodereference_content_diff_values($node, $field, $items) {
+    /**
+     * Implementation of hook_content_diff_values.
+     */
+    function nodereference_content_diff_values($node, $field, $items) {
     static $titles = array();
     // Gather ids.
     $ids = array();
     foreach ($items as $item) {
-      if ($item['nid'] && is_numeric($item['nid'])) {
+        if ($item['nid'] && is_numeric($item['nid'])) {
         $ids[] = $item['nid'];
-      }
+        }
     }
     // Fetch titles we don't know yet.
     $queried_ids = array_diff($ids, array_keys($titles));
     if ($queried_ids) {
-      $result = db_query('SELECT nid, title FROM {node} WHERE nid IN ('. db_placeholders($queried_ids) .')', $queried_ids);
-      while ($row = db_fetch_array($result)) {
+        $result = db_query('SELECT nid, title FROM {node} WHERE nid IN ('. db_placeholders($queried_ids) .')', $queried_ids);
+        while ($row = db_fetch_array($result)) {
         $titles[$row['nid']] = $row['title'];
-      }
+        }
     }
     // Return result.
     $return = array();
     foreach ($items as $item) {
-      if ($item['nid'] && isset($titles[$item['nid']])) {
+        if ($item['nid'] && isset($titles[$item['nid']])) {
         $return[] = $titles[$item['nid']];
-      }
+        }
     }
     return $return;
-  }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
       if (!content_access('view', $field, NULL, $new_node)) {
         continue;
       }
-      $function = $field_types[$field['type']]['module'] . '_content_diff_values';
+      $function = $field_types[$field['type']]['module'].'_content_diff_values';
       $function = function_exists($function) ? $function : 'content_content_diff_values';
       $old_values = array();
       $new_values = array();
@@ -79,7 +79,7 @@ 
     // Fetch titles we don't know yet.
     $queried_ids = array_diff($ids, array_keys($titles));
     if ($queried_ids) {
-      $result = db_query('SELECT uid, name FROM {users} WHERE uid IN ('. db_placeholders($queried_ids) .')', $queried_ids);
+      $result = db_query('SELECT uid, name FROM {users} WHERE uid IN ('.db_placeholders($queried_ids).')', $queried_ids);
       while ($row = db_fetch_array($result)) {
         $titles[$row['uid']] = $row['name'];
       }
@@ -111,7 +111,7 @@ 
     // Fetch titles we don't know yet.
     $queried_ids = array_diff($ids, array_keys($titles));
     if ($queried_ids) {
-      $result = db_query('SELECT nid, title FROM {node} WHERE nid IN ('. db_placeholders($queried_ids) .')', $queried_ids);
+      $result = db_query('SELECT nid, title FROM {node} WHERE nid IN ('.db_placeholders($queried_ids).')', $queried_ids);
       while ($row = db_fetch_array($result)) {
         $titles[$row['nid']] = $row['title'];
       }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
     $field_types = _content_field_types();
     foreach ($type['fields'] as $field) {
       // Ignore fields the current user is not allowed to view.
-      if (!content_access('view', $field, NULL, $new_node)) {
+      if (!content_access('view', $field, null, $new_node)) {
         continue;
       }
       $function = $field_types[$field['type']]['module'] . '_content_diff_values';
@@ -39,7 +39,7 @@ 
           '#new' => $new_values,
           '#weight' => $field['widget']['weight'],
           '#format' => array(
-            'show_header' => FALSE,
+            'show_header' => false,
           ),
         );
       }

drupal/sites/default/boinc/modules/contrib/cck/includes/content.token.inc

Indentation +100 added lines, -100 removed lines

@@ -7,181 +7,181 @@
  * (on behalf of token.module)
  */
 function token_content_build_modes() {
-  return array(
+    return array(
     'token' => array(
-      'title' => t('Token'),
-      'build modes' => array(
+        'title' => t('Token'),
+        'build modes' => array(
         'token' => array(
-          'title' => t('Token'),
-          'views style' => FALSE,
+            'title' => t('Token'),
+            'views style' => FALSE,
+        ),
         ),
-      ),
     ),
-  );
+    );
 }
 
 // Two helper functions that generate appropriate tokens for CCK-added fields.
 function content_token_values($type, $object = NULL, $options = array()) {
-  $tokens = array();
-  if ($type == 'node') {
+    $tokens = array();
+    if ($type == 'node') {
     // Prevent against invalid 'nodes' built by broken 3rd party code.
     if (isset($object->type)) {
-      // Let PHP free the $node object when we are done. Working directly on the
-      // incoming $object causes memory leak issues on long-running scripts such
-      // as migrations. See http://drupal.org/node/736440.
-      $node = drupal_clone($object);
-      $content_type = content_types($node->type);
-      $node->build_mode = 'token';
-      $node->content = array();
-      content_view($node);
-      // The formatted values will only be known after the content has been rendered.
-      drupal_render($node->content);
-      content_alter($node);
-
-      $field_types = _content_field_types();
-      foreach ($content_type['fields'] as $field_name => $field) {
+        // Let PHP free the $node object when we are done. Working directly on the
+        // incoming $object causes memory leak issues on long-running scripts such
+        // as migrations. See http://drupal.org/node/736440.
+        $node = drupal_clone($object);
+        $content_type = content_types($node->type);
+        $node->build_mode = 'token';
+        $node->content = array();
+        content_view($node);
+        // The formatted values will only be known after the content has been rendered.
+        drupal_render($node->content);
+        content_alter($node);
+
+        $field_types = _content_field_types();
+        foreach ($content_type['fields'] as $field_name => $field) {
         $items = isset($node->{$field_name}) ? $node->{$field_name} : array();
         $function = $field_types[$field['type']]['module'] . '_token_values';
         if (!empty($items) && function_exists($function)) {
-          $token_values = (array) $function('field', $items, $options);
-          foreach ($token_values as $token => $value) {
+            $token_values = (array) $function('field', $items, $options);
+            foreach ($token_values as $token => $value) {
             $tokens[$field_name .'-'. $token] = $value;
-          }
+            }
+        }
         }
-      }
     }
-  }
-  return $tokens;
+    }
+    return $tokens;
 }
 
 function content_token_list($type = 'all') {
-  if ($type == 'node' || $type == 'all') {
+    if ($type == 'node' || $type == 'all') {
     $list = array();
     $field_types = _content_field_types();
 
     foreach (content_fields() as $field) {
-      $sub_list = array();
-      $function = $field_types[$field['type']]['module'] . '_token_list';
-      if (function_exists($function)) {
+        $sub_list = array();
+        $function = $field_types[$field['type']]['module'] . '_token_list';
+        if (function_exists($function)) {
         $sub_list = $function('field');
         foreach ($sub_list as $category => $token_list) {
-          foreach ($token_list as $token => $description) {
+            foreach ($token_list as $token => $description) {
             $list['CCK '. $category][$field['field_name'] .'-'. $token] = $description;
-          }
+            }
+        }
         }
-      }
     }
 
     return $list;
-  }
+    }
 }
 
 if (module_exists('nodereference')) {
-  function nodereference_token_list($type = 'all') {
+    function nodereference_token_list($type = 'all') {
     if ($type == 'field' || $type == 'all') {
-      $tokens = array();
+        $tokens = array();
 
-      $tokens['node reference']['nid']   = t('Referenced node ID');
-      $tokens['node reference']['title'] = t('Referenced node title');
-      $tokens['node reference']['title-raw'] = t('Referenced node unfiltered title. WARNING - raw user input.');
-      $tokens['node reference']['link']  = t("Formatted html link to the referenced node.");
-      $tokens['node reference']['path']  = t("Relative path alias to the referenced node.");
-      $tokens['node reference']['url']  = t("Absolute path alias to the referenced node.");
+        $tokens['node reference']['nid']   = t('Referenced node ID');
+        $tokens['node reference']['title'] = t('Referenced node title');
+        $tokens['node reference']['title-raw'] = t('Referenced node unfiltered title. WARNING - raw user input.');
+        $tokens['node reference']['link']  = t("Formatted html link to the referenced node.");
+        $tokens['node reference']['path']  = t("Relative path alias to the referenced node.");
+        $tokens['node reference']['url']  = t("Absolute path alias to the referenced node.");
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 
-  function nodereference_token_values($type, $object = NULL, $options = array()) {
+    function nodereference_token_values($type, $object = NULL, $options = array()) {
     if ($type == 'field') {
-      $item = $object[0];
+        $item = $object[0];
 
-      $title = is_numeric($item['nid']) ? _nodereference_titles($item['nid']) : '';
-      $tokens['nid']   = $item['nid'];
-      $tokens['title'] = $title ? check_plain($title) : '';
-      $tokens['title-raw'] = $title;
-      $tokens['link']  = isset($item['view']) ? $item['view'] : '';
-      $tokens['path'] = is_numeric($item['nid']) ? url('node/' . $item['nid']) : '';
-      $tokens['url'] = is_numeric($item['nid']) ? url('node/' . $item['nid'], array('absolute' => TRUE)) : '';
+        $title = is_numeric($item['nid']) ? _nodereference_titles($item['nid']) : '';
+        $tokens['nid']   = $item['nid'];
+        $tokens['title'] = $title ? check_plain($title) : '';
+        $tokens['title-raw'] = $title;
+        $tokens['link']  = isset($item['view']) ? $item['view'] : '';
+        $tokens['path'] = is_numeric($item['nid']) ? url('node/' . $item['nid']) : '';
+        $tokens['url'] = is_numeric($item['nid']) ? url('node/' . $item['nid'], array('absolute' => TRUE)) : '';
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 }
 
 if (module_exists('number')) {
-  function number_token_list($type = 'all') {
+    function number_token_list($type = 'all') {
     if ($type == 'field' || $type == 'all') {
-      $tokens = array();
+        $tokens = array();
 
-      $tokens['number']['raw']       = t('Raw number value');
-      $tokens['number']['formatted'] = t('Formatted number value');
+        $tokens['number']['raw']       = t('Raw number value');
+        $tokens['number']['formatted'] = t('Formatted number value');
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 
-  function number_token_values($type, $object = NULL, $options = array()) {
+    function number_token_values($type, $object = NULL, $options = array()) {
     if ($type == 'field') {
-      $item = $object[0];
+        $item = $object[0];
 
-      $tokens['raw']       = $item['value'];
-      $tokens['formatted'] = isset($item['view']) ? $item['view'] : '';
+        $tokens['raw']       = $item['value'];
+        $tokens['formatted'] = isset($item['view']) ? $item['view'] : '';
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 }
 
 if (module_exists('text')) {
-  function text_token_list($type = 'all') {
+    function text_token_list($type = 'all') {
     if ($type == 'field' || $type == 'all') {
-      $tokens = array();
+        $tokens = array();
 
-      $tokens['text']['raw']       = t('Raw, unfiltered text');
-      $tokens['text']['formatted'] = t('Formatted and filtered text');
+        $tokens['text']['raw']       = t('Raw, unfiltered text');
+        $tokens['text']['formatted'] = t('Formatted and filtered text');
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 
-  function text_token_values($type, $object = NULL, $options = array()) {
+    function text_token_values($type, $object = NULL, $options = array()) {
     if ($type == 'field') {
-      $item = $object[0];
+        $item = $object[0];
 
-      $tokens['raw']  = $item['value'];
-      $tokens['formatted'] = isset($item['view']) ? $item['view'] : '';
-      return $tokens;
+        $tokens['raw']  = $item['value'];
+        $tokens['formatted'] = isset($item['view']) ? $item['view'] : '';
+        return $tokens;
+    }
     }
-  }
 }
 
 if (module_exists('userreference')) {
-  function userreference_token_list($type = 'all') {
+    function userreference_token_list($type = 'all') {
     if ($type == 'field' || $type == 'all') {
-      $tokens = array();
+        $tokens = array();
 
-      $tokens['user reference']['uid']   = t('Referenced user ID');
-      $tokens['user reference']['name']  = t('Referenced user name');
-      $tokens['user reference']['link']  = t('Formatted HTML link to referenced user');
-      $tokens['user reference']['path']  = t("Relative path alias to the referenced user.");
-      $tokens['user reference']['url']  = t("Absolute path alias to the referenced user.");
+        $tokens['user reference']['uid']   = t('Referenced user ID');
+        $tokens['user reference']['name']  = t('Referenced user name');
+        $tokens['user reference']['link']  = t('Formatted HTML link to referenced user');
+        $tokens['user reference']['path']  = t("Relative path alias to the referenced user.");
+        $tokens['user reference']['url']  = t("Absolute path alias to the referenced user.");
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 
-  function userreference_token_values($type, $object = NULL, $options = array()) {
+    function userreference_token_values($type, $object = NULL, $options = array()) {
     if ($type == 'field') {
-      $item = $object[0];
+        $item = $object[0];
 
-      $tokens['uid']   = $item['uid'];
-      $tokens['name']  = isset($item['view']) ? strip_tags($item['view']) : '';
-      $tokens['link']  = isset($item['view']) ? $item['view'] : '';
-      $tokens['path'] = is_numeric($item['uid']) ? url('user/' . $item['uid']) : '';
-      $tokens['url'] = is_numeric($item['uid']) ? url('user/' . $item['uid'], array('absolute' => TRUE)) : '';
+        $tokens['uid']   = $item['uid'];
+        $tokens['name']  = isset($item['view']) ? strip_tags($item['view']) : '';
+        $tokens['link']  = isset($item['view']) ? $item['view'] : '';
+        $tokens['path'] = is_numeric($item['uid']) ? url('user/' . $item['uid']) : '';
+        $tokens['url'] = is_numeric($item['uid']) ? url('user/' . $item['uid'], array('absolute' => TRUE)) : '';
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 }

Spacing +12 added lines, -12 removed lines

@@ -41,11 +41,11 @@ 
       $field_types = _content_field_types();
       foreach ($content_type['fields'] as $field_name => $field) {
         $items = isset($node->{$field_name}) ? $node->{$field_name} : array();
-        $function = $field_types[$field['type']]['module'] . '_token_values';
+        $function = $field_types[$field['type']]['module'].'_token_values';
         if (!empty($items) && function_exists($function)) {
-          $token_values = (array) $function('field', $items, $options);
+          $token_values = (array)$function('field', $items, $options);
           foreach ($token_values as $token => $value) {
-            $tokens[$field_name .'-'. $token] = $value;
+            $tokens[$field_name.'-'.$token] = $value;
           }
         }
       }
@@ -61,12 +61,12 @@ 
 
     foreach (content_fields() as $field) {
       $sub_list = array();
-      $function = $field_types[$field['type']]['module'] . '_token_list';
+      $function = $field_types[$field['type']]['module'].'_token_list';
       if (function_exists($function)) {
         $sub_list = $function('field');
         foreach ($sub_list as $category => $token_list) {
           foreach ($token_list as $token => $description) {
-            $list['CCK '. $category][$field['field_name'] .'-'. $token] = $description;
+            $list['CCK '.$category][$field['field_name'].'-'.$token] = $description;
           }
         }
       }
@@ -86,7 +86,7 @@ 
       $tokens['node reference']['title-raw'] = t('Referenced node unfiltered title. WARNING - raw user input.');
       $tokens['node reference']['link']  = t("Formatted html link to the referenced node.");
       $tokens['node reference']['path']  = t("Relative path alias to the referenced node.");
-      $tokens['node reference']['url']  = t("Absolute path alias to the referenced node.");
+      $tokens['node reference']['url'] = t("Absolute path alias to the referenced node.");
 
       return $tokens;
     }
@@ -101,8 +101,8 @@ 
       $tokens['title'] = $title ? check_plain($title) : '';
       $tokens['title-raw'] = $title;
       $tokens['link']  = isset($item['view']) ? $item['view'] : '';
-      $tokens['path'] = is_numeric($item['nid']) ? url('node/' . $item['nid']) : '';
-      $tokens['url'] = is_numeric($item['nid']) ? url('node/' . $item['nid'], array('absolute' => TRUE)) : '';
+      $tokens['path'] = is_numeric($item['nid']) ? url('node/'.$item['nid']) : '';
+      $tokens['url'] = is_numeric($item['nid']) ? url('node/'.$item['nid'], array('absolute' => TRUE)) : '';
 
       return $tokens;
     }
@@ -149,7 +149,7 @@ 
     if ($type == 'field') {
       $item = $object[0];
 
-      $tokens['raw']  = $item['value'];
+      $tokens['raw'] = $item['value'];
       $tokens['formatted'] = isset($item['view']) ? $item['view'] : '';
       return $tokens;
     }
@@ -165,7 +165,7 @@ 
       $tokens['user reference']['name']  = t('Referenced user name');
       $tokens['user reference']['link']  = t('Formatted HTML link to referenced user');
       $tokens['user reference']['path']  = t("Relative path alias to the referenced user.");
-      $tokens['user reference']['url']  = t("Absolute path alias to the referenced user.");
+      $tokens['user reference']['url'] = t("Absolute path alias to the referenced user.");
 
       return $tokens;
     }
@@ -178,8 +178,8 @@ 
       $tokens['uid']   = $item['uid'];
       $tokens['name']  = isset($item['view']) ? strip_tags($item['view']) : '';
       $tokens['link']  = isset($item['view']) ? $item['view'] : '';
-      $tokens['path'] = is_numeric($item['uid']) ? url('user/' . $item['uid']) : '';
-      $tokens['url'] = is_numeric($item['uid']) ? url('user/' . $item['uid'], array('absolute' => TRUE)) : '';
+      $tokens['path'] = is_numeric($item['uid']) ? url('user/'.$item['uid']) : '';
+      $tokens['url'] = is_numeric($item['uid']) ? url('user/'.$item['uid'], array('absolute' => TRUE)) : '';
 
       return $tokens;
     }

Upper-Lower-Casing +8 added lines, -8 removed lines

@@ -13,7 +13,7 @@ 
       'build modes' => array(
         'token' => array(
           'title' => t('Token'),
-          'views style' => FALSE,
+          'views style' => false,
         ),
       ),
     ),
@@ -21,7 +21,7 @@ 
 }
 
 // Two helper functions that generate appropriate tokens for CCK-added fields.
-function content_token_values($type, $object = NULL, $options = array()) {
+function content_token_values($type, $object = null, $options = array()) {
   $tokens = array();
   if ($type == 'node') {
     // Prevent against invalid 'nodes' built by broken 3rd party code.
@@ -92,7 +92,7 @@ 
     }
   }
 
-  function nodereference_token_values($type, $object = NULL, $options = array()) {
+  function nodereference_token_values($type, $object = null, $options = array()) {
     if ($type == 'field') {
       $item = $object[0];
 
@@ -102,7 +102,7 @@ 
       $tokens['title-raw'] = $title;
       $tokens['link']  = isset($item['view']) ? $item['view'] : '';
       $tokens['path'] = is_numeric($item['nid']) ? url('node/' . $item['nid']) : '';
-      $tokens['url'] = is_numeric($item['nid']) ? url('node/' . $item['nid'], array('absolute' => TRUE)) : '';
+      $tokens['url'] = is_numeric($item['nid']) ? url('node/' . $item['nid'], array('absolute' => true)) : '';
 
       return $tokens;
     }
@@ -121,7 +121,7 @@ 
     }
   }
 
-  function number_token_values($type, $object = NULL, $options = array()) {
+  function number_token_values($type, $object = null, $options = array()) {
     if ($type == 'field') {
       $item = $object[0];
 
@@ -145,7 +145,7 @@ 
     }
   }
 
-  function text_token_values($type, $object = NULL, $options = array()) {
+  function text_token_values($type, $object = null, $options = array()) {
     if ($type == 'field') {
       $item = $object[0];
 
@@ -171,7 +171,7 @@ 
     }
   }
 
-  function userreference_token_values($type, $object = NULL, $options = array()) {
+  function userreference_token_values($type, $object = null, $options = array()) {
     if ($type == 'field') {
       $item = $object[0];
 
@@ -179,7 +179,7 @@ 
       $tokens['name']  = isset($item['view']) ? strip_tags($item['view']) : '';
       $tokens['link']  = isset($item['view']) ? $item['view'] : '';
       $tokens['path'] = is_numeric($item['uid']) ? url('user/' . $item['uid']) : '';
-      $tokens['url'] = is_numeric($item['uid']) ? url('user/' . $item['uid'], array('absolute' => TRUE)) : '';
+      $tokens['url'] = is_numeric($item['uid']) ? url('user/' . $item['uid'], array('absolute' => true)) : '';
 
       return $tokens;
     }

drupal/sites/default/boinc/modules/contrib/cck/modules/fieldgroup/panels/content_types/content_fieldgroup.inc

Indentation +68 added lines, -68 removed lines

@@ -10,155 +10,155 @@
  * Callback function to supply a list of content types.
  */
 function fieldgroup_content_fieldgroup_ctools_content_types() {
-  return array(
+    return array(
     'title' => t('Content fieldgroup'),
     'defaults' => array('label' => 'hidden', 'format' => 'simple', 'empty' => ''),
-  );
+    );
 }
 
 /**
  * Return all fieldgroup content types available.
  */
 function fieldgroup_content_fieldgroup_content_type_content_types() {
-  // This will hold all the individual fieldgroup content types.
-  $types = array();
+    // This will hold all the individual fieldgroup content types.
+    $types = array();
 
-  // The outer loop goes through each node type with groups.
-  foreach (fieldgroup_groups() as $node_type_groups) {
+    // The outer loop goes through each node type with groups.
+    foreach (fieldgroup_groups() as $node_type_groups) {
     // The inner loop gives us each fieldgroup on each node type with groups.
     foreach ($node_type_groups as $group) {
-      // Skip field groups that are not of standard type.
-      if ($group['group_type'] != 'standard') {
+        // Skip field groups that are not of standard type.
+        if ($group['group_type'] != 'standard') {
         continue;
-      }
+        }
 
-      // Name the content type a combination of fieldgroup and node type names.
-      $content_type_name = $group['type_name'] . ':' . $group['group_name'];
+        // Name the content type a combination of fieldgroup and node type names.
+        $content_type_name = $group['type_name'] . ':' . $group['group_name'];
 
-      // Assemble the information about the content type.
-      $info = array(
+        // Assemble the information about the content type.
+        $info = array(
         'category' => t('Node'),
         'icon' => 'icon_cck_field_group.png',
         'title' => t('Field group: @group in @type', array(
-          '@group' => t($group['label']),
-          '@type' => node_get_types('name', $group['type_name']),
+            '@group' => t($group['label']),
+            '@type' => node_get_types('name', $group['type_name']),
         )),
         'description' => t('All fields from this field group on the referenced node.'),
         'required context' => new ctools_context_required(t('Node'), 'node', array('type' => array($group['type_name']))),
-      );
+        );
 
-      $types[$content_type_name] = $info;
+        $types[$content_type_name] = $info;
+    }
     }
-  }
 
-  return $types;
+    return $types;
 }
 
 /**
  * Output function for the 'fieldgroup' content type.
  */
 function fieldgroup_content_fieldgroup_content_type_render($subtype, $conf, $panel_args, $context) {
-  if (!isset($context->data)) {
+    if (!isset($context->data)) {
     return;
-  }
-  $node = drupal_clone($context->data);
+    }
+    $node = drupal_clone($context->data);
 
-  // Make sure old data doesn't cause problems:
-  if (empty($conf['label'])) {
+    // Make sure old data doesn't cause problems:
+    if (empty($conf['label'])) {
     $conf['label'] = 'hidden';
-  }
-  if (empty($conf['format'])) {
+    }
+    if (empty($conf['format'])) {
     $conf['format'] = 'simple';
-  }
+    }
 
-  // Extract the node type and fieldgroup name from the subtype.
-  list($node_type, $group_name) = explode(':', $subtype, 2);
+    // Extract the node type and fieldgroup name from the subtype.
+    list($node_type, $group_name) = explode(':', $subtype, 2);
 
-  // Get a list of all fieldgroups for this node type.
-  $groups = fieldgroup_groups($node_type);
+    // Get a list of all fieldgroups for this node type.
+    $groups = fieldgroup_groups($node_type);
 
-  if (!isset($groups[$group_name])) {
+    if (!isset($groups[$group_name])) {
     return;
-  }
-  $group = $groups[$group_name];
-
-  // Render the field group.
-  $node->build_mode = NODE_BUILD_NORMAL;
-  $group['settings']['display']['label'] = $conf['label'] == 'normal' || !empty($conf['override_title']) ? 'hidden' : $conf['label'];
-  $group['settings']['display']['full']['format'] = $conf['format'];
-  $group['settings']['display']['full']['exclude'] = 0;
-  $output = fieldgroup_view_group($group, $node);
-
-  $block = new stdClass();
-  if ($conf['label'] == 'normal') {
+    }
+    $group = $groups[$group_name];
+
+    // Render the field group.
+    $node->build_mode = NODE_BUILD_NORMAL;
+    $group['settings']['display']['label'] = $conf['label'] == 'normal' || !empty($conf['override_title']) ? 'hidden' : $conf['label'];
+    $group['settings']['display']['full']['format'] = $conf['format'];
+    $group['settings']['display']['full']['exclude'] = 0;
+    $output = fieldgroup_view_group($group, $node);
+
+    $block = new stdClass();
+    if ($conf['label'] == 'normal') {
     $block->title = t($group['label']);
-  }
-  $block->content = !empty($output) ? $output : $conf['empty'];
-  return $block;
+    }
+    $block->content = !empty($output) ? $output : $conf['empty'];
+    return $block;
 }
 
 /**
  * Returns a settings form for the custom type.
  */
 function fieldgroup_content_fieldgroup_content_type_edit_form(&$form, &$form_state) {
-  $conf = $form_state['conf'];
+    $conf = $form_state['conf'];
 
-  $label_options = array(
+    $label_options = array(
     'normal' => t('Block title'),
     'above' => t('Above'),
-  );
-  $form['label'] = array(
+    );
+    $form['label'] = array(
     '#type' => 'select',
     '#title' => t('Field group label'),
     '#default_value' => !empty($conf['label']) && isset($label_options[$conf['label']]) ? $conf['label'] : 'hidden',
     '#options' => $label_options,
     '#description' => t('Configure how the field group label is going to be displayed. This option takes no effect when "Override title" option is enabled, the specified block title is displayed instead.'),
-  );
+    );
 
-  $format_options = array(
+    $format_options = array(
     'simple' => t('Simple'),
     'fieldset' => t('Fieldset'),
     'fieldset_collapsible' => t('Fieldset - Collapsible'),
     'fieldset_collapsed' => t('Fieldset - Collapsed'),
-  );
-  $form['format'] = array(
+    );
+    $form['format'] = array(
     '#type' => 'select',
     '#title' => t('Field group format'),
     '#default_value' => !empty($conf['format']) && isset($format_options[$conf['format']]) ? $conf['format'] : 'simple',
     '#options' => $format_options,
     '#description' => t('This option allows you to configure the field group format.'),
-  );
+    );
 
-  $form['empty'] = array(
+    $form['empty'] = array(
     '#type' => 'textarea',
     '#title' => t('Empty text'),
     '#description' => t('Text to display if group has no data. Note that title will not display unless overridden.'),
     '#rows' => 5,
     '#default_value' => $conf['empty'],
-  );
+    );
 }
 
 function fieldgroup_content_fieldgroup_content_type_edit_form_submit(&$form, &$form_state) {
-  // Copy everything from our defaults.
-  foreach (array_keys($form_state['plugin']['defaults']) as $key) {
+    // Copy everything from our defaults.
+    foreach (array_keys($form_state['plugin']['defaults']) as $key) {
     $form_state['conf'][$key] = $form_state['values'][$key];
-  }
+    }
 }
 
 /**
  * Admin title for fieldgroup content type.
  */
 function fieldgroup_content_fieldgroup_content_type_admin_title($subtype, $conf, $context) {
-  // Extract the node type and fieldgroup name from the subtype.
-  list($node_type, $group_name) = explode(':', $subtype, 2);
+    // Extract the node type and fieldgroup name from the subtype.
+    list($node_type, $group_name) = explode(':', $subtype, 2);
 
-  // Get information about this field group for this node type.
-  $groups = fieldgroup_groups($node_type);
-  $group = $groups[$group_name];
+    // Get information about this field group for this node type.
+    $groups = fieldgroup_groups($node_type);
+    $group = $groups[$group_name];
 
-  return t('"@s" field group: @group in @type', array(
+    return t('"@s" field group: @group in @type', array(
     '@s' => $context->identifier,
     '@group' => t($group['label']),
     '@type' => node_get_types('name', $node_type),
-  ));
+    ));
 }

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
       }
 
       // Name the content type a combination of fieldgroup and node type names.
-      $content_type_name = $group['type_name'] . ':' . $group['group_name'];
+      $content_type_name = $group['type_name'].':'.$group['group_name'];
 
       // Assemble the information about the content type.
       $info = array(

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

Indentation +366 added lines, -366 removed lines

@@ -16,230 +16,230 @@ 
  * Implementation of hook_init().
  */
 function fieldgroup_init() {
-  drupal_add_css(drupal_get_path('module', 'fieldgroup') .'/fieldgroup.css');
+    drupal_add_css(drupal_get_path('module', 'fieldgroup') .'/fieldgroup.css');
 }
 
 /**
  * Implementation of hook_ctools_plugin_directory().
  */
 function fieldgroup_ctools_plugin_directory($module, $plugin) {
-  if ($module == 'ctools' && $plugin == 'content_types') {
+    if ($module == 'ctools' && $plugin == 'content_types') {
     return 'panels/' . $plugin;
-  }
+    }
 }
 
 /**
  * Implementation of hook_menu().
  */
 function fieldgroup_menu() {
-  $items = array();
+    $items = array();
 
-  // Make sure this doesn't fire until content_types is working,
-  // needed to avoid errors on initial installation.
-  if (!defined('MAINTENANCE_MODE')) {
+    // Make sure this doesn't fire until content_types is working,
+    // needed to avoid errors on initial installation.
+    if (!defined('MAINTENANCE_MODE')) {
     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 .'/groups/%'] = 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 .'/groups/%'] = array(
         'title' => 'Edit group',
         'page callback' => 'drupal_get_form',
         'page arguments' => array('fieldgroup_group_edit_form', $type_name, 5),
         'access arguments' => array('administer content types'),
         'type' => MENU_CALLBACK,
-      );
-      $items['admin/content/node-type/'. $type_url_str .'/groups/%/remove'] = array(
+        );
+        $items['admin/content/node-type/'. $type_url_str .'/groups/%/remove'] = array(
         'title' => 'Edit group',
         'page callback' => 'drupal_get_form',
         'page arguments' => array('fieldgroup_remove_group', $type_name, 5),
         'access arguments' => array('administer content types'),
         'type' => MENU_CALLBACK,
-      );
+        );
     }
-  }
-  return $items;
+    }
+    return $items;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function fieldgroup_theme() {
-  return array(
+    return array(
     'fieldgroup_simple' => array(
-      'template' => 'fieldgroup-simple',
-      'arguments' => array('element' => NULL),
+        'template' => 'fieldgroup-simple',
+        'arguments' => array('element' => NULL),
     ),
     'fieldgroup_fieldset' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'fieldgroup_display_overview_form' => array(
-      'arguments' => array('form' => NULL),
+        'arguments' => array('form' => NULL),
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_elements().
  */
 function fieldgroup_elements() {
-  return array(
+    return array(
     'fieldgroup_simple' => array(),
     'fieldgroup_fieldset' => array('#collapsible' => FALSE, '#collapsed' => FALSE, '#value' => NULL,),
-  );
+    );
 }
 
 /**
  * Implementation of hook_fieldapi().
  */
 function fieldgroup_content_fieldapi($op, $field) {
-  switch ($op) {
+    switch ($op) {
     case 'delete instance':
       db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE field_name = '%s' AND type_name = '%s'", $field['field_name'], $field['type_name']);
-      cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
-      break;
-  }
+        cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
+        break;
+    }
 }
 
 function fieldgroup_group_edit_form(&$form_state, $type_name, $group_name) {
-  $content_type = content_types($type_name);
-  $groups = fieldgroup_groups($content_type['type']);
+    $content_type = content_types($type_name);
+    $groups = fieldgroup_groups($content_type['type']);
 
-  if (!$group = $groups[$group_name]) {
+    if (!$group = $groups[$group_name]) {
     drupal_not_found();
     exit;
-  }
+    }
 
-  $form['label'] = array(
+    $form['label'] = array(
     '#type' => 'textfield',
     '#title' => t('Label'),
     '#default_value' => $group['label'],
     '#required' => TRUE,
-  );
+    );
 
-  // Set a default value for group type early in the form so it
-  // can be overridden by subsequent form elements added by other modules.
-  $group_type = !empty($group['group_type']) ? $group['group_type'] : 'standard';
-  $form['group_type'] = array('#type' => 'hidden', '#default_value' => $group_type);
+    // Set a default value for group type early in the form so it
+    // can be overridden by subsequent form elements added by other modules.
+    $group_type = !empty($group['group_type']) ? $group['group_type'] : 'standard';
+    $form['group_type'] = array('#type' => 'hidden', '#default_value' => $group_type);
 
-  $form['settings']['#tree'] = TRUE;
-  $form['settings']['form'] = array(
+    $form['settings']['#tree'] = TRUE;
+    $form['settings']['form'] = array(
     '#type' => 'fieldset',
     '#title' => t('Form settings'),
     '#description' => t('These settings apply to the group in the node editing form.'),
-  );
-  $form['settings']['form']['style'] = array(
+    );
+    $form['settings']['form']['style'] = array(
     '#type' => 'radios',
     '#title' => t('Style'),
     '#default_value' => $group['settings']['form']['style'],
     '#options' => array(
-      'fieldset' => t('always open'),
-      'fieldset_collapsible' => t('collapsible'),
-      'fieldset_collapsed' => t('collapsed'),
+        'fieldset' => t('always open'),
+        'fieldset_collapsible' => t('collapsible'),
+        'fieldset_collapsed' => t('collapsed'),
     )
-  );
-  $form['settings']['form']['description'] = array(
+    );
+    $form['settings']['form']['description'] = array(
     '#type' => 'textarea',
     '#title' => t('Help text'),
     '#default_value' => $group['settings']['form']['description'],
     '#rows' => 5,
     '#description' => t('Instructions to present to the user on the editing form.'),
     '#required' => FALSE,
-  );
-  $form['settings']['display'] = array(
+    );
+    $form['settings']['display'] = array(
     '#type' => 'fieldset',
     '#title' => t('Display settings'),
     '#description' => t('These settings apply to the group on node display.'),
-  );
-  $form['settings']['display']['description'] = array(
+    );
+    $form['settings']['display']['description'] = array(
     '#type' => 'textarea',
     '#title' => t('Description'),
     '#default_value' => $group['settings']['display']['description'],
     '#rows' => 5,
     '#description' => t('A description of the group.'),
     '#required' => FALSE,
-  );
+    );
 
-  foreach (array_keys(content_build_modes()) as $key) {
+    foreach (array_keys(content_build_modes()) as $key) {
     $form['settings']['display'][$key]['format'] = array('#type' => 'value', '#value' => isset($group['settings']['display'][$key]['format']) ? $group['settings']['display'][$key]['format'] : 'fieldset');
     $form['settings']['display'][$key]['exclude'] = array('#type' => 'value', '#value' => isset($group['settings']['display'][$key]['exclude']) ? $group['settings']['display'][$key]['exclude'] : 0);
-  }
-  $form['settings']['display']['label'] = array('#type' => 'value', '#value' => $group['settings']['display']['label']);
-  $form['weight'] = array('#type' => 'hidden', '#default_value' => $group['weight']);
-  $form['group_name'] = array('#type' => 'hidden', '#default_value' => $group_name);
+    }
+    $form['settings']['display']['label'] = array('#type' => 'value', '#value' => $group['settings']['display']['label']);
+    $form['weight'] = array('#type' => 'hidden', '#default_value' => $group['weight']);
+    $form['group_name'] = array('#type' => 'hidden', '#default_value' => $group_name);
 
-  $form['#content_type'] = $content_type;
+    $form['#content_type'] = $content_type;
 
-  $form['submit'] = array(
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save'),
     '#weight' => 10,
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 function fieldgroup_group_edit_form_submit($form, &$form_state) {
-  $form_values = $form_state['values'];
-  $content_type = $form['#content_type'];
-  fieldgroup_save_group($content_type['type'], $form_values);
-  $form_state['redirect'] = 'admin/content/node-type/'. $content_type['url_str'] .'/fields';
+    $form_values = $form_state['values'];
+    $content_type = $form['#content_type'];
+    fieldgroup_save_group($content_type['type'], $form_values);
+    $form_state['redirect'] = 'admin/content/node-type/'. $content_type['url_str'] .'/fields';
 }
 
 function fieldgroup_remove_group(&$form_state, $type_name, $group_name) {
-  $content_type = content_types($type_name);
-  $groups = fieldgroup_groups($content_type['type']);
-  $group = isset($groups[$group_name]) ? $groups[$group_name] : '';
+    $content_type = content_types($type_name);
+    $groups = fieldgroup_groups($content_type['type']);
+    $group = isset($groups[$group_name]) ? $groups[$group_name] : '';
 
-  if (empty($group)) {
+    if (empty($group)) {
     drupal_not_found();
     exit;
-  }
+    }
 
-  $form['#submit'][] = 'fieldgroup_remove_group_submit';
-  $form['#content_type'] = $content_type;
-  $form['#group_name'] = $group_name;
+    $form['#submit'][] = 'fieldgroup_remove_group_submit';
+    $form['#content_type'] = $content_type;
+    $form['#group_name'] = $group_name;
 
-  return confirm_form($form,
-                  t('Are you sure you want to remove the group %label?',
-                  array('%label' => t($group['label']))),
-                  'admin/content/node-type/'. $content_type['url_str'] .'/fields', t('This action cannot be undone.'),
-                  t('Remove'), t('Cancel'));
+    return confirm_form($form,
+                    t('Are you sure you want to remove the group %label?',
+                    array('%label' => t($group['label']))),
+                    'admin/content/node-type/'. $content_type['url_str'] .'/fields', t('This action cannot be undone.'),
+                    t('Remove'), t('Cancel'));
 }
 
 function fieldgroup_remove_group_submit($form, &$form_state) {
-  $form_values = $form_state['values'];
-  $content_type = $form['#content_type'];
-  $group_name = $form['#group_name'];
-  fieldgroup_delete($content_type['type'], $group_name);
-  drupal_set_message(t('The group %group_name has been removed.', array('%group_name' => $group_name)));
-  $form_state['redirect'] = 'admin/content/node-type/'. $content_type['url_str'] .'/fields';
+    $form_values = $form_state['values'];
+    $content_type = $form['#content_type'];
+    $group_name = $form['#group_name'];
+    fieldgroup_delete($content_type['type'], $group_name);
+    drupal_set_message(t('The group %group_name has been removed.', array('%group_name' => $group_name)));
+    $form_state['redirect'] = 'admin/content/node-type/'. $content_type['url_str'] .'/fields';
 }
 
 /**
  * Returns all groups for a content type
  */
 function fieldgroup_groups($content_type = '', $sorted = FALSE, $reset = FALSE) {
-  global $language;
-  static $groups, $groups_sorted;
-  if (!isset($groups) || $reset) {
+    global $language;
+    static $groups, $groups_sorted;
+    if (!isset($groups) || $reset) {
     if ($cached = cache_get('fieldgroup_data:'. $language->language, content_cache_tablename())) {
-      $data = $cached->data;
-      $groups = $data['groups'];
-      $groups_sorted = $data['groups_sorted'];
+        $data = $cached->data;
+        $groups = $data['groups'];
+        $groups_sorted = $data['groups_sorted'];
     }
     else {
-      $result = db_query("SELECT * FROM {". fieldgroup_tablename() ."} ORDER BY weight, group_name");
-      $groups = array();
-      $groups_sorted = array();
-      while ($group = db_fetch_array($result)) {
+        $result = db_query("SELECT * FROM {". fieldgroup_tablename() ."} ORDER BY weight, group_name");
+        $groups = array();
+        $groups_sorted = array();
+        while ($group = db_fetch_array($result)) {
         $group['settings'] = unserialize($group['settings']);
         $group['fields'] = array();
 
         // Allow external modules to translate field group strings.
         $group_strings = array(
-          'label' => $group['label'],
-          'form_description' => $group['settings']['form']['description'],
-          'display_description' => $group['settings']['display']['description'],
+            'label' => $group['label'],
+            'form_description' => $group['settings']['form']['description'],
+            'display_description' => $group['settings']['display']['description'],
         );
         drupal_alter('content_fieldgroup_strings', $group_strings, $group['type_name'], $group['group_name']);
         $group['label'] = $group_strings['label'];
@@ -248,58 +248,58 @@ 
 
         $groups[$group['type_name']][$group['group_name']] = $group;
         $groups_sorted[$group['type_name']][] = &$groups[$group['type_name']][$group['group_name']];
-      }
-      //load fields
-      $result = db_query("SELECT nfi.*, ng.group_name FROM {". fieldgroup_tablename() ."} ng ".
- "INNER JOIN {". fieldgroup_fields_tablename() ."} ngf ON ngf.type_name = ng.type_name AND ngf.group_name = ng.group_name ".
- "INNER JOIN {". content_instance_tablename() ."} nfi ON nfi.field_name = ngf.field_name AND nfi.type_name = ngf.type_name ".
- "WHERE nfi.widget_active = 1 ORDER BY nfi.weight");
-      while ($field = db_fetch_array($result)) {
+        }
+        //load fields
+        $result = db_query("SELECT nfi.*, ng.group_name FROM {". fieldgroup_tablename() ."} ng ".
+    "INNER JOIN {". fieldgroup_fields_tablename() ."} ngf ON ngf.type_name = ng.type_name AND ngf.group_name = ng.group_name ".
+    "INNER JOIN {". content_instance_tablename() ."} nfi ON nfi.field_name = ngf.field_name AND nfi.type_name = ngf.type_name ".
+    "WHERE nfi.widget_active = 1 ORDER BY nfi.weight");
+        while ($field = db_fetch_array($result)) {
         // Allow external modules to translate field strings.
         $field_strings = array(
-          'widget_label' => $field['label'],
-          'widget_description' => $field['description'],
+            'widget_label' => $field['label'],
+            'widget_description' => $field['description'],
         );
         drupal_alter('content_field_strings', $field_strings, $field['type_name'], $field['field_name']);
         $field['label'] = $field_strings['widget_label'];
         $field['description'] = $field_strings['widget_description'];
 
         $groups[$field['type_name']][$field['group_name']]['fields'][$field['field_name']] = $field;
-      }
-      cache_set('fieldgroup_data:'. $language->language, array('groups' => $groups, 'groups_sorted' => $groups_sorted), content_cache_tablename());
+        }
+        cache_set('fieldgroup_data:'. $language->language, array('groups' => $groups, 'groups_sorted' => $groups_sorted), content_cache_tablename());
+    }
     }
-  }
-  if (empty($content_type)) {
+    if (empty($content_type)) {
     return $groups;
-  }
-  elseif (empty($groups) || empty($groups[$content_type])) {
+    }
+    elseif (empty($groups) || empty($groups[$content_type])) {
     return array();
-  }
-  return $sorted ? $groups_sorted[$content_type] : $groups[$content_type];
+    }
+    return $sorted ? $groups_sorted[$content_type] : $groups[$content_type];
 }
 
 
 function _fieldgroup_groups_label($content_type) {
-  $groups = fieldgroup_groups($content_type);
+    $groups = fieldgroup_groups($content_type);
 
-  $labels[''] = '<'. t('none') .'>';
-  foreach ($groups as $group_name => $group) {
+    $labels[''] = '<'. t('none') .'>';
+    foreach ($groups as $group_name => $group) {
     $labels[$group_name] = t($group['label']);
-  }
-  return $labels;
+    }
+    return $labels;
 }
 
 function _fieldgroup_field_get_group($content_type, $field_name) {
-  return db_result(db_query("SELECT group_name FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s' AND field_name = '%s'", $content_type, $field_name));
+    return db_result(db_query("SELECT group_name FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s' AND field_name = '%s'", $content_type, $field_name));
 }
 
 /**
  * Implementation of hook_form_alter()
  */
 function fieldgroup_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) {
     foreach (fieldgroup_groups($form['type']['#value']) as $group_name => $group) {
-      $form[$group_name] = array(
+        $form[$group_name] = array(
         '#type' => 'fieldset',
         '#title' => check_plain(t($group['label'])),
         '#collapsed' => $group['settings']['form']['style'] == 'fieldset_collapsed',
@@ -307,62 +307,62 @@ 
         '#weight' => $group['weight'],
         '#description' => content_filter_xss(t($group['settings']['form']['description'])),
         '#attributes' => array('class' => strtr($group['group_name'], '_', '-')),
-      );
+        );
 
-      $has_accessible_field = FALSE;
-      foreach ($group['fields'] as $field_name => $field) {
+        $has_accessible_field = FALSE;
+        foreach ($group['fields'] as $field_name => $field) {
         if (isset($form[$field_name])) {
-          $form[$group_name][$field_name] = $form[$field_name];
-          // Track whether this group has any accessible fields within it.
-          if (!isset($form[$field_name]['#access']) || $form[$field_name]['#access'] !== FALSE) {
+            $form[$group_name][$field_name] = $form[$field_name];
+            // Track whether this group has any accessible fields within it.
+            if (!isset($form[$field_name]['#access']) || $form[$field_name]['#access'] !== FALSE) {
             $has_accessible_field = TRUE;
-          }
-          unset($form[$field_name]);
+            }
+            unset($form[$field_name]);
+        }
         }
-      }
-      if (!empty($group['fields']) && !element_children($form[$group_name])) {
+        if (!empty($group['fields']) && !element_children($form[$group_name])) {
         //hide the fieldgroup, because the fields are hidden too
         unset($form[$group_name]);
-      }
+        }
 
-      if (!$has_accessible_field) {
+        if (!$has_accessible_field) {
         // Hide the fieldgroup, because the fields are inaccessible.
         $form[$group_name]['#access'] = FALSE;
-      }
+        }
 
-      // Allow other modules to alter the form.
-      // Can't use module_invoke_all because we want
-      // to be able to use a reference to $form and $form_state.
-      foreach (module_implements('fieldgroup_form') as $module) {
+        // Allow other modules to alter the form.
+        // Can't use module_invoke_all because we want
+        // to be able to use a reference to $form and $form_state.
+        foreach (module_implements('fieldgroup_form') as $module) {
         $function = $module .'_fieldgroup_form';
         $function($form, $form_state, $form_id, $group);
-      }
+        }
 
     }
 
-  }
-  // The group is only added here so it will appear in the export
-  // when using Content Copy.
-  elseif ($form_id == 'content_field_edit_form' && isset($form['widget'])) {
+    }
+    // The group is only added here so it will appear in the export
+    // when using Content Copy.
+    elseif ($form_id == 'content_field_edit_form' && isset($form['widget'])) {
     $content_type = content_types($form['type_name']['#value']);
     $form['widget']['group'] = array(
-      '#type' => 'value',
-      '#value' => _fieldgroup_field_get_group($content_type['type'], $form['field_name']['#value']),
+        '#type' => 'value',
+        '#value' => _fieldgroup_field_get_group($content_type['type'], $form['field_name']['#value']),
     );
-  }
-  elseif ($form_id == 'content_field_overview_form') {
+    }
+    elseif ($form_id == 'content_field_overview_form') {
     $form['#validate'][] = 'fieldgroup_field_overview_form_validate';
     $form['#submit'][] = 'fieldgroup_field_overview_form_submit';
-  }
-  elseif ($form_id == 'content_display_overview_form' && !empty($form['#groups'])) {
+    }
+    elseif ($form_id == 'content_display_overview_form' && !empty($form['#groups'])) {
     $form['#submit'][] = 'fieldgroup_display_overview_form_submit';
     if (!isset($form['submit'])) {
-      $form['submit'] = array('#type' => 'submit', '#value' => t('Save'), '#weight' => 10);
+        $form['submit'] = array('#type' => 'submit', '#value' => t('Save'), '#weight' => 10);
     }
-  }
-  elseif ($form_id == 'content_field_remove_form') {
+    }
+    elseif ($form_id == 'content_field_remove_form') {
     $form['#submit'][] = 'fieldgroup_field_remove_form_submit';
-  }
+    }
 }
 
 /**
@@ -371,185 +371,185 @@ 
  * Pulled into separate function to be re-usable.
  */
 function fieldgroup_validate_name($group, $type_name) {
-  $errors = array();
+    $errors = array();
 
-  // No label.
-  if (!$group['label']) {
+    // No label.
+    if (!$group['label']) {
     $errors['label'][] = t('You need to provide a label.');
-  }
+    }
 
-  // No group name.
-  if (!$group['group_name']) {
+    // No group name.
+    if (!$group['group_name']) {
     $errors['group_name'][] = t('You need to provide a group name.');
-  }
-  // Group name validation.
-  else {
+    }
+    // Group name validation.
+    else {
     $group_name = $group['group_name'];
     $group['group_type'] = !empty($group['group_type']) ? $group['group_type'] : 'standard';
 
     // Add the 'group_' prefix.
     if (substr($group_name, 0, 6) != 'group_') {
-      $group_name = 'group_'. $group_name;
+        $group_name = 'group_'. $group_name;
     }
 
     // Invalid field name.
     if (!preg_match('!^group_[a-z0-9_]+$!', $group_name)) {
-      $errors['group_name'][] = t('The group name %group_name is invalid. The name must include only lowercase unaccentuated letters, numbers, and underscores.', array('%group_name' => $group_name));
+        $errors['group_name'][] = t('The group name %group_name is invalid. The name must include only lowercase unaccentuated letters, numbers, and underscores.', array('%group_name' => $group_name));
     }
     if (strlen($group_name) > 32) {
-      $errors['group_name'][] = t('The group name %group_name is too long. The name is limited to 32 characters, including the \'group_\' prefix.', array('%group_name' => $group_name));
+        $errors['group_name'][] = t('The group name %group_name is too long. The name is limited to 32 characters, including the \'group_\' prefix.', array('%group_name' => $group_name));
     }
 
     // Group name already exists.
     $groups = fieldgroup_groups($type_name);
     if (isset($groups[$group_name])) {
-      $errors['group_name'][] = t('The group name %group_name already exists.', array('%group_name' => $group_name));
+        $errors['group_name'][] = t('The group name %group_name already exists.', array('%group_name' => $group_name));
     }
     if (empty($errors['group_name'])) {
-      $group['group_name'] = $group_name;
+        $group['group_name'] = $group_name;
+    }
     }
-  }
-  return array('group_name' => $group['group_name'], 'errors' => $errors);
+    return array('group_name' => $group['group_name'], 'errors' => $errors);
 }
 
 function fieldgroup_field_overview_form_validate($form, &$form_state) {
-  $form_values = $form_state['values'];
-  $group = $form_values['_add_new_group'];
+    $form_values = $form_state['values'];
+    $group = $form_values['_add_new_group'];
 
-  if (array_filter(array($group['label'], $group['group_name']))) {
+    if (array_filter(array($group['label'], $group['group_name']))) {
     $validation = fieldgroup_validate_name($group, $form['#type_name']);
     if (!empty($validation['errors'])) {
-      foreach ($validation['errors'] as $type => $messages) {
+        foreach ($validation['errors'] as $type => $messages) {
         foreach ($messages as $message) {
-          if ($type == 'label') {
+            if ($type == 'label') {
             form_set_error('_add_new_group][label', t('Add new group:') .' '. $message);
-          }
-          else {
+            }
+            else {
             form_set_error('_add_new_group][group_name', t('Add new group:') .' '. $message);
-          }
+            }
+        }
         }
-      }
     }
     $group_name = $validation['group_name'];
     form_set_value($form['_add_new_group']['group_name'], $group_name, $form_state);
-  }
-  else {
+    }
+    else {
     // Fail validation if attempt to nest fields under a new group without the
     // proper information. Not raising an error would cause the nested fields
     // to get weights the user doesn't expect.
 
     foreach ($form_values as $key => $values) {
-      if ($values['parent'] == '_add_new_group') {
+        if ($values['parent'] == '_add_new_group') {
         form_set_error('_add_new_group][label', t('Add new group: you need to provide a label.'));
         form_set_error('_add_new_group][group_name', t('Add new group: you need to provide a group name.'));
         break;
-      }
+        }
+    }
     }
-  }
 }
 
 function fieldgroup_field_overview_form_submit($form, &$form_state) {
-  $form_values = $form_state['values'];
-  $type_name = $form['#type_name'];
+    $form_values = $form_state['values'];
+    $type_name = $form['#type_name'];
 
-  // Create new group if needed.
-  if (!empty($form_values['_add_new_group']['label'])) {
+    // Create new group if needed.
+    if (!empty($form_values['_add_new_group']['label'])) {
     $group = $form_values['_add_new_group'];
     $group['settings'] = field_group_default_settings($group['group_type']);
     fieldgroup_save_group($type_name, $group);
     $new_group_name = $group['group_name'];
-  }
+    }
 
-  // Parse incoming rows.
-  $add_field_rows = array('_add_new_field', '_add_existing_field');
-  $field_rows = array_merge($form['#fields'], $add_field_rows);
-  foreach ($form_values as $key => $values) {
+    // Parse incoming rows.
+    $add_field_rows = array('_add_new_field', '_add_existing_field');
+    $field_rows = array_merge($form['#fields'], $add_field_rows);
+    foreach ($form_values as $key => $values) {
     // If 'field' row: update field parenting.
     if (in_array($key, $field_rows)) {
-      // If newly added fields were added to a group:
-      if (in_array($key, $add_field_rows)) {
+        // If newly added fields were added to a group:
+        if (in_array($key, $add_field_rows)) {
         // We replace the '_add_*_field' key with the actual name of
         // the field that got added.
         // content_field_overview_form_submit() placed those
         // in $form_state['fields_added'] for us.
         if (isset($form_state['fields_added'][$key])) {
-          $key = $form_state['fields_added'][$key];
+            $key = $form_state['fields_added'][$key];
         }
         else {
-          // No field was actually created : skip to next row.
-          continue;
+            // No field was actually created : skip to next row.
+            continue;
         }
-      }
-      // If the field was added to the newly created group, replace the
-      // '_add_new_group' value with the actual name of the group.
-      $parent = ($values['parent'] == '_add_new_group' && isset($new_group_name)) ? $new_group_name : $values['parent'];
-      // TODO: check the parent group does exist ?
-      fieldgroup_update_fields(array('field_name' => $key, 'group' => $parent, 'type_name' => $type_name));
+        }
+        // If the field was added to the newly created group, replace the
+        // '_add_new_group' value with the actual name of the group.
+        $parent = ($values['parent'] == '_add_new_group' && isset($new_group_name)) ? $new_group_name : $values['parent'];
+        // TODO: check the parent group does exist ?
+        fieldgroup_update_fields(array('field_name' => $key, 'group' => $parent, 'type_name' => $type_name));
     }
 
     // If 'group' row:  update groups weights
     // (possible newly created group has already been taken care of).
     elseif (in_array($key, $form['#groups'])) {
-      db_query("UPDATE {". fieldgroup_tablename() ."} SET weight = %d WHERE type_name = '%s' AND group_name = '%s'",
+        db_query("UPDATE {". fieldgroup_tablename() ."} SET weight = %d WHERE type_name = '%s' AND group_name = '%s'",
         $values['weight'], $type_name, $key);
     }
-  }
+    }
 
-  cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
+    cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
 }
 
 function field_group_default_settings($group_type) {
-  $settings = array(
+    $settings = array(
     'form' => array('style' => 'fieldset', 'description' => ''),
     'display' => array('description' => '', 'label' => 'above'),
-  );
-  module_load_include('inc', 'content', 'includes/content.admin');
-  foreach (array_keys(content_build_modes()) as $key) {
+    );
+    module_load_include('inc', 'content', 'includes/content.admin');
+    foreach (array_keys(content_build_modes()) as $key) {
     $settings['display'][$key]['format'] = 'fieldset';
     $settings['display'][$key]['exclude'] = 0;
-  }
-  // Allow other modules to add new default settings.
-  $settings = array_merge($settings, module_invoke_all('fieldgroup_default_settings', $group_type));
-  return $settings;
+    }
+    // Allow other modules to add new default settings.
+    $settings = array_merge($settings, module_invoke_all('fieldgroup_default_settings', $group_type));
+    return $settings;
 }
 
 function fieldgroup_display_overview_form_submit($form, &$form_state) {
-  $form_values = $form_state['values'];
-  $groups = fieldgroup_groups($form['#type_name']);
-  foreach ($form_values as $key => $values) {
+    $form_values = $form_state['values'];
+    $groups = fieldgroup_groups($form['#type_name']);
+    foreach ($form_values as $key => $values) {
     if (in_array($key, $form['#groups'])) {
-      $group = $groups[$key];
-      // We have some numeric keys here, so we can't use array_merge.
-      $group['settings']['display'] = $values + $group['settings']['display'];
-      fieldgroup_save_group($form['#type_name'], $group);
+        $group = $groups[$key];
+        // We have some numeric keys here, so we can't use array_merge.
+        $group['settings']['display'] = $values + $group['settings']['display'];
+        fieldgroup_save_group($form['#type_name'], $group);
+    }
     }
-  }
 }
 
 function fieldgroup_field_remove_form_submit($form, &$form_state) {
-  $form_values = $form_state['values'];
-  // TODO:
-  // - when a (non last) field is removed from a group, a 'ghost row' remains in the fields overview
-  // - when the last field is removed, the group disappears
-  // seems to be fixed when emptying the cache.
-  db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s' AND field_name = '%s'", $form_values['type_name'], $form_values['field_name']);
+    $form_values = $form_state['values'];
+    // TODO:
+    // - when a (non last) field is removed from a group, a 'ghost row' remains in the fields overview
+    // - when the last field is removed, the group disappears
+    // seems to be fixed when emptying the cache.
+    db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s' AND field_name = '%s'", $form_values['type_name'], $form_values['field_name']);
 }
 
 /**
  * Implementation of hook_nodeapi().
  */
 function fieldgroup_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
-  switch ($op) {
+    switch ($op) {
     case 'view':
       // Prevent against invalid 'nodes' built by broken 3rd party code.
       if (isset($node->type)) {
         // Build the node content element needed to render each fieldgroup.
         foreach (fieldgroup_groups($node->type) as $group) {
-          fieldgroup_build_content($group, $node, $teaser, $page);
+            fieldgroup_build_content($group, $node, $teaser, $page);
+        }
         }
-      }
-      break;
-  }
+        break;
+    }
 }
 
 /**
@@ -569,80 +569,80 @@ 
  * @see fieldgroup_view_group()
  */
 function fieldgroup_build_content($group, &$node, $teaser, $page) {
-  // 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;
-  }
+    }
 
-  $group_name = $group['group_name'];
+    $group_name = $group['group_name'];
 
-  // Do not include group labels when indexing content.
-  if ($context == NODE_BUILD_SEARCH_INDEX) {
+    // Do not include group labels when indexing content.
+    if ($context == NODE_BUILD_SEARCH_INDEX) {
     $group['settings']['display']['label'] = 'hidden';
-  }
-  $label = $group['settings']['display']['label'] == 'above';
-  $element = array(
+    }
+    $label = $group['settings']['display']['label'] == 'above';
+    $element = array(
     '#title' => $label ? check_plain(t($group['label'])) : '',
     '#description' => $label ? content_filter_xss(t($group['settings']['display']['description'])) : '',
-  );
-  $format = isset($group['settings']['display'][$context]['format']) ? $group['settings']['display'][$context]['format'] : 'fieldset';
+    );
+    $format = isset($group['settings']['display'][$context]['format']) ? $group['settings']['display'][$context]['format'] : 'fieldset';
 
-  switch ($format) {
+    switch ($format) {
     case 'simple':
       $element['#type'] = 'fieldgroup_simple';
-      $element['#group_name'] = $group_name;
-      $element['#node'] = $node;
-      break;
+        $element['#group_name'] = $group_name;
+        $element['#node'] = $node;
+        break;
     case 'hidden':
       $element['#access'] = FALSE;
-      break;
+        break;
     case 'fieldset_collapsed':
       $element['#collapsed'] = TRUE;
     case 'fieldset_collapsible':
       $element['#collapsible'] = TRUE;
     case 'fieldset':
       $element['#type'] = 'fieldgroup_fieldset';
-      $element['#attributes'] = array('class' => 'fieldgroup '. strtr($group['group_name'], '_', '-'));
-      break;
-  }
-  foreach ($group['fields'] as $field_name => $field) {
+        $element['#attributes'] = array('class' => 'fieldgroup '. strtr($group['group_name'], '_', '-'));
+        break;
+    }
+    foreach ($group['fields'] as $field_name => $field) {
     if (isset($node->content[$field_name])) {
-      $element[$field_name] = $node->content[$field_name];
+        $element[$field_name] = $node->content[$field_name];
+    }
     }
-  }
 
-  // Allow other modules to alter the group view.
-  // Can't use module_invoke_all because we want
-  // to be able to use a reference to $node and $element.
-  foreach (module_implements('fieldgroup_view') as $module) {
+    // Allow other modules to alter the group view.
+    // Can't use module_invoke_all because we want
+    // to be able to use a reference to $node and $element.
+    foreach (module_implements('fieldgroup_view') as $module) {
     $function = $module .'_fieldgroup_view';
     $function($node, $element, $group, $context);
-  }
+    }
 
-  // Unset the original field values now that we've moved them.
-  foreach ($group['fields'] as $field_name => $field) {
+    // Unset the original field values now that we've moved them.
+    foreach ($group['fields'] as $field_name => $field) {
     if (isset($node->content[$field_name])) {
-      unset($node->content[$field_name]);
+        unset($node->content[$field_name]);
+    }
     }
-  }
 
-  // The wrapper lets us get the themed output for the group
-  // to populate the $GROUP_NAME_rendered variable for node templates,
-  // and hide it from the $content variable if needed.
-  // See fieldgroup_preprocess_node(), theme_fieldgroup_wrapper().
-  $wrapper = array(
+    // The wrapper lets us get the themed output for the group
+    // to populate the $GROUP_NAME_rendered variable for node templates,
+    // and hide it from the $content variable if needed.
+    // See fieldgroup_preprocess_node(), theme_fieldgroup_wrapper().
+    $wrapper = array(
     'group' => $element,
     '#weight' => $group['weight'],
     '#post_render' => array('fieldgroup_wrapper_post_render'),
     '#group_name' => $group_name,
     '#type_name' => $node->type,
     '#context' => $context,
-  );
+    );
 
-  $node->content[$group_name] = $wrapper;
+    $node->content[$group_name] = $wrapper;
 }
 
 /**
@@ -674,64 +674,64 @@ 
  * @see content_view_field()
  */
 function fieldgroup_view_group($group, &$node, $teaser = FALSE, $page = FALSE) {
-  $group_name = $group['group_name'];
-  $field_types = _content_field_types();
+    $group_name = $group['group_name'];
+    $field_types = _content_field_types();
 
-  // Clone the node to prevent from altering the original.
-  $node_copy = drupal_clone($node);
+    // Clone the node to prevent from altering the original.
+    $node_copy = drupal_clone($node);
 
-  // Use 'full'/'teaser' if not specified otherwise.
-  $node_copy->build_mode = isset($node_copy->build_mode) ? $node_copy->build_mode : NODE_BUILD_NORMAL;
+    // Use 'full'/'teaser' if not specified otherwise.
+    $node_copy->build_mode = isset($node_copy->build_mode) ? $node_copy->build_mode : NODE_BUILD_NORMAL;
 
-  // Build the content element for individual fields in the field group.
-  if (!isset($node_copy->content)) {
+    // Build the content element for individual fields in the field group.
+    if (!isset($node_copy->content)) {
     $node_copy->content = array();
-  }
-  foreach (array_keys($group['fields']) as $field_name) {
+    }
+    foreach (array_keys($group['fields']) as $field_name) {
     $field = content_fields($field_name, $node_copy->type);
 
     if (isset($node_copy->{$field_name})) {
-      $items = $node_copy->{$field_name};
+        $items = $node_copy->{$field_name};
 
-      // One-field equivalent to _content_field_invoke('sanitize').
-      $module = $field_types[$field['type']]['module'];
-      $function = $module .'_field';
-      if (function_exists($function)) {
+        // One-field equivalent to _content_field_invoke('sanitize').
+        $module = $field_types[$field['type']]['module'];
+        $function = $module .'_field';
+        if (function_exists($function)) {
         $function('sanitize', $node_copy, $field, $items, $teaser, $page);
         $node_copy->{$field_name} = $items;
-      }
+        }
 
-      $field_view = content_field('view', $node_copy, $field, $items, $teaser, $page);
-      // content_field('view') adds a wrapper to handle variables and 'excluded'
-      // fields for node templates. We bypass it and get the actual field.
-      $node_copy->content[$field_name] = $field_view[$field_name];
+        $field_view = content_field('view', $node_copy, $field, $items, $teaser, $page);
+        // content_field('view') adds a wrapper to handle variables and 'excluded'
+        // fields for node templates. We bypass it and get the actual field.
+        $node_copy->content[$field_name] = $field_view[$field_name];
+    }
     }
-  }
 
-  // Build the content element of the field group itself.
-  fieldgroup_build_content($group, $node_copy, $teaser, $page);
+    // Build the content element of the field group itself.
+    fieldgroup_build_content($group, $node_copy, $teaser, $page);
 
-  // fieldgroup_build_content() adds a wrapper to handle variables and 'excluded'
-  // groups for node templates. We bypass it and render the actual field group.
-  $output = drupal_render($node_copy->content[$group_name]['group']);
+    // fieldgroup_build_content() adds a wrapper to handle variables and 'excluded'
+    // groups for node templates. We bypass it and render the actual field group.
+    $output = drupal_render($node_copy->content[$group_name]['group']);
 
-  return $output;
+    return $output;
 }
 
 /**
  * Hide specified fields from the $content variable in node templates.
  */
 function fieldgroup_wrapper_post_render($content, $element) {
-  $groups = fieldgroup_groups($element['#type_name']);
-  $group = $groups[$element['#group_name']];
+    $groups = fieldgroup_groups($element['#type_name']);
+    $group = $groups[$element['#group_name']];
 
-  // The display settings are not in quite the same place in the
-  // group and the field, so create the value the theme will expect.
-  $group['display_settings'] = $group['settings']['display'];
-  if (theme('content_exclude', $content, $group, $element['#context'])) {
+    // The display settings are not in quite the same place in the
+    // group and the field, so create the value the theme will expect.
+    $group['display_settings'] = $group['settings']['display'];
+    if (theme('content_exclude', $content, $group, $element['#context'])) {
     return '';
-  }
-  return $content;
+    }
+    return $content;
 }
 
 /*
@@ -740,12 +740,12 @@ 
  * @return The name of the group, or FALSE.
  */
 function fieldgroup_get_group($content_type, $field_name) {
-  foreach (fieldgroup_groups($content_type) as $group_name => $group) {
+    foreach (fieldgroup_groups($content_type) as $group_name => $group) {
     if (in_array($field_name, array_keys($group['fields']))) {
-      return $group_name;
+        return $group_name;
     }
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
@@ -753,37 +753,37 @@ 
  *  React to change in node types
  */
 function fieldgroup_node_type($op, $info) {
-  if ($op == 'update' && !empty($info->old_type) && $info->type != $info->old_type) {
+    if ($op == 'update' && !empty($info->old_type) && $info->type != $info->old_type) {
     // update the tables
     db_query("UPDATE {". fieldgroup_tablename() ."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
     db_query("UPDATE {". fieldgroup_fields_tablename() ."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
     cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
-  }
-  elseif ($op == 'delete') {
+    }
+    elseif ($op == 'delete') {
     db_query("DELETE FROM {". fieldgroup_tablename() ."} WHERE type_name = '%s'", $info->type);
     db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s'", $info->type);
-  }
+    }
 }
 
 function fieldgroup_types() {
-  $types = array('standard' => t('Standard group'));
-  // Allow other modules to add new group_types.
-  $types = array_merge($types, module_invoke_all('fieldgroup_types'));
-  return $types;
+    $types = array('standard' => t('Standard group'));
+    // Allow other modules to add new group_types.
+    $types = array_merge($types, module_invoke_all('fieldgroup_types'));
+    return $types;
 }
 
 function fieldgroup_tablename($version = NULL) {
-  if (is_null($version)) {
+    if (is_null($version)) {
     $version = variable_get('fieldgroup_schema_version', 0);
-  }
-  return $version < 6000 ? 'node_group' : 'content_group';
+    }
+    return $version < 6000 ? 'node_group' : 'content_group';
 }
 
 function fieldgroup_fields_tablename($version = NULL) {
-  if (is_null($version)) {
+    if (is_null($version)) {
     $version = variable_get('fieldgroup_schema_version', 0);
-  }
-  return $version < 6000 ? 'node_group_fields' : 'content_group_fields';
+    }
+    return $version < 6000 ? 'node_group_fields' : 'content_group_fields';
 }
 
 /**
@@ -796,51 +796,51 @@ 
  * Saves the given group for this content-type
  */
 function fieldgroup_save_group($type_name, $group) {
-  $groups = fieldgroup_groups($type_name);
+    $groups = fieldgroup_groups($type_name);
 
-  // Allow other modules to intervene when the group is saved.
-  foreach (module_implements('fieldgroup_save_group') as $module) {
+    // Allow other modules to intervene when the group is saved.
+    foreach (module_implements('fieldgroup_save_group') as $module) {
     $function = $module .'_fieldgroup_save_group';
     $function($group);
-  }
+    }
 
-  if (!isset($groups[$group['group_name']])) {
+    if (!isset($groups[$group['group_name']])) {
     // Accept group name from programmed submissions if valid.
     db_query("INSERT INTO {". fieldgroup_tablename() ."} (group_type, type_name, group_name, label, settings, weight)".
-      " VALUES ('%s', '%s', '%s', '%s', '%s', %d)", $group['group_type'], $type_name, $group['group_name'], $group['label'], serialize($group['settings']), $group['weight']);
+        " VALUES ('%s', '%s', '%s', '%s', '%s', %d)", $group['group_type'], $type_name, $group['group_name'], $group['label'], serialize($group['settings']), $group['weight']);
     cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
     return SAVED_NEW;
-  }
-  else {
+    }
+    else {
     db_query("UPDATE {". fieldgroup_tablename() ."} SET group_type = '%s', label = '%s', settings = '%s', weight = %d ".
-             "WHERE type_name = '%s' AND group_name = '%s'",
-             $group['group_type'], $group['label'], serialize($group['settings']), $group['weight'], $type_name, $group['group_name']);
+                "WHERE type_name = '%s' AND group_name = '%s'",
+                $group['group_type'], $group['label'], serialize($group['settings']), $group['weight'], $type_name, $group['group_name']);
     cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
     return SAVED_UPDATED;
-  }
+    }
 }
 
 function fieldgroup_update_fields($form_values) {
-  $default = _fieldgroup_field_get_group($form_values['type_name'], $form_values['field_name']);
+    $default = _fieldgroup_field_get_group($form_values['type_name'], $form_values['field_name']);
 
-  if ($default != $form_values['group']) {
+    if ($default != $form_values['group']) {
     if ($form_values['group'] && !$default) {
-      db_query("INSERT INTO {". fieldgroup_fields_tablename() ."} (type_name, group_name, field_name) VALUES ('%s', '%s', '%s')", $form_values['type_name'], $form_values['group'], $form_values['field_name']);
+        db_query("INSERT INTO {". fieldgroup_fields_tablename() ."} (type_name, group_name, field_name) VALUES ('%s', '%s', '%s')", $form_values['type_name'], $form_values['group'], $form_values['field_name']);
     }
     elseif ($form_values['group']) {
-      db_query("UPDATE {". fieldgroup_fields_tablename() ."} SET group_name = '%s' WHERE type_name = '%s' AND field_name = '%s'", $form_values['group'], $form_values['type_name'], $form_values['field_name']);
+        db_query("UPDATE {". fieldgroup_fields_tablename() ."} SET group_name = '%s' WHERE type_name = '%s' AND field_name = '%s'", $form_values['group'], $form_values['type_name'], $form_values['field_name']);
     }
     else {
-      db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s' AND field_name = '%s'", $form_values['type_name'], $form_values['field_name']);
+        db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s' AND field_name = '%s'", $form_values['type_name'], $form_values['field_name']);
     }
     cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
-  }
+    }
 }
 
 function fieldgroup_delete($content_type, $group_name) {
-  db_query("DELETE FROM {". fieldgroup_tablename() ."} WHERE  type_name = '%s' AND group_name = '%s'", $content_type, $group_name);
-  db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE  type_name = '%s' AND group_name = '%s'", $content_type, $group_name);
-  cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
+    db_query("DELETE FROM {". fieldgroup_tablename() ."} WHERE  type_name = '%s' AND group_name = '%s'", $content_type, $group_name);
+    db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE  type_name = '%s' AND group_name = '%s'", $content_type, $group_name);
+    cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
 }
 
 /**
@@ -849,23 +849,23 @@ 
  * Derived from core's theme_fieldset, with no output if the content is empty.
  */
 function theme_fieldgroup_fieldset($element) {
-  if (empty($element['#children']) && empty($element['#value'])) {
+    if (empty($element['#children']) && empty($element['#value'])) {
     return '';
-  }
+    }
 
-  if ($element['#collapsible']) {
+    if ($element['#collapsible']) {
     drupal_add_js('misc/collapse.js');
 
     if (!isset($element['#attributes']['class'])) {
-      $element['#attributes']['class'] = '';
+        $element['#attributes']['class'] = '';
     }
 
     $element['#attributes']['class'] .= ' collapsible';
     if ($element['#collapsed']) {
-      $element['#attributes']['class'] .= ' collapsed';
+        $element['#attributes']['class'] .= ' collapsed';
+    }
     }
-  }
-  return '<fieldset'. drupal_attributes($element['#attributes']) .'>'. ($element['#title'] ? '<legend>'. $element['#title'] .'</legend>' : '') . (isset($element['#description']) && $element['#description'] ? '<div class="description">'. $element['#description'] .'</div>' : '') . (!empty($element['#children']) ? $element['#children'] : '') . (isset($element['#value']) ? $element['#value'] : '') ."</fieldset>\n";
+    return '<fieldset'. drupal_attributes($element['#attributes']) .'>'. ($element['#title'] ? '<legend>'. $element['#title'] .'</legend>' : '') . (isset($element['#description']) && $element['#description'] ? '<div class="description">'. $element['#description'] .'</div>' : '') . (!empty($element['#children']) ? $element['#children'] : '') . (isset($element['#value']) ? $element['#value'] : '') ."</fieldset>\n";
 }
 
 
@@ -882,19 +882,19 @@ 
  * @see fieldgroup-simple.tpl.php
  */
 function template_preprocess_fieldgroup_simple(&$vars) {
-  $element = $vars['element'];
-
-  $vars['group_name'] = $element['#group_name'];
-  $vars['group_name_css'] = strtr($element['#group_name'], '_', '-');
-  $vars['label'] = isset($element['#title']) ? $element['#title'] : '';;
-  $vars['description'] = isset($element['#description']) ? $element['#description'] : '';;
-  $vars['content'] = isset($element['#children']) ? $element['#children'] : '';
-  $vars['template_files'] = array(
+    $element = $vars['element'];
+
+    $vars['group_name'] = $element['#group_name'];
+    $vars['group_name_css'] = strtr($element['#group_name'], '_', '-');
+    $vars['label'] = isset($element['#title']) ? $element['#title'] : '';;
+    $vars['description'] = isset($element['#description']) ? $element['#description'] : '';;
+    $vars['content'] = isset($element['#children']) ? $element['#children'] : '';
+    $vars['template_files'] = array(
     'fieldgroup-simple-',
     'fieldgroup-simple-'. $element['#group_name'],
     'fieldgroup-simple-'. $element['#node']->type,
     'fieldgroup-simple-'. $element['#group_name'] .'-'. $element['#node']->type,
-  );
+    );
 }
 
 /**
@@ -904,10 +904,10 @@ 
  * containing the themed output for the whole group.
  */
 function fieldgroup_preprocess_node(&$vars) {
-  $node = $vars['node'];
+    $node = $vars['node'];
 
-  foreach (fieldgroup_groups($node->type) as $group_name => $group) {
+    foreach (fieldgroup_groups($node->type) as $group_name => $group) {
     // '#chilren' might not be set if the group is empty.
     $vars[$group_name .'_rendered'] = isset($node->content[$group_name]['#children']) ? $node->content[$group_name]['#children'] : '';
-  }
+    }
 }

Switch Indentation +28 added lines, -28 removed lines

@@ -93,10 +93,10 @@ 
  */
 function fieldgroup_content_fieldapi($op, $field) {
   switch ($op) {
-    case 'delete instance':
-      db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE field_name = '%s' AND type_name = '%s'", $field['field_name'], $field['type_name']);
-      cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
-      break;
+  case 'delete instance':
+    db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE field_name = '%s' AND type_name = '%s'", $field['field_name'], $field['type_name']);
+    cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
+    break;
   }
 }
 
@@ -540,15 +540,15 @@ 
  */
 function fieldgroup_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
   switch ($op) {
-    case 'view':
-      // Prevent against invalid 'nodes' built by broken 3rd party code.
-      if (isset($node->type)) {
-        // Build the node content element needed to render each fieldgroup.
-        foreach (fieldgroup_groups($node->type) as $group) {
-          fieldgroup_build_content($group, $node, $teaser, $page);
-        }
+  case 'view':
+    // Prevent against invalid 'nodes' built by broken 3rd party code.
+    if (isset($node->type)) {
+      // Build the node content element needed to render each fieldgroup.
+      foreach (fieldgroup_groups($node->type) as $group) {
+        fieldgroup_build_content($group, $node, $teaser, $page);
       }
-      break;
+    }
+    break;
   }
 }
 
@@ -591,22 +591,22 @@ 
   $format = isset($group['settings']['display'][$context]['format']) ? $group['settings']['display'][$context]['format'] : 'fieldset';
 
   switch ($format) {
-    case 'simple':
-      $element['#type'] = 'fieldgroup_simple';
-      $element['#group_name'] = $group_name;
-      $element['#node'] = $node;
-      break;
-    case 'hidden':
-      $element['#access'] = FALSE;
-      break;
-    case 'fieldset_collapsed':
-      $element['#collapsed'] = TRUE;
-    case 'fieldset_collapsible':
-      $element['#collapsible'] = TRUE;
-    case 'fieldset':
-      $element['#type'] = 'fieldgroup_fieldset';
-      $element['#attributes'] = array('class' => 'fieldgroup '. strtr($group['group_name'], '_', '-'));
-      break;
+  case 'simple':
+    $element['#type'] = 'fieldgroup_simple';
+    $element['#group_name'] = $group_name;
+    $element['#node'] = $node;
+    break;
+  case 'hidden':
+    $element['#access'] = FALSE;
+    break;
+  case 'fieldset_collapsed':
+    $element['#collapsed'] = TRUE;
+  case 'fieldset_collapsible':
+    $element['#collapsible'] = TRUE;
+  case 'fieldset':
+    $element['#type'] = 'fieldgroup_fieldset';
+    $element['#attributes'] = array('class' => 'fieldgroup '. strtr($group['group_name'], '_', '-'));
+    break;
   }
   foreach ($group['fields'] as $field_name => $field) {
     if (isset($node->content[$field_name])) {

Spacing +45 added lines, -45 removed lines

@@ -16,7 +16,7 @@ 
  * Implementation of hook_init().
  */
 function fieldgroup_init() {
-  drupal_add_css(drupal_get_path('module', 'fieldgroup') .'/fieldgroup.css');
+  drupal_add_css(drupal_get_path('module', 'fieldgroup').'/fieldgroup.css');
 }
 
 /**
@@ -24,7 +24,7 @@ 
  */
 function fieldgroup_ctools_plugin_directory($module, $plugin) {
   if ($module == 'ctools' && $plugin == 'content_types') {
-    return 'panels/' . $plugin;
+    return 'panels/'.$plugin;
   }
 }
 
@@ -41,14 +41,14 @@ 
       $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 .'/groups/%'] = array(
+      $items['admin/content/node-type/'.$type_url_str.'/groups/%'] = array(
         'title' => 'Edit group',
         'page callback' => 'drupal_get_form',
         'page arguments' => array('fieldgroup_group_edit_form', $type_name, 5),
         'access arguments' => array('administer content types'),
         'type' => MENU_CALLBACK,
       );
-      $items['admin/content/node-type/'. $type_url_str .'/groups/%/remove'] = array(
+      $items['admin/content/node-type/'.$type_url_str.'/groups/%/remove'] = array(
         'title' => 'Edit group',
         'page callback' => 'drupal_get_form',
         'page arguments' => array('fieldgroup_remove_group', $type_name, 5),
@@ -94,7 +94,7 @@ 
 function fieldgroup_content_fieldapi($op, $field) {
   switch ($op) {
     case 'delete instance':
-      db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE field_name = '%s' AND type_name = '%s'", $field['field_name'], $field['type_name']);
+      db_query("DELETE FROM {".fieldgroup_fields_tablename()."} WHERE field_name = '%s' AND type_name = '%s'", $field['field_name'], $field['type_name']);
       cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
       break;
   }
@@ -182,7 +182,7 @@ 
   $form_values = $form_state['values'];
   $content_type = $form['#content_type'];
   fieldgroup_save_group($content_type['type'], $form_values);
-  $form_state['redirect'] = 'admin/content/node-type/'. $content_type['url_str'] .'/fields';
+  $form_state['redirect'] = 'admin/content/node-type/'.$content_type['url_str'].'/fields';
 }
 
 function fieldgroup_remove_group(&$form_state, $type_name, $group_name) {
@@ -202,7 +202,7 @@ 
   return confirm_form($form,
                   t('Are you sure you want to remove the group %label?',
                   array('%label' => t($group['label']))),
-                  'admin/content/node-type/'. $content_type['url_str'] .'/fields', t('This action cannot be undone.'),
+                  'admin/content/node-type/'.$content_type['url_str'].'/fields', t('This action cannot be undone.'),
                   t('Remove'), t('Cancel'));
 }
 
@@ -212,7 +212,7 @@ 
   $group_name = $form['#group_name'];
   fieldgroup_delete($content_type['type'], $group_name);
   drupal_set_message(t('The group %group_name has been removed.', array('%group_name' => $group_name)));
-  $form_state['redirect'] = 'admin/content/node-type/'. $content_type['url_str'] .'/fields';
+  $form_state['redirect'] = 'admin/content/node-type/'.$content_type['url_str'].'/fields';
 }
 
 /**
@@ -222,13 +222,13 @@ 
   global $language;
   static $groups, $groups_sorted;
   if (!isset($groups) || $reset) {
-    if ($cached = cache_get('fieldgroup_data:'. $language->language, content_cache_tablename())) {
+    if ($cached = cache_get('fieldgroup_data:'.$language->language, content_cache_tablename())) {
       $data = $cached->data;
       $groups = $data['groups'];
       $groups_sorted = $data['groups_sorted'];
     }
     else {
-      $result = db_query("SELECT * FROM {". fieldgroup_tablename() ."} ORDER BY weight, group_name");
+      $result = db_query("SELECT * FROM {".fieldgroup_tablename()."} ORDER BY weight, group_name");
       $groups = array();
       $groups_sorted = array();
       while ($group = db_fetch_array($result)) {
@@ -250,9 +250,9 @@ 
         $groups_sorted[$group['type_name']][] = &$groups[$group['type_name']][$group['group_name']];
       }
       //load fields
-      $result = db_query("SELECT nfi.*, ng.group_name FROM {". fieldgroup_tablename() ."} ng ".
- "INNER JOIN {". fieldgroup_fields_tablename() ."} ngf ON ngf.type_name = ng.type_name AND ngf.group_name = ng.group_name ".
- "INNER JOIN {". content_instance_tablename() ."} nfi ON nfi.field_name = ngf.field_name AND nfi.type_name = ngf.type_name ".
+      $result = db_query("SELECT nfi.*, ng.group_name FROM {".fieldgroup_tablename()."} ng ".
+ "INNER JOIN {".fieldgroup_fields_tablename()."} ngf ON ngf.type_name = ng.type_name AND ngf.group_name = ng.group_name ".
+ "INNER JOIN {".content_instance_tablename()."} nfi ON nfi.field_name = ngf.field_name AND nfi.type_name = ngf.type_name ".
  "WHERE nfi.widget_active = 1 ORDER BY nfi.weight");
       while ($field = db_fetch_array($result)) {
         // Allow external modules to translate field strings.
@@ -266,7 +266,7 @@ 
 
         $groups[$field['type_name']][$field['group_name']]['fields'][$field['field_name']] = $field;
       }
-      cache_set('fieldgroup_data:'. $language->language, array('groups' => $groups, 'groups_sorted' => $groups_sorted), content_cache_tablename());
+      cache_set('fieldgroup_data:'.$language->language, array('groups' => $groups, 'groups_sorted' => $groups_sorted), content_cache_tablename());
     }
   }
   if (empty($content_type)) {
@@ -282,7 +282,7 @@ 
 function _fieldgroup_groups_label($content_type) {
   $groups = fieldgroup_groups($content_type);
 
-  $labels[''] = '<'. t('none') .'>';
+  $labels[''] = '<'.t('none').'>';
   foreach ($groups as $group_name => $group) {
     $labels[$group_name] = t($group['label']);
   }
@@ -290,14 +290,14 @@ 
 }
 
 function _fieldgroup_field_get_group($content_type, $field_name) {
-  return db_result(db_query("SELECT group_name FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s' AND field_name = '%s'", $content_type, $field_name));
+  return db_result(db_query("SELECT group_name FROM {".fieldgroup_fields_tablename()."} WHERE type_name = '%s' AND field_name = '%s'", $content_type, $field_name));
 }
 
 /**
  * Implementation of hook_form_alter()
  */
 function fieldgroup_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) {
     foreach (fieldgroup_groups($form['type']['#value']) as $group_name => $group) {
       $form[$group_name] = array(
         '#type' => 'fieldset',
@@ -334,7 +334,7 @@ 
       // Can't use module_invoke_all because we want
       // to be able to use a reference to $form and $form_state.
       foreach (module_implements('fieldgroup_form') as $module) {
-        $function = $module .'_fieldgroup_form';
+        $function = $module.'_fieldgroup_form';
         $function($form, $form_state, $form_id, $group);
       }
 
@@ -389,7 +389,7 @@ 
 
     // Add the 'group_' prefix.
     if (substr($group_name, 0, 6) != 'group_') {
-      $group_name = 'group_'. $group_name;
+      $group_name = 'group_'.$group_name;
     }
 
     // Invalid field name.
@@ -422,10 +422,10 @@ 
       foreach ($validation['errors'] as $type => $messages) {
         foreach ($messages as $message) {
           if ($type == 'label') {
-            form_set_error('_add_new_group][label', t('Add new group:') .' '. $message);
+            form_set_error('_add_new_group][label', t('Add new group:').' '.$message);
           }
           else {
-            form_set_error('_add_new_group][group_name', t('Add new group:') .' '. $message);
+            form_set_error('_add_new_group][group_name', t('Add new group:').' '.$message);
           }
         }
       }
@@ -490,7 +490,7 @@ 
     // If 'group' row:  update groups weights
     // (possible newly created group has already been taken care of).
     elseif (in_array($key, $form['#groups'])) {
-      db_query("UPDATE {". fieldgroup_tablename() ."} SET weight = %d WHERE type_name = '%s' AND group_name = '%s'",
+      db_query("UPDATE {".fieldgroup_tablename()."} SET weight = %d WHERE type_name = '%s' AND group_name = '%s'",
         $values['weight'], $type_name, $key);
     }
   }
@@ -532,7 +532,7 @@ 
   // - when a (non last) field is removed from a group, a 'ghost row' remains in the fields overview
   // - when the last field is removed, the group disappears
   // seems to be fixed when emptying the cache.
-  db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s' AND field_name = '%s'", $form_values['type_name'], $form_values['field_name']);
+  db_query("DELETE FROM {".fieldgroup_fields_tablename()."} WHERE type_name = '%s' AND field_name = '%s'", $form_values['type_name'], $form_values['field_name']);
 }
 
 /**
@@ -605,7 +605,7 @@ 
       $element['#collapsible'] = TRUE;
     case 'fieldset':
       $element['#type'] = 'fieldgroup_fieldset';
-      $element['#attributes'] = array('class' => 'fieldgroup '. strtr($group['group_name'], '_', '-'));
+      $element['#attributes'] = array('class' => 'fieldgroup '.strtr($group['group_name'], '_', '-'));
       break;
   }
   foreach ($group['fields'] as $field_name => $field) {
@@ -618,7 +618,7 @@ 
   // Can't use module_invoke_all because we want
   // to be able to use a reference to $node and $element.
   foreach (module_implements('fieldgroup_view') as $module) {
-    $function = $module .'_fieldgroup_view';
+    $function = $module.'_fieldgroup_view';
     $function($node, $element, $group, $context);
   }
 
@@ -695,7 +695,7 @@ 
 
       // One-field equivalent to _content_field_invoke('sanitize').
       $module = $field_types[$field['type']]['module'];
-      $function = $module .'_field';
+      $function = $module.'_field';
       if (function_exists($function)) {
         $function('sanitize', $node_copy, $field, $items, $teaser, $page);
         $node_copy->{$field_name} = $items;
@@ -755,13 +755,13 @@ 
 function fieldgroup_node_type($op, $info) {
   if ($op == 'update' && !empty($info->old_type) && $info->type != $info->old_type) {
     // update the tables
-    db_query("UPDATE {". fieldgroup_tablename() ."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
-    db_query("UPDATE {". fieldgroup_fields_tablename() ."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
+    db_query("UPDATE {".fieldgroup_tablename()."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
+    db_query("UPDATE {".fieldgroup_fields_tablename()."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
     cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
   }
   elseif ($op == 'delete') {
-    db_query("DELETE FROM {". fieldgroup_tablename() ."} WHERE type_name = '%s'", $info->type);
-    db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s'", $info->type);
+    db_query("DELETE FROM {".fieldgroup_tablename()."} WHERE type_name = '%s'", $info->type);
+    db_query("DELETE FROM {".fieldgroup_fields_tablename()."} WHERE type_name = '%s'", $info->type);
   }
 }
 
@@ -800,19 +800,19 @@ 
 
   // Allow other modules to intervene when the group is saved.
   foreach (module_implements('fieldgroup_save_group') as $module) {
-    $function = $module .'_fieldgroup_save_group';
+    $function = $module.'_fieldgroup_save_group';
     $function($group);
   }
 
   if (!isset($groups[$group['group_name']])) {
     // Accept group name from programmed submissions if valid.
-    db_query("INSERT INTO {". fieldgroup_tablename() ."} (group_type, type_name, group_name, label, settings, weight)".
+    db_query("INSERT INTO {".fieldgroup_tablename()."} (group_type, type_name, group_name, label, settings, weight)".
       " VALUES ('%s', '%s', '%s', '%s', '%s', %d)", $group['group_type'], $type_name, $group['group_name'], $group['label'], serialize($group['settings']), $group['weight']);
     cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
     return SAVED_NEW;
   }
   else {
-    db_query("UPDATE {". fieldgroup_tablename() ."} SET group_type = '%s', label = '%s', settings = '%s', weight = %d ".
+    db_query("UPDATE {".fieldgroup_tablename()."} SET group_type = '%s', label = '%s', settings = '%s', weight = %d ".
              "WHERE type_name = '%s' AND group_name = '%s'",
              $group['group_type'], $group['label'], serialize($group['settings']), $group['weight'], $type_name, $group['group_name']);
     cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
@@ -825,21 +825,21 @@ 
 
   if ($default != $form_values['group']) {
     if ($form_values['group'] && !$default) {
-      db_query("INSERT INTO {". fieldgroup_fields_tablename() ."} (type_name, group_name, field_name) VALUES ('%s', '%s', '%s')", $form_values['type_name'], $form_values['group'], $form_values['field_name']);
+      db_query("INSERT INTO {".fieldgroup_fields_tablename()."} (type_name, group_name, field_name) VALUES ('%s', '%s', '%s')", $form_values['type_name'], $form_values['group'], $form_values['field_name']);
     }
     elseif ($form_values['group']) {
-      db_query("UPDATE {". fieldgroup_fields_tablename() ."} SET group_name = '%s' WHERE type_name = '%s' AND field_name = '%s'", $form_values['group'], $form_values['type_name'], $form_values['field_name']);
+      db_query("UPDATE {".fieldgroup_fields_tablename()."} SET group_name = '%s' WHERE type_name = '%s' AND field_name = '%s'", $form_values['group'], $form_values['type_name'], $form_values['field_name']);
     }
     else {
-      db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s' AND field_name = '%s'", $form_values['type_name'], $form_values['field_name']);
+      db_query("DELETE FROM {".fieldgroup_fields_tablename()."} WHERE type_name = '%s' AND field_name = '%s'", $form_values['type_name'], $form_values['field_name']);
     }
     cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
   }
 }
 
 function fieldgroup_delete($content_type, $group_name) {
-  db_query("DELETE FROM {". fieldgroup_tablename() ."} WHERE  type_name = '%s' AND group_name = '%s'", $content_type, $group_name);
-  db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE  type_name = '%s' AND group_name = '%s'", $content_type, $group_name);
+  db_query("DELETE FROM {".fieldgroup_tablename()."} WHERE  type_name = '%s' AND group_name = '%s'", $content_type, $group_name);
+  db_query("DELETE FROM {".fieldgroup_fields_tablename()."} WHERE  type_name = '%s' AND group_name = '%s'", $content_type, $group_name);
   cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
 }
 
@@ -865,7 +865,7 @@ 
       $element['#attributes']['class'] .= ' collapsed';
     }
   }
-  return '<fieldset'. drupal_attributes($element['#attributes']) .'>'. ($element['#title'] ? '<legend>'. $element['#title'] .'</legend>' : '') . (isset($element['#description']) && $element['#description'] ? '<div class="description">'. $element['#description'] .'</div>' : '') . (!empty($element['#children']) ? $element['#children'] : '') . (isset($element['#value']) ? $element['#value'] : '') ."</fieldset>\n";
+  return '<fieldset'.drupal_attributes($element['#attributes']).'>'.($element['#title'] ? '<legend>'.$element['#title'].'</legend>' : '').(isset($element['#description']) && $element['#description'] ? '<div class="description">'.$element['#description'].'</div>' : '').(!empty($element['#children']) ? $element['#children'] : '').(isset($element['#value']) ? $element['#value'] : '')."</fieldset>\n";
 }
 
 
@@ -886,14 +886,14 @@ 
 
   $vars['group_name'] = $element['#group_name'];
   $vars['group_name_css'] = strtr($element['#group_name'], '_', '-');
-  $vars['label'] = isset($element['#title']) ? $element['#title'] : '';;
-  $vars['description'] = isset($element['#description']) ? $element['#description'] : '';;
+  $vars['label'] = isset($element['#title']) ? $element['#title'] : ''; ;
+  $vars['description'] = isset($element['#description']) ? $element['#description'] : ''; ;
   $vars['content'] = isset($element['#children']) ? $element['#children'] : '';
   $vars['template_files'] = array(
     'fieldgroup-simple-',
-    'fieldgroup-simple-'. $element['#group_name'],
-    'fieldgroup-simple-'. $element['#node']->type,
-    'fieldgroup-simple-'. $element['#group_name'] .'-'. $element['#node']->type,
+    'fieldgroup-simple-'.$element['#group_name'],
+    'fieldgroup-simple-'.$element['#node']->type,
+    'fieldgroup-simple-'.$element['#group_name'].'-'.$element['#node']->type,
   );
 }
 
@@ -908,6 +908,6 @@ 
 
   foreach (fieldgroup_groups($node->type) as $group_name => $group) {
     // '#chilren' might not be set if the group is empty.
-    $vars[$group_name .'_rendered'] = isset($node->content[$group_name]['#children']) ? $node->content[$group_name]['#children'] : '';
+    $vars[$group_name.'_rendered'] = isset($node->content[$group_name]['#children']) ? $node->content[$group_name]['#children'] : '';
   }
 }

Braces +13 added lines, -26 removed lines

@@ -226,8 +226,7 @@ 
       $data = $cached->data;
       $groups = $data['groups'];
       $groups_sorted = $data['groups_sorted'];
-    }
-    else {
+    } else {
       $result = db_query("SELECT * FROM {". fieldgroup_tablename() ."} ORDER BY weight, group_name");
       $groups = array();
       $groups_sorted = array();
@@ -271,8 +270,7 @@ 
   }
   if (empty($content_type)) {
     return $groups;
-  }
-  elseif (empty($groups) || empty($groups[$content_type])) {
+  } elseif (empty($groups) || empty($groups[$content_type])) {
     return array();
   }
   return $sorted ? $groups_sorted[$content_type] : $groups[$content_type];
@@ -349,18 +347,15 @@ 
       '#type' => 'value',
       '#value' => _fieldgroup_field_get_group($content_type['type'], $form['field_name']['#value']),
     );
-  }
-  elseif ($form_id == 'content_field_overview_form') {
+  } elseif ($form_id == 'content_field_overview_form') {
     $form['#validate'][] = 'fieldgroup_field_overview_form_validate';
     $form['#submit'][] = 'fieldgroup_field_overview_form_submit';
-  }
-  elseif ($form_id == 'content_display_overview_form' && !empty($form['#groups'])) {
+  } elseif ($form_id == 'content_display_overview_form' && !empty($form['#groups'])) {
     $form['#submit'][] = 'fieldgroup_display_overview_form_submit';
     if (!isset($form['submit'])) {
       $form['submit'] = array('#type' => 'submit', '#value' => t('Save'), '#weight' => 10);
     }
-  }
-  elseif ($form_id == 'content_field_remove_form') {
+  } elseif ($form_id == 'content_field_remove_form') {
     $form['#submit'][] = 'fieldgroup_field_remove_form_submit';
   }
 }
@@ -423,8 +418,7 @@ 
         foreach ($messages as $message) {
           if ($type == 'label') {
             form_set_error('_add_new_group][label', t('Add new group:') .' '. $message);
-          }
-          else {
+          } else {
             form_set_error('_add_new_group][group_name', t('Add new group:') .' '. $message);
           }
         }
@@ -432,8 +426,7 @@ 
     }
     $group_name = $validation['group_name'];
     form_set_value($form['_add_new_group']['group_name'], $group_name, $form_state);
-  }
-  else {
+  } else {
     // Fail validation if attempt to nest fields under a new group without the
     // proper information. Not raising an error would cause the nested fields
     // to get weights the user doesn't expect.
@@ -474,8 +467,7 @@ 
         // in $form_state['fields_added'] for us.
         if (isset($form_state['fields_added'][$key])) {
           $key = $form_state['fields_added'][$key];
-        }
-        else {
+        } else {
           // No field was actually created : skip to next row.
           continue;
         }
@@ -572,8 +564,7 @@ 
   // 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;
   }
 
@@ -758,8 +749,7 @@ 
     db_query("UPDATE {". fieldgroup_tablename() ."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
     db_query("UPDATE {". fieldgroup_fields_tablename() ."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
     cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
-  }
-  elseif ($op == 'delete') {
+  } elseif ($op == 'delete') {
     db_query("DELETE FROM {". fieldgroup_tablename() ."} WHERE type_name = '%s'", $info->type);
     db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s'", $info->type);
   }
@@ -810,8 +800,7 @@ 
       " VALUES ('%s', '%s', '%s', '%s', '%s', %d)", $group['group_type'], $type_name, $group['group_name'], $group['label'], serialize($group['settings']), $group['weight']);
     cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
     return SAVED_NEW;
-  }
-  else {
+  } else {
     db_query("UPDATE {". fieldgroup_tablename() ."} SET group_type = '%s', label = '%s', settings = '%s', weight = %d ".
              "WHERE type_name = '%s' AND group_name = '%s'",
              $group['group_type'], $group['label'], serialize($group['settings']), $group['weight'], $type_name, $group['group_name']);
@@ -826,11 +815,9 @@ 
   if ($default != $form_values['group']) {
     if ($form_values['group'] && !$default) {
       db_query("INSERT INTO {". fieldgroup_fields_tablename() ."} (type_name, group_name, field_name) VALUES ('%s', '%s', '%s')", $form_values['type_name'], $form_values['group'], $form_values['field_name']);
-    }
-    elseif ($form_values['group']) {
+    } elseif ($form_values['group']) {
       db_query("UPDATE {". fieldgroup_fields_tablename() ."} SET group_name = '%s' WHERE type_name = '%s' AND field_name = '%s'", $form_values['group'], $form_values['type_name'], $form_values['field_name']);
-    }
-    else {
+    } else {
       db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s' AND field_name = '%s'", $form_values['type_name'], $form_values['field_name']);
     }
     cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);

Upper-Lower-Casing +28 added lines, -28 removed lines

@@ -67,13 +67,13 @@ 
   return array(
     'fieldgroup_simple' => array(
       'template' => 'fieldgroup-simple',
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
     'fieldgroup_fieldset' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
     'fieldgroup_display_overview_form' => array(
-      'arguments' => array('form' => NULL),
+      'arguments' => array('form' => null),
     ),
   );
 }
@@ -84,7 +84,7 @@ 
 function fieldgroup_elements() {
   return array(
     'fieldgroup_simple' => array(),
-    'fieldgroup_fieldset' => array('#collapsible' => FALSE, '#collapsed' => FALSE, '#value' => NULL,),
+    'fieldgroup_fieldset' => array('#collapsible' => false, '#collapsed' => false, '#value' => null,),
   );
 }
 
@@ -95,7 +95,7 @@ 
   switch ($op) {
     case 'delete instance':
       db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE field_name = '%s' AND type_name = '%s'", $field['field_name'], $field['type_name']);
-      cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
+      cache_clear_all('fieldgroup_data:', content_cache_tablename(), true);
       break;
   }
 }
@@ -113,7 +113,7 @@ 
     '#type' => 'textfield',
     '#title' => t('Label'),
     '#default_value' => $group['label'],
-    '#required' => TRUE,
+    '#required' => true,
   );
 
   // Set a default value for group type early in the form so it
@@ -121,7 +121,7 @@ 
   $group_type = !empty($group['group_type']) ? $group['group_type'] : 'standard';
   $form['group_type'] = array('#type' => 'hidden', '#default_value' => $group_type);
 
-  $form['settings']['#tree'] = TRUE;
+  $form['settings']['#tree'] = true;
   $form['settings']['form'] = array(
     '#type' => 'fieldset',
     '#title' => t('Form settings'),
@@ -143,7 +143,7 @@ 
     '#default_value' => $group['settings']['form']['description'],
     '#rows' => 5,
     '#description' => t('Instructions to present to the user on the editing form.'),
-    '#required' => FALSE,
+    '#required' => false,
   );
   $form['settings']['display'] = array(
     '#type' => 'fieldset',
@@ -156,7 +156,7 @@ 
     '#default_value' => $group['settings']['display']['description'],
     '#rows' => 5,
     '#description' => t('A description of the group.'),
-    '#required' => FALSE,
+    '#required' => false,
   );
 
   foreach (array_keys(content_build_modes()) as $key) {
@@ -218,7 +218,7 @@ 
 /**
  * Returns all groups for a content type
  */
-function fieldgroup_groups($content_type = '', $sorted = FALSE, $reset = FALSE) {
+function fieldgroup_groups($content_type = '', $sorted = false, $reset = false) {
   global $language;
   static $groups, $groups_sorted;
   if (!isset($groups) || $reset) {
@@ -309,13 +309,13 @@ 
         '#attributes' => array('class' => strtr($group['group_name'], '_', '-')),
       );
 
-      $has_accessible_field = FALSE;
+      $has_accessible_field = false;
       foreach ($group['fields'] as $field_name => $field) {
         if (isset($form[$field_name])) {
           $form[$group_name][$field_name] = $form[$field_name];
           // Track whether this group has any accessible fields within it.
-          if (!isset($form[$field_name]['#access']) || $form[$field_name]['#access'] !== FALSE) {
-            $has_accessible_field = TRUE;
+          if (!isset($form[$field_name]['#access']) || $form[$field_name]['#access'] !== false) {
+            $has_accessible_field = true;
           }
           unset($form[$field_name]);
         }
@@ -327,7 +327,7 @@ 
 
       if (!$has_accessible_field) {
         // Hide the fieldgroup, because the fields are inaccessible.
-        $form[$group_name]['#access'] = FALSE;
+        $form[$group_name]['#access'] = false;
       }
 
       // Allow other modules to alter the form.
@@ -495,7 +495,7 @@ 
     }
   }
 
-  cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
+  cache_clear_all('fieldgroup_data:', content_cache_tablename(), true);
 }
 
 function field_group_default_settings($group_type) {
@@ -538,7 +538,7 @@ 
 /**
  * Implementation of hook_nodeapi().
  */
-function fieldgroup_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
+function fieldgroup_nodeapi(&$node, $op, $teaser = null, $page = null) {
   switch ($op) {
     case 'view':
       // Prevent against invalid 'nodes' built by broken 3rd party code.
@@ -597,12 +597,12 @@ 
       $element['#node'] = $node;
       break;
     case 'hidden':
-      $element['#access'] = FALSE;
+      $element['#access'] = false;
       break;
     case 'fieldset_collapsed':
-      $element['#collapsed'] = TRUE;
+      $element['#collapsed'] = true;
     case 'fieldset_collapsible':
-      $element['#collapsible'] = TRUE;
+      $element['#collapsible'] = true;
     case 'fieldset':
       $element['#type'] = 'fieldgroup_fieldset';
       $element['#attributes'] = array('class' => 'fieldgroup '. strtr($group['group_name'], '_', '-'));
@@ -673,7 +673,7 @@ 
  *
  * @see content_view_field()
  */
-function fieldgroup_view_group($group, &$node, $teaser = FALSE, $page = FALSE) {
+function fieldgroup_view_group($group, &$node, $teaser = false, $page = false) {
   $group_name = $group['group_name'];
   $field_types = _content_field_types();
 
@@ -745,7 +745,7 @@ 
       return $group_name;
     }
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -757,7 +757,7 @@ 
     // update the tables
     db_query("UPDATE {". fieldgroup_tablename() ."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
     db_query("UPDATE {". fieldgroup_fields_tablename() ."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
-    cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
+    cache_clear_all('fieldgroup_data:', content_cache_tablename(), true);
   }
   elseif ($op == 'delete') {
     db_query("DELETE FROM {". fieldgroup_tablename() ."} WHERE type_name = '%s'", $info->type);
@@ -772,14 +772,14 @@ 
   return $types;
 }
 
-function fieldgroup_tablename($version = NULL) {
+function fieldgroup_tablename($version = null) {
   if (is_null($version)) {
     $version = variable_get('fieldgroup_schema_version', 0);
   }
   return $version < 6000 ? 'node_group' : 'content_group';
 }
 
-function fieldgroup_fields_tablename($version = NULL) {
+function fieldgroup_fields_tablename($version = null) {
   if (is_null($version)) {
     $version = variable_get('fieldgroup_schema_version', 0);
   }
@@ -808,14 +808,14 @@ 
     // Accept group name from programmed submissions if valid.
     db_query("INSERT INTO {". fieldgroup_tablename() ."} (group_type, type_name, group_name, label, settings, weight)".
       " VALUES ('%s', '%s', '%s', '%s', '%s', %d)", $group['group_type'], $type_name, $group['group_name'], $group['label'], serialize($group['settings']), $group['weight']);
-    cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
+    cache_clear_all('fieldgroup_data:', content_cache_tablename(), true);
     return SAVED_NEW;
   }
   else {
     db_query("UPDATE {". fieldgroup_tablename() ."} SET group_type = '%s', label = '%s', settings = '%s', weight = %d ".
              "WHERE type_name = '%s' AND group_name = '%s'",
              $group['group_type'], $group['label'], serialize($group['settings']), $group['weight'], $type_name, $group['group_name']);
-    cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
+    cache_clear_all('fieldgroup_data:', content_cache_tablename(), true);
     return SAVED_UPDATED;
   }
 }
@@ -833,14 +833,14 @@ 
     else {
       db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE type_name = '%s' AND field_name = '%s'", $form_values['type_name'], $form_values['field_name']);
     }
-    cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
+    cache_clear_all('fieldgroup_data:', content_cache_tablename(), true);
   }
 }
 
 function fieldgroup_delete($content_type, $group_name) {
   db_query("DELETE FROM {". fieldgroup_tablename() ."} WHERE  type_name = '%s' AND group_name = '%s'", $content_type, $group_name);
   db_query("DELETE FROM {". fieldgroup_fields_tablename() ."} WHERE  type_name = '%s' AND group_name = '%s'", $content_type, $group_name);
-  cache_clear_all('fieldgroup_data:', content_cache_tablename(), TRUE);
+  cache_clear_all('fieldgroup_data:', content_cache_tablename(), true);
 }
 
 /**

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

Indentation +15 added lines, -15 removed lines

@@ -10,37 +10,37 @@ 
  * Implementation of hook_rules_action_info().
  */
 function nodereference_rules_action_info() {
-  $info = array();
-  $info['nodereference_rules_action_load'] = array(
+    $info = array();
+    $info['nodereference_rules_action_load'] = array(
     'label' => t('Load a referenced node'),
     'arguments' => array(
-      'node' => array(
+        'node' => array(
         'type' => 'node',
         'label' => t('Content containing the node reference field'),
-      ),
+        ),
     ),
     'new variables' => array(
-      'referenced_node' => array(
+        'referenced_node' => array(
         'type' => 'node',
         'label' => t('Referenced content'),
-      ),
+        ),
     ),
     'module' => 'CCK',
     'help' => t('Note that if the field has multiple values, only the first content node will be loaded.'),
-  );
-  return $info;
+    );
+    return $info;
 }
 
 function nodereference_rules_action_load($node, $settings) {
-  if ($nid = $node->{$settings['field']}[0]['nid']) {
+    if ($nid = $node->{$settings['field']}[0]['nid']) {
     return array('referenced_node' => node_load(array('nid' => $nid)));
-  }
+    }
 }
 
 function nodereference_rules_action_load_form($settings, &$form) {
-  $settings += array('field' => '');
-  $options = content_rules_get_field_names_by_type('nodereference');
-  $form['settings']['field'] = array(
+    $settings += array('field' => '');
+    $options = content_rules_get_field_names_by_type('nodereference');
+    $form['settings']['field'] = array(
     '#type' => 'select',
     '#title' => t('Field'),
     '#default_value' => $settings['field'],
@@ -48,7 +48,7 @@ 
     '#required' => TRUE,
     '#disabled' => empty($options),
     '#description' => empty($options) ? t('There are no nodereference fields defined.') : '',
-  );
+    );
 }
 
 /**
@@ -56,5 +56,5 @@ 
  * "workflow_ng_action_load_referenced_node" to the equivalent rules action.
  */
 function workflow_ng_action_load_referenced_node_upgrade(&$element) {
-  $element['#name'] = 'nodereference_rules_action_load';
+    $element['#name'] = 'nodereference_rules_action_load';
 }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     '#title' => t('Field'),
     '#default_value' => $settings['field'],
     '#options' => $options,
-    '#required' => TRUE,
+    '#required' => true,
     '#disabled' => empty($options),
     '#description' => empty($options) ? t('There are no nodereference fields defined.') : '',
   );

drupal/sites/default/boinc/modules/contrib/cck/modules/nodereference/panels/relationships/node_from_noderef.inc

Indentation +22 added lines, -22 removed lines

@@ -10,7 +10,7 @@ 
  * Implementation of hook_ctools_relationships().
  */
 function nodereference_node_from_noderef_ctools_relationships() {
-  return array(
+    return array(
     'title' => t('Node from reference'),
     'keyword' => 'nodereference',
     'description' => t('Adds a node from a node reference in a node context; if multiple nodes are referenced, this will get the first referenced node only.'),
@@ -18,59 +18,59 @@ 
     'context' => 'nodereference_node_from_noderef_context',
     'settings form' => 'nodereference_node_from_noderef_settings_form',
     'settings form validate' => 'nodereference_node_from_noderef_settings_form_validate',
-  );
+    );
 }
 
 /**
  * Return a new ctools context based on an existing context.
  */
 function nodereference_node_from_noderef_context($context, $conf) {
-  $field = content_fields($conf['field_name']);
+    $field = content_fields($conf['field_name']);
 
-  // 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)) {
     $new_context = ctools_context_create_empty('node', NULL);
-  }
-  else if (isset($context->data->{$conf['field_name']}[0]['nid']) && ($nid = $context->data->{$conf['field_name']}[0]['nid'])) {
+    }
+    else if (isset($context->data->{$conf['field_name']}[0]['nid']) && ($nid = $context->data->{$conf['field_name']}[0]['nid'])) {
     if ($node = node_load($nid)) {
-      $new_context = ctools_context_create('node', $node);
+        $new_context = ctools_context_create('node', $node);
+    }
     }
-  }
 
-  if (!empty($new_context)) {
+    if (!empty($new_context)) {
     // Have nodereference relationships limit CCK field availability as well.
     $restrictions = array_keys(array_filter($field['referenceable_types']));
     if ($restrictions) {
-      if (isset($new_context->restrictions['type'])) {
+        if (isset($new_context->restrictions['type'])) {
         $new_context->restrictions['type'] = array_unique(array_merge($new_context->restrictions['type'], $restrictions));
-      }
-      else {
+        }
+        else {
         $new_context->restrictions['type'] = $restrictions;
-      }
+        }
     }
 
     return $new_context;
-  }
+    }
 }
 
 /**
  * Settings form for the ctools relationship.
  */
 function nodereference_node_from_noderef_settings_form($conf) {
-  $options = array();
-  foreach (content_fields() as $field) {
+    $options = array();
+    foreach (content_fields() as $field) {
     if ($field['type'] == 'nodereference') {
-      $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('Node 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;
 }

Braces +2 added lines, -4 removed lines

@@ -30,8 +30,7 @@ 
   // If unset it wants a generic, unfilled context, which is just NULL.
   if (empty($context->data)) {
     $new_context = ctools_context_create_empty('node', NULL);
-  }
-  else if (isset($context->data->{$conf['field_name']}[0]['nid']) && ($nid = $context->data->{$conf['field_name']}[0]['nid'])) {
+  } else if (isset($context->data->{$conf['field_name']}[0]['nid']) && ($nid = $context->data->{$conf['field_name']}[0]['nid'])) {
     if ($node = node_load($nid)) {
       $new_context = ctools_context_create('node', $node);
     }
@@ -43,8 +42,7 @@ 
     if ($restrictions) {
       if (isset($new_context->restrictions['type'])) {
         $new_context->restrictions['type'] = array_unique(array_merge($new_context->restrictions['type'], $restrictions));
-      }
-      else {
+      } else {
         $new_context->restrictions['type'] = $restrictions;
       }
     }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
   // If unset it wants a generic, unfilled context, which is just NULL.
   if (empty($context->data)) {
-    $new_context = ctools_context_create_empty('node', NULL);
+    $new_context = ctools_context_create_empty('node', null);
   }
   else if (isset($context->data->{$conf['field_name']}[0]['nid']) && ($nid = $context->data->{$conf['field_name']}[0]['nid'])) {
     if ($node = node_load($nid)) {

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

Indentation +204 added lines, -204 removed lines

@@ -10,7 +10,7 @@ 
  * Implementation of hook_theme().
  */
 function number_theme() {
-  return array(
+    return array(
     'number' => array('arguments' => array('element' => NULL)),
     'number_formatter_default' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
     'number_formatter_us_0' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
@@ -23,156 +23,156 @@ 
     'number_formatter_fr_1' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
     'number_formatter_fr_2' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
     'number_formatter_unformatted' => array('arguments' => array('element' => NULL)),
-  );
+    );
 }
 
 /**
  * Implementation of hook_field_info().
  */
 function number_field_info() {
-  return array(
+    return array(
     'number_integer' => array(
-      'label' => t('Integer'),
-      'description' => t('Store a number in the database as an integer.'),
+        'label' => t('Integer'),
+        'description' => t('Store a number in the database as an integer.'),
 //      'content_icon' => 'icon_content_number.png',
     ),
     'number_decimal' => array(
-      'label' => t('Decimal'),
-      'description' => t('Store a number in the database in a fixed decimal format.'),
+        'label' => t('Decimal'),
+        'description' => t('Store a number in the database in a fixed decimal format.'),
 //      'content_icon' => 'icon_content_number.png',
     ),
     'number_float' => array(
-      'label' => t('Float'),
-      'description' => t('Store a number in the database in a floating point format.'),
+        'label' => t('Float'),
+        'description' => t('Store a number in the database in a floating point format.'),
 //      'content_icon' => 'icon_content_number.png',
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_field_settings().
  */
 function number_field_settings($op, $field) {
-  switch ($op) {
+    switch ($op) {
     case 'form':
       $form = array();
-      $form['min'] = array(
+        $form['min'] = array(
         '#type' => 'textfield',
         '#title' => t('Minimum'),
         '#element_validate' => array('_element_validate_number'),
         '#default_value' => is_numeric($field['min']) ? $field['min'] : '',
-      );
-      $form['max'] = array(
+        );
+        $form['max'] = array(
         '#type' => 'textfield',
         '#title' => t('Maximum'),
         '#element_validate' => array('_element_validate_number'),
         '#default_value' => is_numeric($field['max']) ? $field['max'] : '',
-      );
-      if ($field['type'] == 'number_decimal') {
+        );
+        if ($field['type'] == 'number_decimal') {
         $form['precision'] = array(
-          '#type' => 'select',
-          '#options' => drupal_map_assoc(range(10, 32)),
-          '#title' => t('Precision'),
-          '#description' => t('The total number of digits to store in the database, including those to the right of the decimal.'),
-          '#default_value' => is_numeric($field['precision']) ? $field['precision'] : 10,
+            '#type' => 'select',
+            '#options' => drupal_map_assoc(range(10, 32)),
+            '#title' => t('Precision'),
+            '#description' => t('The total number of digits to store in the database, including those to the right of the decimal.'),
+            '#default_value' => is_numeric($field['precision']) ? $field['precision'] : 10,
         );
         $form['scale'] = array(
-          '#type' => 'select',
-          '#options' => drupal_map_assoc(range(0, 10)),
-          '#title' => t('Scale'),
-          '#description' => t('The number of digits to the right of the decimal.'),
-          '#default_value' => is_numeric($field['scale']) ? $field['scale'] : 2,
+            '#type' => 'select',
+            '#options' => drupal_map_assoc(range(0, 10)),
+            '#title' => t('Scale'),
+            '#description' => t('The number of digits to the right of the decimal.'),
+            '#default_value' => is_numeric($field['scale']) ? $field['scale'] : 2,
         );
         $form['decimal'] = array(
-          '#type' => 'select',
-          '#options' => array('.' => 'decimal point', ',' => 'comma', ' ' => 'space'),
-          '#title' => t('Decimal marker'),
-          '#description' => t('The character users will input to mark the decimal point in forms.'),
-          '#default_value' => !empty($field['decimal']) ? $field['decimal'] : '.',
+            '#type' => 'select',
+            '#options' => array('.' => 'decimal point', ',' => 'comma', ' ' => 'space'),
+            '#title' => t('Decimal marker'),
+            '#description' => t('The character users will input to mark the decimal point in forms.'),
+            '#default_value' => !empty($field['decimal']) ? $field['decimal'] : '.',
         );
-      }
-      $form['append']['prefix'] = array(
+        }
+        $form['append']['prefix'] = array(
         '#type' => 'textfield',
         '#title' => t('Prefix'),
         '#size' => 60,
         '#default_value' => !empty($field['prefix']) ? $field['prefix'] : '',
         '#description' => t('Define a string that should be prefixed to the value, like $ or €. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).'),
-      );
-      $form['append']['suffix'] = array(
+        );
+        $form['append']['suffix'] = array(
         '#type' => 'textfield',
         '#title' => t('Suffix'),
         '#size' => 60,
         '#default_value' => !empty($field['suffix']) ? $field['suffix'] : '',
         '#description' => t('Define a string that should suffixed to the value, like m², m/s², kb/s. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).'),
-      );
-      $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':
       $values = array('prefix', 'suffix', 'min', 'max', 'allowed_values', 'allowed_values_php');
-      if ($field['type'] == 'number_decimal') {
+        if ($field['type'] == 'number_decimal') {
         $values = array_merge($values, array('precision', 'scale', 'decimal'));
-      }
-      return $values;
+        }
+        return $values;
 
     case 'database columns':
       if ($field['type'] == 'number_integer') {
         return array(
-          'value' => array('type' => 'int', 'not null' => FALSE, 'sortable' => TRUE),
+            'value' => array('type' => 'int', 'not null' => FALSE, 'sortable' => TRUE),
         );
-      }
-      if ($field['type'] == 'number_float') {
+        }
+        if ($field['type'] == 'number_float') {
         return array(
-          'value' => array('type' => 'float', 'not null' => FALSE, 'sortable' => TRUE),
+            'value' => array('type' => 'float', 'not null' => FALSE, 'sortable' => TRUE),
         );
-      }
-      if ($field['type'] == 'number_decimal') {
+        }
+        if ($field['type'] == 'number_decimal') {
         $precision = isset($field['precision']) ? $field['precision'] : 10;
         $scale = isset($field['scale']) ? $field['scale'] : 2;
         return array(
-          'value' => array('type' => 'numeric', 'precision' => $precision, 'scale' => $scale, 'not null' => FALSE, 'sortable' => TRUE),
+            'value' => array('type' => 'numeric', 'precision' => $precision, 'scale' => $scale, 'not null' => FALSE, 'sortable' => TRUE),
         );
-      }
+        }
 
     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);
@@ -188,79 +188,79 @@ 
         $data[$table_alias][$field['field_name'] .'_value']['argument']['handler'] = 'content_handler_argument_many_to_one';
         $data[$table_alias][$field['field_name'] .'_value']['argument']['numeric'] = TRUE;
         return $data;
-      }
-      break;
-  }
+        }
+        break;
+    }
 }
 
 function _number_widget_settings_min_validate($element, &$form_state) {
-  $value = $form_state['values']['min'];
-  if ($value && !is_numeric($value)) {
+    $value = $form_state['values']['min'];
+    if ($value && !is_numeric($value)) {
     form_set_error('min', t('"Minimum" must be a number.'));
-  }
+    }
 }
 
 function _number_widget_settings_max_validate($element, &$form_state) {
-  $value = $form_state['values']['max'];
-  if ($value && !is_numeric($value)) {
+    $value = $form_state['values']['max'];
+    if ($value && !is_numeric($value)) {
     form_set_error('max', t('"Maximum" must be a number.'));
-  }
+    }
 }
 
 /**
  * Implementation of hook_field().
  */
 function number_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 ($item['value'] != '') {
+            $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
+            if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
+            if ($item['value'] != '') {
             if (is_numeric($field['min']) && $item['value'] < $field['min']) {
-              form_set_error($error_element, t('%name: the value may be no smaller than %min.', array('%name' => t($field['widget']['label']), '%min' => $field['min'])));
+                form_set_error($error_element, t('%name: the value may be no smaller than %min.', array('%name' => t($field['widget']['label']), '%min' => $field['min'])));
             }
             if (is_numeric($field['max']) && $item['value'] > $field['max']) {
-              form_set_error($error_element, t('%name: the value may be no larger than %max.', array('%name' => t($field['widget']['label']), '%max' => $field['max'])));
+                form_set_error($error_element, t('%name: the value may be no larger than %max.', array('%name' => t($field['widget']['label']), '%max' => $field['max'])));
             }
             if (count($allowed_values)) {
-              // We cannot use array_key_exists() because allowed values are
-              // stored as strings, and we need to compare numeric equality.
-              $valid = FALSE;
-              foreach ($allowed_values as $kay => $value) {
+                // We cannot use array_key_exists() because allowed values are
+                // stored as strings, and we need to compare numeric equality.
+                $valid = FALSE;
+                foreach ($allowed_values as $kay => $value) {
                 if ((float) $item['value'] == (float) $kay) {
-                  $valid = TRUE;
-                  break;
+                    $valid = TRUE;
+                    break;
                 }
-              }
-              if (!$valid) {
+                }
+                if (!$valid) {
                 form_set_error($error_element, t('%name: illegal value.', array('%name' => t($field['widget']['label']))));
-              }
+                }
+            }
             }
-          }
         }
-      }
-      return $items;
-  }
+        }
+        return $items;
+    }
 }
 
 /**
  * Implementation of hook_content_is_empty().
  */
 function number_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 number_field_formatter_info() {
-  return array(
+    return array(
     'default' => array('label' => '9999',            'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
     'us_0'    => array('label' => '9,999',           'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
     'us_1'    => array('label' => '9,999.9',         'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
@@ -272,72 +272,72 @@ 
     'fr_1'    => array('label' => '9 999, 9',        'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
     'fr_2'    => array('label' => '9 999, 99',       'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
     'unformatted' => array('label' => t('unformatted'), 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
-  );
+    );
 }
 
 /**
  * Proxy theme function for 'unformatted' number field formatter.
  */
 function theme_number_formatter_unformatted($element) {
-  return $element['#item']['value'];
+    return $element['#item']['value'];
 }
 
 /**
  * Proxy theme function for number field formatters.
  */
 function theme_number_formatter_generic($element) {
-  $field = content_fields($element['#field_name'], $element['#type_name']);
-  $value = $element['#item']['value'];
+    $field = content_fields($element['#field_name'], $element['#type_name']);
+    $value = $element['#item']['value'];
 
-  if (($allowed_values = content_allowed_values($field))) {
+    if (($allowed_values = content_allowed_values($field))) {
     if (isset($allowed_values[$value]) && $allowed_values[$value] != $value) {
-      return $allowed_values[$value];
+        return $allowed_values[$value];
+    }
     }
-  }
 
-  if (empty($value) && $value !== '0') {
+    if (empty($value) && $value !== '0') {
     return '';
-  }
+    }
 
-  switch ($element['#formatter']) {
+    switch ($element['#formatter']) {
     case 'us_0':
       $output = number_format($value, 0, '.', ',');
-      break;
+        break;
     case 'us_1':
       $output = number_format($value, 1, '.', ',');
-      break;
+        break;
     case 'us_2':
       $output = number_format($value, 2, '.', ',');
-      break;
+        break;
     case 'be_0':
       $output = number_format($value, 0, ',', '.');
-      break;
+        break;
     case 'be_1':
       $output = number_format($value, 1, ',', '.');
-      break;
+        break;
     case 'be_2':
       $output = number_format($value, 2, ',', '.');
-      break;
+        break;
     case 'fr_0':
       $output = number_format($value, 0, ', ', ' ');
-      break;
+        break;
     case 'fr_1':
       $output = number_format($value, 1, ', ', ' ');
-      break;
+        break;
     case 'fr_2':
       $output = number_format($value, 2, ', ', ' ');
-      break;
+        break;
     default:
       $output = $value;
-      break;
-  }
+        break;
+    }
 
-  $prefixes = isset($field['prefix']) ? array_map('content_filter_xss', explode('|', $field['prefix'])) : array('');
-  $suffixes = isset($field['suffix']) ? array_map('content_filter_xss', explode('|', $field['suffix'])) : array('');
-  $prefix = (count($prefixes) > 1) ? format_plural($value, $prefixes[0], $prefixes[1]) : $prefixes[0];
-  $suffix = (count($suffixes) > 1) ? format_plural($value, $suffixes[0], $suffixes[1]) : $suffixes[0];
+    $prefixes = isset($field['prefix']) ? array_map('content_filter_xss', explode('|', $field['prefix'])) : array('');
+    $suffixes = isset($field['suffix']) ? array_map('content_filter_xss', explode('|', $field['suffix'])) : array('');
+    $prefix = (count($prefixes) > 1) ? format_plural($value, $prefixes[0], $prefixes[1]) : $prefixes[0];
+    $suffix = (count($suffixes) > 1) ? format_plural($value, $suffixes[0], $suffixes[1]) : $suffixes[0];
 
-  return $prefix . $output . $suffix;
+    return $prefix . $output . $suffix;
 }
 
 /**
@@ -352,16 +352,16 @@ 
  * differently.
  */
 function number_widget_info() {
-  return array(
+    return array(
     'number' => array(
-      'label' => t('Text field'),
-      'field types' => array('number_integer', 'number_decimal', 'number_float'),
-      'multiple values' => CONTENT_HANDLE_CORE,
-      'callbacks' => array(
+        'label' => t('Text field'),
+        'field types' => array('number_integer', 'number_decimal', 'number_float'),
+        'multiple values' => CONTENT_HANDLE_CORE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
@@ -377,13 +377,13 @@ 
  * the validator can use. The regex can be overridden if necessary.
  */
 function number_elements() {
-  return array(
+    return array(
     'number' => array(
-      '#input' => TRUE,
-      '#columns' => array('value'), '#delta' => 0,
-      '#process' => array('number_process'),
+        '#input' => TRUE,
+        '#columns' => array('value'), '#delta' => 0,
+        '#process' => array('number_process'),
     ),
-  );
+    );
 }
 
 /**
@@ -418,11 +418,11 @@ 
  *   the form item for a single element for this field
  */
 function number_widget(&$form, &$form_state, $field, $items, $delta = 0) {
-  $element = array(
+    $element = array(
     '#type' => $field['widget']['type'],
     '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
-  );
-  return $element;
+    );
+    return $element;
 }
 
 /**
@@ -434,13 +434,13 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function number_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];
 
-  $value = isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : '';
-  $value = isset($field['decimal']) ? str_replace('.', $field['decimal'], $value) : $value;
-  $element[$field_key] = array(
+    $value = isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : '';
+    $value = isset($field['decimal']) ? str_replace('.', $field['decimal'], $value) : $value;
+    $element[$field_key] = array(
     '#type' => 'textfield',
     '#default_value' => $value,
     // Need to allow a slightly larger size that the field length to allow
@@ -457,117 +457,117 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
+    );
 
-  $prefixes = array();
-  $suffixes = array();
+    $prefixes = array();
+    $suffixes = array();
 
-  // Make sure we don't wipe out element validation added elsewhere.
-  if (empty($element['#element_validate'])) {
+    // Make sure we don't wipe out element validation added elsewhere.
+    if (empty($element['#element_validate'])) {
     $element['#element_validate'] = array();
-  }
-  if (!empty($field['prefix'])) {
+    }
+    if (!empty($field['prefix'])) {
     $prefixes = explode('|', $field['prefix']);
     $element[$field_key]['#field_prefix'] = content_filter_xss(array_pop($prefixes));
-  }
-  if (!empty($field['suffix'])) {
+    }
+    if (!empty($field['suffix'])) {
     $suffixes = explode('|', $field['suffix']);
     $element[$field_key]['#field_suffix'] = content_filter_xss(array_pop($suffixes));
-  }
-  switch ($field['type']) {
+    }
+    switch ($field['type']) {
     case 'number_float':
       $element['#element_validate'][] = 'number_float_validate';
-      break;
+        break;
     case 'number_integer':
       $element['#element_validate'][] = 'number_integer_validate';
-      break;
+        break;
     case 'number_decimal':
       $element['#element_validate'][] = 'number_decimal_validate';
-      $element['#decimal'] = isset($field['decimal']) ? $field['decimal'] : '.';
-      $element['#precision'] = isset($field['precision']) ? $field['precision'] : 10;
-      $element['#scale'] = isset($field['scale']) ? $field['scale'] : 2;
-      break;
-  }
-
-  // Used so that hook_field('validate') knows where to flag an error.
-  $element['_error_element'] = array(
+        $element['#decimal'] = isset($field['decimal']) ? $field['decimal'] : '.';
+        $element['#precision'] = isset($field['precision']) ? $field['precision'] : 10;
+        $element['#scale'] = isset($field['scale']) ? $field['scale'] : 2;
+        break;
+    }
+
+    // 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;
 }
 
 /**
  * FAPI validation of an individual float element.
  */
 function number_float_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];
+    $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];
 
-  if (($element[$field_key]['#required'] || !empty($value))) {
+    if (($element[$field_key]['#required'] || !empty($value))) {
     $start = $value;
     $value = preg_replace('@[^-0-9\.]@', '', $value);
     if ($start != $value) {
-      $error_field = implode('][', $element['#parents']) .']['. $field_key;
-      form_set_error($error_field, t('Only numbers and decimals are allowed in %field.', array('%field' => t($field['widget']['label']))));
+        $error_field = implode('][', $element['#parents']) .']['. $field_key;
+        form_set_error($error_field, t('Only numbers and decimals are allowed in %field.', array('%field' => t($field['widget']['label']))));
     }
     else {
-      form_set_value($element[$field_key], $value, $form_state);
+        form_set_value($element[$field_key], $value, $form_state);
+    }
     }
-  }
 }
 
 /**
  * FAPI validation of an individual integer element.
  */
 function number_integer_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];
+    $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];
 
-  if (($element[$field_key]['#required'] || !empty($value))) {
+    if (($element[$field_key]['#required'] || !empty($value))) {
     $start = $value;
     $value = preg_replace('@[^-0-9]@', '', $value);
     if ($start != $value) {
-      $error_field = implode('][', $element['#parents']) .']['. $field_key;
-      form_set_error($error_field, t('Only numbers are allowed in %field.', array('%field' => t($field['widget']['label']))));
+        $error_field = implode('][', $element['#parents']) .']['. $field_key;
+        form_set_error($error_field, t('Only numbers are allowed in %field.', array('%field' => t($field['widget']['label']))));
     }
     else {
-      form_set_value($element[$field_key], $value, $form_state);
+        form_set_value($element[$field_key], $value, $form_state);
+    }
     }
-  }
 }
 
 /**
  * FAPI validation of an individual decimal element.
  */
 function number_decimal_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];
+    $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];
 
-  if (($element[$field_key]['#required'] || !empty($value))) {
+    if (($element[$field_key]['#required'] || !empty($value))) {
     $decimal = $element['#decimal'] ? $element['#decimal'] : '.';
     $start = $value;
     $value = preg_replace('@[^-0-9\\'. $decimal .']@', '', $value);
     if ($start != $value) {
-      $error_field = implode('][', $element['#parents']) .']['. $field_key;
-      form_set_error($error_field, t('Only numbers and the decimal character (%decimal) are allowed in %field.', array('%decimal' => $element['#decimal'], '%field' => t($field['widget']['label']))));
+        $error_field = implode('][', $element['#parents']) .']['. $field_key;
+        form_set_error($error_field, t('Only numbers and the decimal character (%decimal) are allowed in %field.', array('%decimal' => $element['#decimal'], '%field' => t($field['widget']['label']))));
     }
     else {
-      $value = str_replace($element['#decimal'], '.', $value);
-      $value = round($value, $element['#scale']);
-      form_set_value($element[$field_key], $value, $form_state);
+        $value = str_replace($element['#decimal'], '.', $value);
+        $value = round($value, $element['#scale']);
+        form_set_value($element[$field_key], $value, $form_state);
+    }
     }
-  }
 }
 
 /**
@@ -581,5 +581,5 @@ 
  * $element['#delta]  is the position of this element in the group
  */
 function theme_number($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
\ No newline at end of file

Switch Indentation +195 added lines, -195 removed lines

@@ -54,142 +54,142 @@ 
  */
 function number_field_settings($op, $field) {
   switch ($op) {
-    case 'form':
-      $form = array();
-      $form['min'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Minimum'),
-        '#element_validate' => array('_element_validate_number'),
-        '#default_value' => is_numeric($field['min']) ? $field['min'] : '',
+  case 'form':
+    $form = array();
+    $form['min'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Minimum'),
+      '#element_validate' => array('_element_validate_number'),
+      '#default_value' => is_numeric($field['min']) ? $field['min'] : '',
+    );
+    $form['max'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Maximum'),
+      '#element_validate' => array('_element_validate_number'),
+      '#default_value' => is_numeric($field['max']) ? $field['max'] : '',
+    );
+    if ($field['type'] == 'number_decimal') {
+      $form['precision'] = array(
+        '#type' => 'select',
+        '#options' => drupal_map_assoc(range(10, 32)),
+        '#title' => t('Precision'),
+        '#description' => t('The total number of digits to store in the database, including those to the right of the decimal.'),
+        '#default_value' => is_numeric($field['precision']) ? $field['precision'] : 10,
       );
-      $form['max'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Maximum'),
-        '#element_validate' => array('_element_validate_number'),
-        '#default_value' => is_numeric($field['max']) ? $field['max'] : '',
+      $form['scale'] = array(
+        '#type' => 'select',
+        '#options' => drupal_map_assoc(range(0, 10)),
+        '#title' => t('Scale'),
+        '#description' => t('The number of digits to the right of the decimal.'),
+        '#default_value' => is_numeric($field['scale']) ? $field['scale'] : 2,
       );
-      if ($field['type'] == 'number_decimal') {
-        $form['precision'] = array(
-          '#type' => 'select',
-          '#options' => drupal_map_assoc(range(10, 32)),
-          '#title' => t('Precision'),
-          '#description' => t('The total number of digits to store in the database, including those to the right of the decimal.'),
-          '#default_value' => is_numeric($field['precision']) ? $field['precision'] : 10,
-        );
-        $form['scale'] = array(
-          '#type' => 'select',
-          '#options' => drupal_map_assoc(range(0, 10)),
-          '#title' => t('Scale'),
-          '#description' => t('The number of digits to the right of the decimal.'),
-          '#default_value' => is_numeric($field['scale']) ? $field['scale'] : 2,
-        );
-        $form['decimal'] = array(
-          '#type' => 'select',
-          '#options' => array('.' => 'decimal point', ',' => 'comma', ' ' => 'space'),
-          '#title' => t('Decimal marker'),
-          '#description' => t('The character users will input to mark the decimal point in forms.'),
-          '#default_value' => !empty($field['decimal']) ? $field['decimal'] : '.',
-        );
-      }
-      $form['append']['prefix'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Prefix'),
-        '#size' => 60,
-        '#default_value' => !empty($field['prefix']) ? $field['prefix'] : '',
-        '#description' => t('Define a string that should be prefixed to the value, like $ or €. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).'),
-      );
-      $form['append']['suffix'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Suffix'),
-        '#size' => 60,
-        '#default_value' => !empty($field['suffix']) ? $field['suffix'] : '',
-        '#description' => t('Define a string that should suffixed to the value, like m², m/s², kb/s. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).'),
+      $form['decimal'] = array(
+        '#type' => 'select',
+        '#options' => array('.' => 'decimal point', ',' => 'comma', ' ' => 'space'),
+        '#title' => t('Decimal marker'),
+        '#description' => t('The character users will input to mark the decimal point in forms.'),
+        '#default_value' => !empty($field['decimal']) ? $field['decimal'] : '.',
       );
-      $form['allowed_values_fieldset'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Allowed values'),
-        '#collapsible' => TRUE,
-        '#collapsed' => TRUE,
-      );
-      $form['allowed_values_fieldset']['allowed_values'] = array(
+    }
+    $form['append']['prefix'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Prefix'),
+      '#size' => 60,
+      '#default_value' => !empty($field['prefix']) ? $field['prefix'] : '',
+      '#description' => t('Define a string that should be prefixed to the value, like $ or €. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).'),
+    );
+    $form['append']['suffix'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Suffix'),
+      '#size' => 60,
+      '#default_value' => !empty($field['suffix']) ? $field['suffix'] : '',
+      '#description' => t('Define a string that should suffixed to the value, like m², m/s², kb/s. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).'),
+    );
+    $form['allowed_values_fieldset'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Allowed values'),
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+    );
+    $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(
+      '#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)')) {
+      $form['allowed_values_fieldset']['advanced_options']['allowed_values_php'] = 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())),
+        '#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.'),
       );
-      $form['allowed_values_fieldset']['advanced_options'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('PHP code'),
-        '#collapsible' => TRUE,
-        '#collapsed' => empty($field['allowed_values_php']),
+    }
+    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.'),
       );
-      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.'),
-        );
-      }
-      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.'),
-        );
-      }
-      return $form;
+    }
+    return $form;
 
-    case 'save':
-      $values = array('prefix', 'suffix', 'min', 'max', 'allowed_values', 'allowed_values_php');
-      if ($field['type'] == 'number_decimal') {
-        $values = array_merge($values, array('precision', 'scale', 'decimal'));
-      }
-      return $values;
+  case 'save':
+    $values = array('prefix', 'suffix', 'min', 'max', 'allowed_values', 'allowed_values_php');
+    if ($field['type'] == 'number_decimal') {
+      $values = array_merge($values, array('precision', 'scale', 'decimal'));
+    }
+    return $values;
 
-    case 'database columns':
-      if ($field['type'] == 'number_integer') {
-        return array(
-          'value' => array('type' => 'int', 'not null' => FALSE, 'sortable' => TRUE),
-        );
-      }
-      if ($field['type'] == 'number_float') {
-        return array(
-          'value' => array('type' => 'float', 'not null' => FALSE, 'sortable' => TRUE),
-        );
-      }
-      if ($field['type'] == 'number_decimal') {
-        $precision = isset($field['precision']) ? $field['precision'] : 10;
-        $scale = isset($field['scale']) ? $field['scale'] : 2;
-        return array(
-          'value' => array('type' => 'numeric', 'precision' => $precision, 'scale' => $scale, 'not null' => FALSE, 'sortable' => TRUE),
-        );
-      }
+  case 'database columns':
+    if ($field['type'] == 'number_integer') {
+      return array(
+        'value' => array('type' => 'int', 'not null' => FALSE, 'sortable' => TRUE),
+      );
+    }
+    if ($field['type'] == 'number_float') {
+      return array(
+        'value' => array('type' => 'float', 'not null' => FALSE, 'sortable' => TRUE),
+      );
+    }
+    if ($field['type'] == 'number_decimal') {
+      $precision = isset($field['precision']) ? $field['precision'] : 10;
+      $scale = isset($field['scale']) ? $field['scale'] : 2;
+      return array(
+        'value' => array('type' => 'numeric', 'precision' => $precision, 'scale' => $scale, 'not null' => FALSE, 'sortable' => TRUE),
+      );
+    }
 
-    case 'views data':
-      $allowed_values = content_allowed_values($field);
-      if (count($allowed_values)) {
-        $data = content_views_field_views_data($field);
-        $db_info = content_database_info($field);
-        $table_alias = content_views_tablename($field);
-
-        // Filter: Add a 'many to one' filter.
-        $copy = $data[$table_alias][$field['field_name'] .'_value'];
-        $copy['title'] = t('@label (!name) - Allowed values', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
-        $copy['filter']['handler'] = 'content_handler_filter_many_to_one';
-        $copy['filter']['numeric'] = TRUE;
-        unset($copy['field'], $copy['argument'], $copy['sort']);
-        $data[$table_alias][$field['field_name'] .'_value_many_to_one'] = $copy;
-        // 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';
-        $data[$table_alias][$field['field_name'] .'_value']['argument']['numeric'] = TRUE;
-        return $data;
-      }
-      break;
+  case 'views data':
+    $allowed_values = content_allowed_values($field);
+    if (count($allowed_values)) {
+      $data = content_views_field_views_data($field);
+      $db_info = content_database_info($field);
+      $table_alias = content_views_tablename($field);
+
+      // Filter: Add a 'many to one' filter.
+      $copy = $data[$table_alias][$field['field_name'] .'_value'];
+      $copy['title'] = t('@label (!name) - Allowed values', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
+      $copy['filter']['handler'] = 'content_handler_filter_many_to_one';
+      $copy['filter']['numeric'] = TRUE;
+      unset($copy['field'], $copy['argument'], $copy['sort']);
+      $data[$table_alias][$field['field_name'] .'_value_many_to_one'] = $copy;
+      // 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';
+      $data[$table_alias][$field['field_name'] .'_value']['argument']['numeric'] = TRUE;
+      return $data;
+    }
+    break;
   }
 }
 
@@ -212,37 +212,37 @@ 
  */
 function number_field($op, &$node, $field, &$items, $teaser, $page) {
   switch ($op) {
-    case 'validate':
-      $allowed_values = content_allowed_values($field);
-      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 ($item['value'] != '') {
-            if (is_numeric($field['min']) && $item['value'] < $field['min']) {
-              form_set_error($error_element, t('%name: the value may be no smaller than %min.', array('%name' => t($field['widget']['label']), '%min' => $field['min'])));
-            }
-            if (is_numeric($field['max']) && $item['value'] > $field['max']) {
-              form_set_error($error_element, t('%name: the value may be no larger than %max.', array('%name' => t($field['widget']['label']), '%max' => $field['max'])));
-            }
-            if (count($allowed_values)) {
-              // We cannot use array_key_exists() because allowed values are
-              // stored as strings, and we need to compare numeric equality.
-              $valid = FALSE;
-              foreach ($allowed_values as $kay => $value) {
-                if ((float) $item['value'] == (float) $kay) {
-                  $valid = TRUE;
-                  break;
-                }
-              }
-              if (!$valid) {
-                form_set_error($error_element, t('%name: illegal value.', array('%name' => t($field['widget']['label']))));
+  case 'validate':
+    $allowed_values = content_allowed_values($field);
+    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 ($item['value'] != '') {
+          if (is_numeric($field['min']) && $item['value'] < $field['min']) {
+            form_set_error($error_element, t('%name: the value may be no smaller than %min.', array('%name' => t($field['widget']['label']), '%min' => $field['min'])));
+          }
+          if (is_numeric($field['max']) && $item['value'] > $field['max']) {
+            form_set_error($error_element, t('%name: the value may be no larger than %max.', array('%name' => t($field['widget']['label']), '%max' => $field['max'])));
+          }
+          if (count($allowed_values)) {
+            // We cannot use array_key_exists() because allowed values are
+            // stored as strings, and we need to compare numeric equality.
+            $valid = FALSE;
+            foreach ($allowed_values as $kay => $value) {
+              if ((float) $item['value'] == (float) $kay) {
+                $valid = TRUE;
+                break;
               }
             }
+            if (!$valid) {
+              form_set_error($error_element, t('%name: illegal value.', array('%name' => t($field['widget']['label']))));
+            }
           }
         }
       }
-      return $items;
+    }
+    return $items;
   }
 }
 
@@ -300,36 +300,36 @@ 
   }
 
   switch ($element['#formatter']) {
-    case 'us_0':
-      $output = number_format($value, 0, '.', ',');
-      break;
-    case 'us_1':
-      $output = number_format($value, 1, '.', ',');
-      break;
-    case 'us_2':
-      $output = number_format($value, 2, '.', ',');
-      break;
-    case 'be_0':
-      $output = number_format($value, 0, ',', '.');
-      break;
-    case 'be_1':
-      $output = number_format($value, 1, ',', '.');
-      break;
-    case 'be_2':
-      $output = number_format($value, 2, ',', '.');
-      break;
-    case 'fr_0':
-      $output = number_format($value, 0, ', ', ' ');
-      break;
-    case 'fr_1':
-      $output = number_format($value, 1, ', ', ' ');
-      break;
-    case 'fr_2':
-      $output = number_format($value, 2, ', ', ' ');
-      break;
-    default:
-      $output = $value;
-      break;
+  case 'us_0':
+    $output = number_format($value, 0, '.', ',');
+    break;
+  case 'us_1':
+    $output = number_format($value, 1, '.', ',');
+    break;
+  case 'us_2':
+    $output = number_format($value, 2, '.', ',');
+    break;
+  case 'be_0':
+    $output = number_format($value, 0, ',', '.');
+    break;
+  case 'be_1':
+    $output = number_format($value, 1, ',', '.');
+    break;
+  case 'be_2':
+    $output = number_format($value, 2, ',', '.');
+    break;
+  case 'fr_0':
+    $output = number_format($value, 0, ', ', ' ');
+    break;
+  case 'fr_1':
+    $output = number_format($value, 1, ', ', ' ');
+    break;
+  case 'fr_2':
+    $output = number_format($value, 2, ', ', ' ');
+    break;
+  default:
+    $output = $value;
+    break;
   }
 
   $prefixes = isset($field['prefix']) ? array_map('content_filter_xss', explode('|', $field['prefix'])) : array('');
@@ -475,18 +475,18 @@ 
     $element[$field_key]['#field_suffix'] = content_filter_xss(array_pop($suffixes));
   }
   switch ($field['type']) {
-    case 'number_float':
-      $element['#element_validate'][] = 'number_float_validate';
-      break;
-    case 'number_integer':
-      $element['#element_validate'][] = 'number_integer_validate';
-      break;
-    case 'number_decimal':
-      $element['#element_validate'][] = 'number_decimal_validate';
-      $element['#decimal'] = isset($field['decimal']) ? $field['decimal'] : '.';
-      $element['#precision'] = isset($field['precision']) ? $field['precision'] : 10;
-      $element['#scale'] = isset($field['scale']) ? $field['scale'] : 2;
-      break;
+  case 'number_float':
+    $element['#element_validate'][] = 'number_float_validate';
+    break;
+  case 'number_integer':
+    $element['#element_validate'][] = 'number_integer_validate';
+    break;
+  case 'number_decimal':
+    $element['#element_validate'][] = 'number_decimal_validate';
+    $element['#decimal'] = isset($field['decimal']) ? $field['decimal'] : '.';
+    $element['#precision'] = isset($field['precision']) ? $field['precision'] : 10;
+    $element['#scale'] = isset($field['scale']) ? $field['scale'] : 2;
+    break;
   }
 
   // Used so that hook_field('validate') knows where to flag an error.

Spacing +21 added lines, -21 removed lines

@@ -138,7 +138,7 @@ 
         $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;'),
+          '#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.'),
         );
       }
@@ -178,15 +178,15 @@ 
         $table_alias = content_views_tablename($field);
 
         // Filter: Add a 'many to one' filter.
-        $copy = $data[$table_alias][$field['field_name'] .'_value'];
+        $copy = $data[$table_alias][$field['field_name'].'_value'];
         $copy['title'] = t('@label (!name) - Allowed values', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
         $copy['filter']['handler'] = 'content_handler_filter_many_to_one';
         $copy['filter']['numeric'] = TRUE;
         unset($copy['field'], $copy['argument'], $copy['sort']);
-        $data[$table_alias][$field['field_name'] .'_value_many_to_one'] = $copy;
+        $data[$table_alias][$field['field_name'].'_value_many_to_one'] = $copy;
         // 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';
-        $data[$table_alias][$field['field_name'] .'_value']['argument']['numeric'] = TRUE;
+        $data[$table_alias][$field['field_name'].'_value']['argument']['handler'] = 'content_handler_argument_many_to_one';
+        $data[$table_alias][$field['field_name'].'_value']['argument']['numeric'] = TRUE;
         return $data;
       }
       break;
@@ -230,7 +230,7 @@ 
               // stored as strings, and we need to compare numeric equality.
               $valid = FALSE;
               foreach ($allowed_values as $kay => $value) {
-                if ((float) $item['value'] == (float) $kay) {
+                if ((float)$item['value'] == (float)$kay) {
                   $valid = TRUE;
                   break;
                 }
@@ -261,16 +261,16 @@ 
  */
 function number_field_formatter_info() {
   return array(
-    'default' => array('label' => '9999',            'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
-    'us_0'    => array('label' => '9,999',           'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
-    'us_1'    => array('label' => '9,999.9',         'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
-    'us_2'    => array('label' => '9,999.99',        'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
-    'be_0'    => array('label' => '9.999',           'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
-    'be_1'    => array('label' => '9.999,9',         'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
-    'be_2'    => array('label' => '9.999,99',        'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
-    'fr_0'    => array('label' => '9 999',           'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
-    'fr_1'    => array('label' => '9 999, 9',        'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
-    'fr_2'    => array('label' => '9 999, 99',       'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
+    'default' => array('label' => '9999', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
+    'us_0'    => array('label' => '9,999', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
+    'us_1'    => array('label' => '9,999.9', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
+    'us_2'    => array('label' => '9,999.99', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
+    'be_0'    => array('label' => '9.999', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
+    'be_1'    => array('label' => '9.999,9', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
+    'be_2'    => array('label' => '9.999,99', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
+    'fr_0'    => array('label' => '9 999', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
+    'fr_1'    => array('label' => '9 999, 9', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
+    'fr_2'    => array('label' => '9 999, 99', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
     'unformatted' => array('label' => t('unformatted'), 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
   );
 }
@@ -337,7 +337,7 @@ 
   $prefix = (count($prefixes) > 1) ? format_plural($value, $prefixes[0], $prefixes[1]) : $prefixes[0];
   $suffix = (count($suffixes) > 1) ? format_plural($value, $suffixes[0], $suffixes[1]) : $suffixes[0];
 
-  return $prefix . $output . $suffix;
+  return $prefix.$output.$suffix;
 }
 
 /**
@@ -512,7 +512,7 @@ 
     $start = $value;
     $value = preg_replace('@[^-0-9\.]@', '', $value);
     if ($start != $value) {
-      $error_field = implode('][', $element['#parents']) .']['. $field_key;
+      $error_field = implode('][', $element['#parents']).']['.$field_key;
       form_set_error($error_field, t('Only numbers and decimals are allowed in %field.', array('%field' => t($field['widget']['label']))));
     }
     else {
@@ -535,7 +535,7 @@ 
     $start = $value;
     $value = preg_replace('@[^-0-9]@', '', $value);
     if ($start != $value) {
-      $error_field = implode('][', $element['#parents']) .']['. $field_key;
+      $error_field = implode('][', $element['#parents']).']['.$field_key;
       form_set_error($error_field, t('Only numbers are allowed in %field.', array('%field' => t($field['widget']['label']))));
     }
     else {
@@ -557,9 +557,9 @@ 
   if (($element[$field_key]['#required'] || !empty($value))) {
     $decimal = $element['#decimal'] ? $element['#decimal'] : '.';
     $start = $value;
-    $value = preg_replace('@[^-0-9\\'. $decimal .']@', '', $value);
+    $value = preg_replace('@[^-0-9\\'.$decimal.']@', '', $value);
     if ($start != $value) {
-      $error_field = implode('][', $element['#parents']) .']['. $field_key;
+      $error_field = implode('][', $element['#parents']).']['.$field_key;
       form_set_error($error_field, t('Only numbers and the decimal character (%decimal) are allowed in %field.', array('%decimal' => $element['#decimal'], '%field' => t($field['widget']['label']))));
     }
     else {

Braces +4 added lines, -8 removed lines

@@ -133,8 +133,7 @@ 
           '#rows' => 6,
           '#description' => t('Advanced usage only: PHP code that returns a keyed array of allowed values. Should not include <?php ?> 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'),
@@ -514,8 +513,7 @@ 
     if ($start != $value) {
       $error_field = implode('][', $element['#parents']) .']['. $field_key;
       form_set_error($error_field, t('Only numbers and decimals are allowed in %field.', array('%field' => t($field['widget']['label']))));
-    }
-    else {
+    } else {
       form_set_value($element[$field_key], $value, $form_state);
     }
   }
@@ -537,8 +535,7 @@ 
     if ($start != $value) {
       $error_field = implode('][', $element['#parents']) .']['. $field_key;
       form_set_error($error_field, t('Only numbers are allowed in %field.', array('%field' => t($field['widget']['label']))));
-    }
-    else {
+    } else {
       form_set_value($element[$field_key], $value, $form_state);
     }
   }
@@ -561,8 +558,7 @@ 
     if ($start != $value) {
       $error_field = implode('][', $element['#parents']) .']['. $field_key;
       form_set_error($error_field, t('Only numbers and the decimal character (%decimal) are allowed in %field.', array('%decimal' => $element['#decimal'], '%field' => t($field['widget']['label']))));
-    }
-    else {
+    } else {
       $value = str_replace($element['#decimal'], '.', $value);
       $value = round($value, $element['#scale']);
       form_set_value($element[$field_key], $value, $form_state);

Upper-Lower-Casing +27 added lines, -27 removed lines

@@ -11,18 +11,18 @@ 
  */
 function number_theme() {
   return array(
-    'number' => array('arguments' => array('element' => NULL)),
-    'number_formatter_default' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_us_0' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_us_1' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_us_2' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_be_0' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_be_1' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_be_2' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_fr_0' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_fr_1' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_fr_2' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_unformatted' => array('arguments' => array('element' => NULL)),
+    'number' => array('arguments' => array('element' => null)),
+    'number_formatter_default' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_us_0' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_us_1' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_us_2' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_be_0' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_be_1' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_be_2' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_fr_0' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_fr_1' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_fr_2' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_unformatted' => array('arguments' => array('element' => null)),
   );
 }
 
@@ -108,21 +108,21 @@ 
       $form['allowed_values_fieldset'] = array(
         '#type' => 'fieldset',
         '#title' => t('Allowed values'),
-        '#collapsible' => TRUE,
-        '#collapsed' => TRUE,
+        '#collapsible' => true,
+        '#collapsed' => true,
       );
       $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,
+        '#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(
         '#type' => 'fieldset',
         '#title' => t('PHP code'),
-        '#collapsible' => TRUE,
+        '#collapsible' => true,
         '#collapsed' => empty($field['allowed_values_php']),
       );
       if (user_access('Use PHP input for field settings (dangerous - grant with care)')) {
@@ -154,19 +154,19 @@ 
     case 'database columns':
       if ($field['type'] == 'number_integer') {
         return array(
-          'value' => array('type' => 'int', 'not null' => FALSE, 'sortable' => TRUE),
+          'value' => array('type' => 'int', 'not null' => false, 'sortable' => true),
         );
       }
       if ($field['type'] == 'number_float') {
         return array(
-          'value' => array('type' => 'float', 'not null' => FALSE, 'sortable' => TRUE),
+          'value' => array('type' => 'float', 'not null' => false, 'sortable' => true),
         );
       }
       if ($field['type'] == 'number_decimal') {
         $precision = isset($field['precision']) ? $field['precision'] : 10;
         $scale = isset($field['scale']) ? $field['scale'] : 2;
         return array(
-          'value' => array('type' => 'numeric', 'precision' => $precision, 'scale' => $scale, 'not null' => FALSE, 'sortable' => TRUE),
+          'value' => array('type' => 'numeric', 'precision' => $precision, 'scale' => $scale, 'not null' => false, 'sortable' => true),
         );
       }
 
@@ -181,12 +181,12 @@ 
         $copy = $data[$table_alias][$field['field_name'] .'_value'];
         $copy['title'] = t('@label (!name) - Allowed values', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
         $copy['filter']['handler'] = 'content_handler_filter_many_to_one';
-        $copy['filter']['numeric'] = TRUE;
+        $copy['filter']['numeric'] = true;
         unset($copy['field'], $copy['argument'], $copy['sort']);
         $data[$table_alias][$field['field_name'] .'_value_many_to_one'] = $copy;
         // 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';
-        $data[$table_alias][$field['field_name'] .'_value']['argument']['numeric'] = TRUE;
+        $data[$table_alias][$field['field_name'] .'_value']['argument']['numeric'] = true;
         return $data;
       }
       break;
@@ -228,10 +228,10 @@ 
             if (count($allowed_values)) {
               // We cannot use array_key_exists() because allowed values are
               // stored as strings, and we need to compare numeric equality.
-              $valid = FALSE;
+              $valid = false;
               foreach ($allowed_values as $kay => $value) {
                 if ((float) $item['value'] == (float) $kay) {
-                  $valid = TRUE;
+                  $valid = true;
                   break;
                 }
               }
@@ -251,9 +251,9 @@ 
  */
 function number_content_is_empty($item, $field) {
   if (empty($item['value']) && (string)$item['value'] !== '0') {
-    return TRUE;
+    return true;
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -379,7 +379,7 @@ 
 function number_elements() {
   return array(
     'number' => array(
-      '#input' => TRUE,
+      '#input' => true,
       '#columns' => array('value'), '#delta' => 0,
       '#process' => array('number_process'),
     ),
@@ -420,7 +420,7 @@ 
 function number_widget(&$form, &$form_state, $field, $items, $delta = 0) {
   $element = array(
     '#type' => $field['widget']['type'],
-    '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
+    '#default_value' => isset($items[$delta]) ? $items[$delta] : null,
   );
   return $element;
 }