BOINC / boinc

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_filter_many_to_one.inc

Indentation +15 added lines, -15 removed lines

@@ -7,36 +7,36 @@
  * for field-specific subclasses to use if they need to.
  */
 class content_handler_filter_many_to_one extends views_handler_filter_many_to_one {
-  var $content_field;
+    var $content_field;
 
-  function construct() {
+    function construct() {
     parent::construct();
     $this->content_field = content_fields($this->definition['content_field_name']);
     $this->additional_fields = $this->definition['additional fields'];
     $field = $this->content_field;
     $this->value_title = $field['widget']['label'];
-  }
+    }
 
-  function get_value_options() {
+    function get_value_options() {
     $this->value_options = $this->allowed_values();
-  }
+    }
 
-  // Get allowed values from hook_allowed_values(), if any,
-  // or from content_allowed_values();
-  function allowed_values() {
+    // Get allowed values from hook_allowed_values(), if any,
+    // or from content_allowed_values();
+    function allowed_values() {
     $field = $this->content_field;
     $function = $field['module'] .'_allowed_values';
     if ($this->value_form_type == 'select') {
-      // Select elements accept multidimensional arrays to support optgroups.
-      $options = function_exists($function) ? $function($field) : content_allowed_values($field, FALSE);
-      // For selects, HTML should be filtered out and entities left unencoded.
-      // See content_allowed_values / content_filter_xss / filter_xss.
-      content_allowed_values_filter_html($options);
+        // Select elements accept multidimensional arrays to support optgroups.
+        $options = function_exists($function) ? $function($field) : content_allowed_values($field, FALSE);
+        // For selects, HTML should be filtered out and entities left unencoded.
+        // See content_allowed_values / content_filter_xss / filter_xss.
+        content_allowed_values_filter_html($options);
     }
     else {
-      $options = function_exists($function) ? $function($field) : content_allowed_values($field);
+        $options = function_exists($function) ? $function($field) : content_allowed_values($field);
     }
     return (array) $options;
-  }
+    }
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
   // or from content_allowed_values();
   function allowed_values() {
     $field = $this->content_field;
-    $function = $field['module'] .'_allowed_values';
+    $function = $field['module'].'_allowed_values';
     if ($this->value_form_type == 'select') {
       // Select elements accept multidimensional arrays to support optgroups.
       $options = function_exists($function) ? $function($field) : content_allowed_values($field, FALSE);
@@ -36,7 +36,7 @@ 
     else {
       $options = function_exists($function) ? $function($field) : content_allowed_values($field);
     }
-    return (array) $options;
+    return (array)$options;
   }
 
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -32,8 +32,7 @@
       // For selects, HTML should be filtered out and entities left unencoded.
       // See content_allowed_values / content_filter_xss / filter_xss.
       content_allowed_values_filter_html($options);
-    }
-    else {
+    } else {
       $options = function_exists($function) ? $function($field) : content_allowed_values($field);
     }
     return (array) $options;

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

@@ -28,7 +28,7 @@
     $function = $field['module'] .'_allowed_values';
     if ($this->value_form_type == 'select') {
       // Select elements accept multidimensional arrays to support optgroups.
-      $options = function_exists($function) ? $function($field) : content_allowed_values($field, FALSE);
+      $options = function_exists($function) ? $function($field) : content_allowed_values($field, false);
       // For selects, HTML should be filtered out and entities left unencoded.
       // See content_allowed_values / content_filter_xss / filter_xss.
       content_allowed_values_filter_html($options);

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_argument.inc

Indentation +3 added lines, -3 removed lines

@@ -7,12 +7,12 @@
  * for field-specific subclasses to use if they need to.
  */
 class content_handler_argument extends views_handler_argument {
-  var $content_field;
+    var $content_field;
 
-  function construct() {
+    function construct() {
     parent::construct();
 
     $this->content_field = content_fields($this->definition['content_field_name']);
     $this->additional_fields = $this->definition['additional fields'];
-  }
+    }
 }
\ No newline at end of file

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_argument_many_to_one.inc

Indentation +13 added lines, -13 removed lines

@@ -6,43 +6,43 @@
  * Handler for 'content_handler_argument_many_to_one' style.
  */
 class content_handler_argument_many_to_one extends views_handler_argument_many_to_one {
-  var $content_field;
+    var $content_field;
 
-  function construct() {
+    function construct() {
     parent::construct();
 
     $this->content_field = content_fields($this->definition['content_field_name']);
     $this->additional_fields = $this->definition['additional fields'];
-  }
+    }
 
-  function summary_name($data) {
+    function summary_name($data) {
     $options = $this->allowed_values();
     $value = $data->{$this->name_alias};
     if (isset($options[$value])) {
-      $value = $options[$value];
+        $value = $options[$value];
     }
     else {
-      $value = parent::summary_name($data);
+        $value = parent::summary_name($data);
     }
 
     return $value;
-  }
+    }
 
-  function title_query() {
+    function title_query() {
     $options = $this->allowed_values();
     $values = $this->value;
     foreach ($values as $key => $value) {
-      if (isset($options[$value])) {
+        if (isset($options[$value])) {
         $values[$key] = $options[$value];
-      }
+        }
     }
     return $values;
-  }
+    }
 
-  function allowed_values() {
+    function allowed_values() {
     $field = $this->content_field;
     $function = $field['module'] .'_allowed_values';
     $options = function_exists($function) ? $function($field) : content_allowed_values($field);
     return (array) $options;
-  }
+    }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -41,8 +41,8 @@
 
   function allowed_values() {
     $field = $this->content_field;
-    $function = $field['module'] .'_allowed_values';
+    $function = $field['module'].'_allowed_values';
     $options = function_exists($function) ? $function($field) : content_allowed_values($field);
-    return (array) $options;
+    return (array)$options;
   }
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
     $value = $data->{$this->name_alias};
     if (isset($options[$value])) {
       $value = $options[$value];
-    }
-    else {
+    } else {
       $value = parent::summary_name($data);
     }
 

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_filter_numeric.inc

Indentation +3 added lines, -3 removed lines

@@ -7,11 +7,11 @@
  * for field-specific subclasses to use if they need to.
  */
 class content_handler_filter_numeric extends views_handler_filter_numeric {
-  var $content_field;
+    var $content_field;
 
-  function construct() {
+    function construct() {
     parent::construct();
     $this->content_field = content_fields($this->definition['content_field_name']);
     $this->additional_fields = $this->definition['additional fields'];
-  }
+    }
 }
\ No newline at end of file

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_filter_float.inc

Indentation +6 added lines, -6 removed lines

@@ -10,17 +10,17 @@
 // Ensure compatibility with Views pre 2.4, where the
 // views_handler_filter_float class lived in views_handler_filter_numeric.inc.
 if (!class_exists('views_handler_filter_float')) {
-  // Manually include the parent class.
-  $definition = views_fetch_handler_data('views_handler_filter_numeric');
-  views_include_handler($definition, 'handler');
+    // Manually include the parent class.
+    $definition = views_fetch_handler_data('views_handler_filter_numeric');
+    views_include_handler($definition, 'handler');
 }
 
 class content_handler_filter_float extends views_handler_filter_float {
-  var $content_field;
+    var $content_field;
 
-  function construct() {
+    function construct() {
     parent::construct();
     $this->content_field = content_fields($this->definition['content_field_name']);
     $this->additional_fields = $this->definition['additional fields'];
-  }
+    }
 }
\ No newline at end of file

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_field_multiple.inc

Indentation +142 added lines, -142 removed lines

@@ -9,129 +9,129 @@ 
  * field and formatter handling can extend this class.
  */
 class content_handler_field_multiple extends content_handler_field {
-  var $defer_query;
+    var $defer_query;
 
-  function init(&$view, $options) {
+    function init(&$view, $options) {
     $field = $this->content_field;
     parent::init($view, $options);
 
     $this->defer_query = !empty($options['multiple']['group']) && $field['multiple'];
 
     if ($this->defer_query) {
-      // Grouped field: ditch the existing additional_fields (field columns + delta).
-      // In the main query we'll only need:
-      // - vid, which will be used to retrieve the actual values in pre_render,
-      // - node type and nid, which wil be used in the pseudo-node used when
-      // rendering.
-      $this->additional_fields = array(
+        // Grouped field: ditch the existing additional_fields (field columns + delta).
+        // In the main query we'll only need:
+        // - vid, which will be used to retrieve the actual values in pre_render,
+        // - node type and nid, which wil be used in the pseudo-node used when
+        // rendering.
+        $this->additional_fields = array(
         'type' => array('table' => 'node', 'field' => 'type'),
         'nid' => array('table' => 'node', 'field' => 'nid'),
-      );
-      if ($view->base_table == 'node_revisions') {
+        );
+        if ($view->base_table == 'node_revisions') {
         $this->additional_fields['vid'] = array('table' => 'node_revisions', 'field' => 'vid');
-      }
-      else {
+        }
+        else {
         $this->additional_fields['vid'] = array('table' => 'node', 'field' => 'vid');
-      }
+        }
+    }
     }
-  }
 
-  function option_definition() {
+    function option_definition() {
     $options = parent::option_definition();
 
     $options['multiple'] = array(
-      'contains' => array(
+        'contains' => array(
         'group' => array('default' => TRUE),
         'multiple_number' => array('default' => ''),
         'multiple_from' => array('default' => ''),
         'multiple_reversed' => array('default' => FALSE),
-      ),
+        ),
     );
 
     return $options;
-  }
+    }
 
-  /**
-   * Provide 'group multiple values' option.
-   */
-  function options_form(&$form, &$form_state) {
+    /**
+     * Provide 'group multiple values' option.
+     */
+    function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $field = $this->content_field;
     $options = $this->options;
 
     $form['multiple'] = array(
-      '#access' => $field['multiple'],
-      '#weight' => 1,
+        '#access' => $field['multiple'],
+        '#weight' => 1,
     );
     $form['multiple']['group'] = array(
-      '#title' => t('Group multiple values'),
-      '#type' => 'checkbox',
-      '#default_value' => $options['multiple']['group'],
-      '#description' => t('If unchecked, each item in the field will create a new row, which may appear to cause duplicates. This setting is not compatible with click-sorting in table displays.'),
+        '#title' => t('Group multiple values'),
+        '#type' => 'checkbox',
+        '#default_value' => $options['multiple']['group'],
+        '#description' => t('If unchecked, each item in the field will create a new row, which may appear to cause duplicates. This setting is not compatible with click-sorting in table displays.'),
     );
     // Make the string translatable by keeping it as a whole rather than
     // translating prefix and suffix separately.
     list($prefix, $suffix) = explode('@count', t('Show @count value(s)'));
     $form['multiple']['multiple_number'] = array(
-      '#type' => 'textfield',
-      '#size' => 5,
-      '#field_prefix' => $prefix,
-      '#field_suffix' => $suffix,
-      '#default_value' => $options['multiple']['multiple_number'],
-      '#prefix' => '<div class="container-inline">',
-      '#process' => array('views_process_dependency'),
-      '#dependency' => array('edit-options-multiple-group' => array(TRUE)),
+        '#type' => 'textfield',
+        '#size' => 5,
+        '#field_prefix' => $prefix,
+        '#field_suffix' => $suffix,
+        '#default_value' => $options['multiple']['multiple_number'],
+        '#prefix' => '<div class="container-inline">',
+        '#process' => array('views_process_dependency'),
+        '#dependency' => array('edit-options-multiple-group' => array(TRUE)),
     );
     list($prefix, $suffix) = explode('@count', t('starting from @count'));
     $form['multiple']['multiple_from'] = array(
-      '#type' => 'textfield',
-      '#size' => 5,
-      '#field_prefix' => $prefix,
-      '#field_suffix' => $suffix,
-      '#default_value' => $options['multiple']['multiple_from'],
-      '#process' => array('views_process_dependency'),
-      '#dependency' => array('edit-options-multiple-group' => array(TRUE)),
-      '#description' => t('(first item is 0)'),
+        '#type' => 'textfield',
+        '#size' => 5,
+        '#field_prefix' => $prefix,
+        '#field_suffix' => $suffix,
+        '#default_value' => $options['multiple']['multiple_from'],
+        '#process' => array('views_process_dependency'),
+        '#dependency' => array('edit-options-multiple-group' => array(TRUE)),
+        '#description' => t('(first item is 0)'),
     );
     $form['multiple']['multiple_reversed'] = array(
-      '#title' => t('Reversed'),
-      '#type' => 'checkbox',
-      '#default_value' => $options['multiple']['multiple_reversed'],
-      '#suffix' => '</div>',
-      '#process' => array('views_process_dependency'),
-      '#dependency' => array('edit-options-multiple-group' => array(TRUE)),
-      '#description' => t('(start from last values)'),
+        '#title' => t('Reversed'),
+        '#type' => 'checkbox',
+        '#default_value' => $options['multiple']['multiple_reversed'],
+        '#suffix' => '</div>',
+        '#process' => array('views_process_dependency'),
+        '#dependency' => array('edit-options-multiple-group' => array(TRUE)),
+        '#description' => t('(start from last values)'),
     );
-  }
+    }
 
-  /**
-   * Determine if this field is click sortable.
-   */
-  function click_sortable() {
+    /**
+     * Determine if this field is click sortable.
+     */
+    function click_sortable() {
     $field = $this->content_field;
     $options = $this->options;
 
     // Grouped fields are not click-sortable.
     return !empty($this->definition['click sortable']) && !$this->defer_query;
-  }
+    }
 
-  function query() {
+    function query() {
     // If this is not a grouped field, use the generic query().
     if (!$this->defer_query) {
-      return parent::query();
+        return parent::query();
     }
 
     // Grouped field: do NOT call ensure_my_table, only add additional fields.
     $this->add_additional_fields();
     $this->field_alias = $this->aliases['vid'];
-  }
+    }
 
-  function pre_render(&$values) {
+    function pre_render(&$values) {
     // If there are no values to render (displaying a summary, or query returned no results),
     // or if this is not a grouped field, do nothing specific.
     if (isset($this->view->build_info['summary']) || empty($values) || !$this->defer_query) {
-      return parent::pre_render($values);
+        return parent::pre_render($values);
     }
 
     $field = $this->content_field;
@@ -143,82 +143,82 @@ 
     $vids = array();
     $this->field_values = array();
     foreach ($values as $result) {
-      if (isset($result->{$this->field_alias})) {
+        if (isset($result->{$this->field_alias})) {
         $vids[] = $result->{$this->field_alias};
-      }
+        }
     }
 
     // It may happend that the multiple values field is related to a non
     // required relation for which no node data related to the field being
     // processed here is available.
     if (empty($vids)) {
-      return parent::pre_render($values);
+        return parent::pre_render($values);
     }
 
     // List columns to retrieve.
     $alias = content_views_tablename($field);
     // Prefix aliases with '_' to avoid clashing with field columns names.
     $query_columns = array(
-      'vid AS _vid',
-      "delta as _delta",
-      // nid is needed to generate the links for 'link to node' option.
-      'nid AS _nid',
+        'vid AS _vid',
+        "delta as _delta",
+        // nid is needed to generate the links for 'link to node' option.
+        'nid AS _nid',
     );
     // The actual field columns.
     foreach ($db_info['columns'] as $column => $attributes) {
-      $query_columns[] = "$attributes[column] AS $column";
+        $query_columns[] = "$attributes[column] AS $column";
     }
     $query = 'SELECT '. implode(', ', $query_columns) .
-             ' FROM {'. $db_info['table'] ."}".
-             " WHERE vid IN (". implode(',', $vids) .')'.
-             " ORDER BY _nid ASC, _delta ". ($options['multiple']['multiple_reversed'] ? 'DESC' : 'ASC');
+                ' FROM {'. $db_info['table'] ."}".
+                " WHERE vid IN (". implode(',', $vids) .')'.
+                " ORDER BY _nid ASC, _delta ". ($options['multiple']['multiple_reversed'] ? 'DESC' : 'ASC');
     $result = db_query($query);
 
     while ($item = db_fetch_array($result)) {
-      // Clean up the $item from vid and delta. We keep nid for now.
-      $vid = $item['_vid'];
-      unset($item['_vid']);
-      $delta = !empty($item['_delta']) ? $item['_delta'] : 0;
-      $item['#delta'] = $item['_delta'];
-      unset($item['_delta']);
-      $this->field_values[$vid][$delta] = $item;
+        // Clean up the $item from vid and delta. We keep nid for now.
+        $vid = $item['_vid'];
+        unset($item['_vid']);
+        $delta = !empty($item['_delta']) ? $item['_delta'] : 0;
+        $item['#delta'] = $item['_delta'];
+        unset($item['_delta']);
+        $this->field_values[$vid][$delta] = $item;
     }
-  }
-
-  /**
-   * Return DIV or SPAN based upon the field's element type.
-   *
-   * Fields rendered with the 'group multiple' option use <div> markers,
-   * and thus shouldn't be wrapped in a <span>.
-   */
-  function element_type($none_supported = FALSE, $default_empty = FALSE) {
+    }
+
+    /**
+     * Return DIV or SPAN based upon the field's element type.
+     *
+     * Fields rendered with the 'group multiple' option use <div> markers,
+     * and thus shouldn't be wrapped in a <span>.
+     */
+    function element_type($none_supported = FALSE, $default_empty = FALSE) {
     // If this is not a grouped field, use the parent method.
     if (!$this->defer_query) {
-      return parent::element_type($none_supported, $default_empty);
+        return parent::element_type($none_supported, $default_empty);
     }
 
     // The 'element_type' property denotes Views 3.x ('semantic views'
     // functionnality). If the property is set, and not set to '' ("default"),
     // let the generic method handle the output.
     if (isset($this->options['element_type']) && $this->options['element_type'] !== '') {
-      return parent::element_type($none_supported, $default_empty);
+        return parent::element_type($none_supported, $default_empty);
     }
 
     if ($default_empty) {
-      return '';
+        return '';
     }
 
     if (isset($this->definition['element type'])) {
-      return $this->definition['element type'];
+        return $this->definition['element type'];
     }
 
     return 'div';
-  }
+    }
 
-  function render($values) {
+    function render($values) {
     // If this is not a grouped field, use content_handler_field::render().
     if (!$this->defer_query) {
-      return parent::render($values);
+        return parent::render($values);
     }
 
     // We're down to a single node here, so we can retrieve the actual field
@@ -228,95 +228,95 @@ 
     // If the field does not appear in the node type, then we have no value
     // to display, and can just return.
     if (empty($field)) {
-      return '';
+        return '';
     }
 
     $options = $this->options;
 
     $vid = $values->{$this->field_alias};
     if (isset($this->field_values[$vid])) {
-      // Gather items, respecting the 'Display n values starting from m' settings.
-      $count_skipped = 0;
-      $items = array();
-      foreach ($this->field_values[$vid] as $item) {
+        // Gather items, respecting the 'Display n values starting from m' settings.
+        $count_skipped = 0;
+        $items = array();
+        foreach ($this->field_values[$vid] as $item) {
         if (empty($options['multiple']['multiple_from']) || ($count_skipped >= $options['multiple']['multiple_from'])) {
-          if (empty($options['multiple']['multiple_number']) || (count($items) < $options['multiple']['multiple_number'])) {
+            if (empty($options['multiple']['multiple_number']) || (count($items) < $options['multiple']['multiple_number'])) {
             // Grab the nid - needed for render_link().
             $nid = $item['_nid'];
             unset($item['_nid']);
             $items[] = $item;
-          }
-          else {
+            }
+            else {
             break;
-          }
+            }
         }
         $count_skipped++;
-      }
-
-      // Build a pseudo-node from the retrieved values.
-      $node = drupal_clone($values);
-      // content_format and formatters will need a 'type'.
-      $node->type = $values->{$this->aliases['type']};
-      $node->nid = $values->{$this->aliases['nid']};
-      $node->vid = $values->{$this->aliases['vid']};
-
-      // Some formatters need to behave differently depending on the build_mode
-      // (for instance: preview), so we provide one.
-      $node->build_mode = NODE_BUILD_NORMAL;
-
-      // Render items.
-      $formatter_name = $options['format'];
-      if ($items && ($formatter = _content_get_formatter($formatter_name, $field['type']))) {
+        }
+
+        // Build a pseudo-node from the retrieved values.
+        $node = drupal_clone($values);
+        // content_format and formatters will need a 'type'.
+        $node->type = $values->{$this->aliases['type']};
+        $node->nid = $values->{$this->aliases['nid']};
+        $node->vid = $values->{$this->aliases['vid']};
+
+        // Some formatters need to behave differently depending on the build_mode
+        // (for instance: preview), so we provide one.
+        $node->build_mode = NODE_BUILD_NORMAL;
+
+        // Render items.
+        $formatter_name = $options['format'];
+        if ($items && ($formatter = _content_get_formatter($formatter_name, $field['type']))) {
         $rendered = array();
         if (content_handle('formatter', 'multiple values', $formatter) == CONTENT_HANDLE_CORE) {
-          // Single-value formatter.
-          foreach ($items as $item) {
+            // Single-value formatter.
+            foreach ($items as $item) {
             $output = content_format($field, $item, $formatter_name, $node);
             if (!empty($output)) {
-              $rendered[] = $this->render_link($output, (object) array('nid' => $nid));
+                $rendered[] = $this->render_link($output, (object) array('nid' => $nid));
+            }
             }
-          }
         }
         else {
-          // Multiple values formatter.
-          $output = content_format($field, $items, $formatter_name, $values);
-          if (!empty($output)) {
+            // Multiple values formatter.
+            $output = content_format($field, $items, $formatter_name, $values);
+            if (!empty($output)) {
             $rendered[] = $this->render_link($output, (object) array('nid' => $nid));
-          }
+            }
         }
 
         if (count($rendered) > 1) {
-          // TODO: could we use generic field display ?
-          return theme('content_view_multiple_field', $rendered, $field, $values);
+            // TODO: could we use generic field display ?
+            return theme('content_view_multiple_field', $rendered, $field, $values);
         }
         elseif ($rendered) {
-          return $rendered[0];
+            return $rendered[0];
+        }
         }
-      }
     }
 
     return '';
-  }
+    }
 
-  function render_link($data, $values) {
+    function render_link($data, $values) {
     if (!$this->defer_query) {
-      return parent::render_link($data, $values);
+        return parent::render_link($data, $values);
     }
 
     if (!empty($this->options['link_to_node']) && $data !== NULL && $data !== '') {
-      if (method_exists('render_as_link', 'views_handler_field')) {
+        if (method_exists('render_as_link', 'views_handler_field')) {
         // Views 2.3+
         $this->options['alter']['make_link'] = TRUE;
         $this->options['alter']['path'] = "node/" . $values->{$this->aliases['nid']};
-      }
-      else {
+        }
+        else {
         // Views up to 2.2
         return l($data, "node/" . $values->nid, array('html' => TRUE));
-      }
+        }
     }
     else {
-      return $data;
+        return $data;
+    }
     }
-  }
 
 }

Spacing +8 added lines, -8 removed lines

@@ -168,10 +168,10 @@ 
     foreach ($db_info['columns'] as $column => $attributes) {
       $query_columns[] = "$attributes[column] AS $column";
     }
-    $query = 'SELECT '. implode(', ', $query_columns) .
-             ' FROM {'. $db_info['table'] ."}".
-             " WHERE vid IN (". implode(',', $vids) .')'.
-             " ORDER BY _nid ASC, _delta ". ($options['multiple']['multiple_reversed'] ? 'DESC' : 'ASC');
+    $query = 'SELECT '.implode(', ', $query_columns).
+             ' FROM {'.$db_info['table']."}".
+             " WHERE vid IN (".implode(',', $vids).')'.
+             " ORDER BY _nid ASC, _delta ".($options['multiple']['multiple_reversed'] ? 'DESC' : 'ASC');
     $result = db_query($query);
 
     while ($item = db_fetch_array($result)) {
@@ -273,7 +273,7 @@ 
           foreach ($items as $item) {
             $output = content_format($field, $item, $formatter_name, $node);
             if (!empty($output)) {
-              $rendered[] = $this->render_link($output, (object) array('nid' => $nid));
+              $rendered[] = $this->render_link($output, (object)array('nid' => $nid));
             }
           }
         }
@@ -281,7 +281,7 @@ 
           // Multiple values formatter.
           $output = content_format($field, $items, $formatter_name, $values);
           if (!empty($output)) {
-            $rendered[] = $this->render_link($output, (object) array('nid' => $nid));
+            $rendered[] = $this->render_link($output, (object)array('nid' => $nid));
           }
         }
 
@@ -307,11 +307,11 @@ 
       if (method_exists('render_as_link', 'views_handler_field')) {
         // Views 2.3+
         $this->options['alter']['make_link'] = TRUE;
-        $this->options['alter']['path'] = "node/" . $values->{$this->aliases['nid']};
+        $this->options['alter']['path'] = "node/".$values->{$this->aliases['nid']};
       }
       else {
         // Views up to 2.2
-        return l($data, "node/" . $values->nid, array('html' => TRUE));
+        return l($data, "node/".$values->nid, array('html' => TRUE));
       }
     }
     else {

Braces +6 added lines, -12 removed lines

@@ -29,8 +29,7 @@ 
       );
       if ($view->base_table == 'node_revisions') {
         $this->additional_fields['vid'] = array('table' => 'node_revisions', 'field' => 'vid');
-      }
-      else {
+      } else {
         $this->additional_fields['vid'] = array('table' => 'node', 'field' => 'vid');
       }
     }
@@ -245,8 +244,7 @@ 
             $nid = $item['_nid'];
             unset($item['_nid']);
             $items[] = $item;
-          }
-          else {
+          } else {
             break;
           }
         }
@@ -276,8 +274,7 @@ 
               $rendered[] = $this->render_link($output, (object) array('nid' => $nid));
             }
           }
-        }
-        else {
+        } else {
           // Multiple values formatter.
           $output = content_format($field, $items, $formatter_name, $values);
           if (!empty($output)) {
@@ -288,8 +285,7 @@ 
         if (count($rendered) > 1) {
           // TODO: could we use generic field display ?
           return theme('content_view_multiple_field', $rendered, $field, $values);
-        }
-        elseif ($rendered) {
+        } elseif ($rendered) {
           return $rendered[0];
         }
       }
@@ -308,13 +304,11 @@ 
         // Views 2.3+
         $this->options['alter']['make_link'] = TRUE;
         $this->options['alter']['path'] = "node/" . $values->{$this->aliases['nid']};
-      }
-      else {
+      } else {
         // Views up to 2.2
         return l($data, "node/" . $values->nid, array('html' => TRUE));
       }
-    }
-    else {
+    } else {
       return $data;
     }
   }

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

@@ -41,10 +41,10 @@ 
 
     $options['multiple'] = array(
       'contains' => array(
-        'group' => array('default' => TRUE),
+        'group' => array('default' => true),
         'multiple_number' => array('default' => ''),
         'multiple_from' => array('default' => ''),
-        'multiple_reversed' => array('default' => FALSE),
+        'multiple_reversed' => array('default' => false),
       ),
     );
 
@@ -81,7 +81,7 @@ 
       '#default_value' => $options['multiple']['multiple_number'],
       '#prefix' => '<div class="container-inline">',
       '#process' => array('views_process_dependency'),
-      '#dependency' => array('edit-options-multiple-group' => array(TRUE)),
+      '#dependency' => array('edit-options-multiple-group' => array(true)),
     );
     list($prefix, $suffix) = explode('@count', t('starting from @count'));
     $form['multiple']['multiple_from'] = array(
@@ -91,7 +91,7 @@ 
       '#field_suffix' => $suffix,
       '#default_value' => $options['multiple']['multiple_from'],
       '#process' => array('views_process_dependency'),
-      '#dependency' => array('edit-options-multiple-group' => array(TRUE)),
+      '#dependency' => array('edit-options-multiple-group' => array(true)),
       '#description' => t('(first item is 0)'),
     );
     $form['multiple']['multiple_reversed'] = array(
@@ -100,7 +100,7 @@ 
       '#default_value' => $options['multiple']['multiple_reversed'],
       '#suffix' => '</div>',
       '#process' => array('views_process_dependency'),
-      '#dependency' => array('edit-options-multiple-group' => array(TRUE)),
+      '#dependency' => array('edit-options-multiple-group' => array(true)),
       '#description' => t('(start from last values)'),
     );
   }
@@ -191,7 +191,7 @@ 
    * Fields rendered with the 'group multiple' option use <div> markers,
    * and thus shouldn't be wrapped in a <span>.
    */
-  function element_type($none_supported = FALSE, $default_empty = FALSE) {
+  function element_type($none_supported = false, $default_empty = false) {
     // If this is not a grouped field, use the parent method.
     if (!$this->defer_query) {
       return parent::element_type($none_supported, $default_empty);
@@ -303,15 +303,15 @@ 
       return parent::render_link($data, $values);
     }
 
-    if (!empty($this->options['link_to_node']) && $data !== NULL && $data !== '') {
+    if (!empty($this->options['link_to_node']) && $data !== null && $data !== '') {
       if (method_exists('render_as_link', 'views_handler_field')) {
         // Views 2.3+
-        $this->options['alter']['make_link'] = TRUE;
+        $this->options['alter']['make_link'] = true;
         $this->options['alter']['path'] = "node/" . $values->{$this->aliases['nid']};
       }
       else {
         // Views up to 2.2
-        return l($data, "node/" . $values->nid, array('html' => TRUE));
+        return l($data, "node/" . $values->nid, array('html' => true));
       }
     }
     else {

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_plugin_display_simple.inc

Indentation +16 added lines, -16 removed lines

@@ -6,38 +6,38 @@
  * Handler for 'content_simple' display.
  */
 class content_plugin_display_simple extends views_plugin_display {
-  function execute() {
+    function execute() {
     return $this->view->render($this->display->id);
-  }
+    }
 
-  function render() {
+    function render() {
     return !empty($this->view->result) || !empty($this->view->style_plugin->definition['even empty']) ? $this->view->style_plugin->render($this->view->result) : '';
-  }
+    }
 
-  function uses_exposed() {
+    function uses_exposed() {
     return FALSE;
-  }
+    }
 }
 
 class content_plugin_display_references extends content_plugin_display_simple {
-  function query() {
+    function query() {
     $options = $this->get_option('content_options');
 
     if ($options['string'] !== '') {
-      $like = $GLOBALS["db_type"] == 'pgsql' ? "ILIKE" : "LIKE";
-      $match_clauses = array(
+        $like = $GLOBALS["db_type"] == 'pgsql' ? "ILIKE" : "LIKE";
+        $match_clauses = array(
         'contains' => "$like '%%%s%%'",
         'equals' => "= '%s'",
         'starts_with' => "$like '%s%%'",
-      );
-      $clause = isset($match_clauses[$options['match']]) ? $match_clauses[$options['match']] : $match_clauses['contains'];
-      $alias = $this->view->query->ensure_table($options['table']);
-      $this->view->query->add_where(NULL, "$alias.$options[field_string] $clause", $options['string']);
+        );
+        $clause = isset($match_clauses[$options['match']]) ? $match_clauses[$options['match']] : $match_clauses['contains'];
+        $alias = $this->view->query->ensure_table($options['table']);
+        $this->view->query->add_where(NULL, "$alias.$options[field_string] $clause", $options['string']);
     }
     elseif ($options['ids']) {
-      $alias = $this->view->query->ensure_table($options['table']);
-      $this->view->query->add_where(NULL, "$alias.$options[field_id] IN (" . db_placeholders($options['ids']) . ')', $options['ids']);
+        $alias = $this->view->query->ensure_table($options['table']);
+        $this->view->query->add_where(NULL, "$alias.$options[field_id] IN (" . db_placeholders($options['ids']) . ')', $options['ids']);
+    }
     }
-  }
 }
 

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     }
     elseif ($options['ids']) {
       $alias = $this->view->query->ensure_table($options['table']);
-      $this->view->query->add_where(NULL, "$alias.$options[field_id] IN (" . db_placeholders($options['ids']) . ')', $options['ids']);
+      $this->view->query->add_where(NULL, "$alias.$options[field_id] IN (".db_placeholders($options['ids']).')', $options['ids']);
     }
   }
 }

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
       $clause = isset($match_clauses[$options['match']]) ? $match_clauses[$options['match']] : $match_clauses['contains'];
       $alias = $this->view->query->ensure_table($options['table']);
       $this->view->query->add_where(NULL, "$alias.$options[field_string] $clause", $options['string']);
-    }
-    elseif ($options['ids']) {
+    } elseif ($options['ids']) {
       $alias = $this->view->query->ensure_table($options['table']);
       $this->view->query->add_where(NULL, "$alias.$options[field_id] IN (" . db_placeholders($options['ids']) . ')', $options['ids']);
     }

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

@@ -15,7 +15,7 @@ 
   }
 
   function uses_exposed() {
-    return FALSE;
+    return false;
   }
 }
 
@@ -32,11 +32,11 @@ 
       );
       $clause = isset($match_clauses[$options['match']]) ? $match_clauses[$options['match']] : $match_clauses['contains'];
       $alias = $this->view->query->ensure_table($options['table']);
-      $this->view->query->add_where(NULL, "$alias.$options[field_string] $clause", $options['string']);
+      $this->view->query->add_where(null, "$alias.$options[field_string] $clause", $options['string']);
     }
     elseif ($options['ids']) {
       $alias = $this->view->query->ensure_table($options['table']);
-      $this->view->query->add_where(NULL, "$alias.$options[field_id] IN (" . db_placeholders($options['ids']) . ')', $options['ids']);
+      $this->view->query->add_where(null, "$alias.$options[field_id] IN (" . db_placeholders($options['ids']) . ')', $options['ids']);
     }
   }
 }

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_field.inc

Indentation +91 added lines, -91 removed lines

@@ -11,27 +11,27 @@ 
  * content_handler_field_multiple.
  */
 class content_handler_field extends views_handler_field_node {
-  var $content_field;
+    var $content_field;
 
-  function construct() {
+    function construct() {
     parent::construct();
     $this->content_field = content_fields($this->definition['content_field_name']);
-  }
+    }
 
-  function init(&$view, $options) {
+    function init(&$view, $options) {
     $field = $this->content_field;
     parent::init($view, $options);
     if ($field['multiple']) {
-      $this->additional_fields['delta'] = 'delta';
+        $this->additional_fields['delta'] = 'delta';
     }
     // Make sure we grab enough information to build a pseudo-node with enough
     // credentials at render-time.
     $this->additional_fields['type'] = array('table' => 'node', 'field' => 'type');
     $this->additional_fields['nid'] = array('table' => 'node', 'field' => 'nid');
     $this->additional_fields['vid'] = array('table' => 'node', 'field' => 'vid');
-  }
+    }
 
-  function option_definition() {
+    function option_definition() {
     $options = parent::option_definition();
     $field = $this->content_field;
 
@@ -41,12 +41,12 @@ 
     $options['format'] = array('default' => 'default');
 
     return $options;
-  }
+    }
 
-  /**
-   * Provide formatter option.
-   */
-  function options_form(&$form, &$form_state) {
+    /**
+     * Provide formatter option.
+     */
+    function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
     // TODO: do we want the 'link to node' checkbox ?
     // That's usually formatters business...
@@ -55,102 +55,102 @@ 
     $options = $this->options;
 
     $form['label_type'] = array(
-      '#title' => t('Label'),
-      '#type' => 'radios',
-      '#options' => array(
+        '#title' => t('Label'),
+        '#type' => 'radios',
+        '#options' => array(
         'none' => t('None'),
         'widget' => t('Widget label (@label)', array('@label' => $field['widget']['label'])),
         'custom' => t('Custom'),
-      ),
-      '#default_value' => $options['label_type'],
-      '#weight' => 2,
+        ),
+        '#default_value' => $options['label_type'],
+        '#weight' => 2,
     );
     $form['label'] = array(
-      '#title' => t('Custom label'),
-      '#type' => 'textfield',
-      '#default_value' => $options['label'],
-      '#process' => array('views_process_dependency'),
-      '#dependency' => array('radio:options[label_type]' => array('custom')),
-      '#weight' => 3,
-     );
+        '#title' => t('Custom label'),
+        '#type' => 'textfield',
+        '#default_value' => $options['label'],
+        '#process' => array('views_process_dependency'),
+        '#dependency' => array('radio:options[label_type]' => array('custom')),
+        '#weight' => 3,
+        );
 
     $field_types = _content_field_types();
     $formatters = array();
     if (is_array($field_types[$field['type']]['formatters'])) {
-      foreach ($field_types[$field['type']]['formatters'] as $name => $info) {
+        foreach ($field_types[$field['type']]['formatters'] as $name => $info) {
         $formatters[$name] = $info['label'];
-      }
+        }
     }
     $form['format'] = array(
-      '#title' => t('Format'),
-      '#type' => 'select',
-      '#options' => $formatters,
-      '#required' => TRUE,
-      '#default_value' => $options['format'],
-      '#weight' => 4,
+        '#title' => t('Format'),
+        '#type' => 'select',
+        '#options' => $formatters,
+        '#required' => TRUE,
+        '#default_value' => $options['format'],
+        '#weight' => 4,
     );
-  }
-
-
-  /**
-   * Make sure some value is stored as a label.
-   *
-   * Don't use t(), since Views' views_handler_field already has
-   * $this->options['label'] marked as a translatable field.
-   *
-   * @see http://drupal.org/node/285470
-   */
-  function options_submit($form, &$form_state) {
+    }
+
+
+    /**
+     * Make sure some value is stored as a label.
+     *
+     * Don't use t(), since Views' views_handler_field already has
+     * $this->options['label'] marked as a translatable field.
+     *
+     * @see http://drupal.org/node/285470
+     */
+    function options_submit($form, &$form_state) {
     switch ($form_state['values']['options']['label_type']) {
-      case 'none':
+        case 'none':
         $form_state['values']['options']['label'] = '';
         break;
-      case 'widget':
+        case 'widget':
         $form_state['values']['options']['label'] = $this->content_field['widget']['label'];
         break;
     }
-  }
-
-  /**
-   * @TODO
-   * Now that we save the label in the submit process above we could
-   * get rid of this function. Leave it here for now to be sure the
-   * label works for fields that haven't been updated since this
-   * change was made, since $this->options['label'] will be missing a
-   * value until it is updated in the view.
-   *
-   * Don't use t(), since Views' views_handler_field already has
-   * $this->options['label'] marked as a translatable field.
-   */
-  function label() {
+    }
+
+    /**
+     * @TODO
+     * Now that we save the label in the submit process above we could
+     * get rid of this function. Leave it here for now to be sure the
+     * label works for fields that haven't been updated since this
+     * change was made, since $this->options['label'] will be missing a
+     * value until it is updated in the view.
+     *
+     * Don't use t(), since Views' views_handler_field already has
+     * $this->options['label'] marked as a translatable field.
+     */
+    function label() {
     $field = $this->content_field;
     switch ($this->options['label_type']) {
-      case 'none':
+        case 'none':
         return '';
-      case 'widget':
+        case 'widget':
         return $field['widget']['label'];
-      default:
+        default:
         return $this->options['label'];
     }
-  }
+    }
 
-  /**
-   * Return DIV or SPAN based upon the field's element type.
-   */
-  function element_type($none_supported = FALSE, $default_empty = FALSE) {
+    /**
+     * Return DIV or SPAN based upon the field's element type.
+     */
+    function element_type($none_supported = FALSE, $default_empty = FALSE) {
     // The 'element_type' property denotes Views 3.x ('semantic views'
     // functionnality). If the property is set, and not set to '' ("default"),
     // let the generic method handle the output.
     if (isset($this->options['element_type']) && $this->options['element_type'] !== '') {
-      return parent::element_type($none_supported, $default_empty);
+        return parent::element_type($none_supported, $default_empty);
     }
 
     if ($default_empty) {
-      return '';
+        return '';
     }
 
     if (isset($this->definition['element type'])) {
-      return $this->definition['element type'];
+        return $this->definition['element type'];
     }
 
     // TODO Figure out exactly when to return a div or a <span>. Any field
@@ -159,28 +159,28 @@ 
     // Earl says we need to be sure that other fields we don't know
     // about won't end up wrapping a span around a block-level element.
     if ($this->content_field['widget']['type'] == 'text_textarea') {
-      return 'div';
+        return 'div';
     }
     else {
-      return 'span';
+        return 'span';
+    }
     }
-  }
 
-  function options_validate($form, &$form_state) { }
+    function options_validate($form, &$form_state) { }
 
-  /**
-   * Provide text for the administrative summary
-   */
-  function admin_summary() {
+    /**
+     * Provide text for the administrative summary
+     */
+    function admin_summary() {
     // Display the formatter name.
     $field = $this->content_field;
     $field_types = _content_field_types();
     if (isset($field_types[$field['type']]['formatters'][$this->options['format']])) {
-      return t($field_types[$field['type']]['formatters'][$this->options['format']]['label']);
+        return t($field_types[$field['type']]['formatters'][$this->options['format']]['label']);
+    }
     }
-  }
 
-  function render($values) {
+    function render($values) {
     // We're down to a single node here, so we can retrieve the actual field
     // definition for the node type being considered.
     $field = content_fields($this->content_field['field_name'], $values->{$this->aliases['type']});
@@ -188,7 +188,7 @@ 
     // If the field does not appear in the node type, then we have no value
     // to display, and can just return.
     if (empty($field)) {
-      return '';
+        return '';
     }
 
     $options = $this->options;
@@ -205,7 +205,7 @@ 
 
     $item = array();
     foreach ($db_info['columns'] as $column => $attributes) {
-      $item[$column] = $values->{$this->aliases[$attributes['column']]};
+        $item[$column] = $values->{$this->aliases[$attributes['column']]};
     }
 
     $item['#delta'] = $field['multiple'] ?  $values->{$this->aliases['delta']} : 0;
@@ -213,17 +213,17 @@ 
     // Render items.
     $formatter_name = $options['format'];
     if ($formatter = _content_get_formatter($formatter_name, $field['type'])) {
-      if (content_handle('formatter', 'multiple values', $formatter) == CONTENT_HANDLE_CORE) {
+        if (content_handle('formatter', 'multiple values', $formatter) == CONTENT_HANDLE_CORE) {
         // Single-value formatter.
         $output = content_format($field, $item, $formatter_name, $node);
-      }
-      else {
+        }
+        else {
         // Multiple values formatter - we actually have only one value to display.
         $output = content_format($field, array($item), $formatter_name, $node);
-      }
-      return $this->render_link($output, $values);
+        }
+        return $this->render_link($output, $values);
     }
     return '';
-  }
+    }
 
 }

Switch Indentation +12 added lines, -12 removed lines

@@ -102,12 +102,12 @@ 
    */
   function options_submit($form, &$form_state) {
     switch ($form_state['values']['options']['label_type']) {
-      case 'none':
-        $form_state['values']['options']['label'] = '';
-        break;
-      case 'widget':
-        $form_state['values']['options']['label'] = $this->content_field['widget']['label'];
-        break;
+    case 'none':
+      $form_state['values']['options']['label'] = '';
+      break;
+    case 'widget':
+      $form_state['values']['options']['label'] = $this->content_field['widget']['label'];
+      break;
     }
   }
 
@@ -125,12 +125,12 @@ 
   function label() {
     $field = $this->content_field;
     switch ($this->options['label_type']) {
-      case 'none':
-        return '';
-      case 'widget':
-        return $field['widget']['label'];
-      default:
-        return $this->options['label'];
+    case 'none':
+      return '';
+    case 'widget':
+      return $field['widget']['label'];
+    default:
+      return $this->options['label'];
     }
   }
 

Spacing +1 added lines, -1 removed lines

@@ -208,7 +208,7 @@
       $item[$column] = $values->{$this->aliases[$attributes['column']]};
     }
 
-    $item['#delta'] = $field['multiple'] ?  $values->{$this->aliases['delta']} : 0;
+    $item['#delta'] = $field['multiple'] ? $values->{$this->aliases['delta']} : 0;
 
     // Render items.
     $formatter_name = $options['format'];

Braces +2 added lines, -4 removed lines

@@ -160,8 +160,7 @@ 
     // about won't end up wrapping a span around a block-level element.
     if ($this->content_field['widget']['type'] == 'text_textarea') {
       return 'div';
-    }
-    else {
+    } else {
       return 'span';
     }
   }
@@ -216,8 +215,7 @@ 
       if (content_handle('formatter', 'multiple values', $formatter) == CONTENT_HANDLE_CORE) {
         // Single-value formatter.
         $output = content_format($field, $item, $formatter_name, $node);
-      }
-      else {
+      } else {
         // Multiple values formatter - we actually have only one value to display.
         $output = content_format($field, array($item), $formatter_name, $node);
       }

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

@@ -36,7 +36,7 @@ 
     $field = $this->content_field;
 
     // Override views_handler_field_node's default label
-    $options['label'] = array('default' => '', 'translatable' => TRUE);
+    $options['label'] = array('default' => '', 'translatable' => true);
     $options['label_type'] = array('default' => 'widget');
     $options['format'] = array('default' => 'default');
 
@@ -85,7 +85,7 @@ 
       '#title' => t('Format'),
       '#type' => 'select',
       '#options' => $formatters,
-      '#required' => TRUE,
+      '#required' => true,
       '#default_value' => $options['format'],
       '#weight' => 4,
     );
@@ -137,7 +137,7 @@ 
   /**
    * Return DIV or SPAN based upon the field's element type.
    */
-  function element_type($none_supported = FALSE, $default_empty = FALSE) {
+  function element_type($none_supported = false, $default_empty = false) {
     // The 'element_type' property denotes Views 3.x ('semantic views'
     // functionnality). If the property is set, and not set to '' ("default"),
     // let the generic method handle the output.

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) {