BOINC / boinc

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

Indentation +931 added lines, -931 removed lines

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

Switch Indentation +340 added lines, -340 removed lines

@@ -17,19 +17,19 @@ 
 
 function content_help($path, $arg) {
   switch ($path) {
-    case 'admin/help#content':
-      $output = '<p>'. t('The content module, a required component of the Content Construction Kit (CCK), allows administrators to associate custom fields with content types. In Drupal, content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Using the content module (and the other helper modules included in CCK), custom fields beyond the default "Title" and "Body" may be added. CCK features are accessible through tabs on the <a href="@content-types">content types administration page</a>. (See the <a href="@node-help">node module help page</a> for more information about content types.)', array('@content-types' => url('admin/content/types'), '@node-help' => url('admin/help/node'))) .'</p>';
-      $output .= '<p>'. t('When adding a custom field to a content type, you determine its type (whether it will contain text, numbers, or references to other objects) and how it will be displayed (either as a text field or area, a select box, checkbox, radio button, or autocompleting field). A field may have multiple values (i.e., a "person" may have multiple e-mail addresses) or a single value (i.e., an "employee" has a single employee identification number). As you add and edit fields, CCK automatically adjusts the structure of the database as necessary. CCK also provides a number of other features, including intelligent caching for your custom data, an import and export facility for content type definitions, and integration with other contributed modules.') .'</p>';
-      $output .= '<p>'. t('Custom field types are provided by a set of optional modules included with CCK (each module provides a different type). The <a href="@modules">modules page</a> allows you to enable or disable CCK components. A default installation of CCK includes:', array('@modules' => url('admin/build/modules'))) .'</p>';
-      $output .= '<ul>';
-      $output .= '<li>'. t('<em>number</em>, which adds numeric field types, in integer, decimal or floating point form. You may define a set of allowed inputs, or specify an allowable range of values. A variety of common formats for displaying numeric data are available.') .'</li>';
-      $output .= '<li>'. t("<em>text</em>, which adds text field types. A text field may contain plain text only, or optionally, may use Drupal's input format filters to securely manage rich text input. Text input fields may be either a single line (text field), multiple lines (text area), or for greater input control, a select box, checkbox, or radio buttons. If desired, CCK can validate the input to a set of allowed values.") .'</li>';
-      $output .= '<li>'. t('<em>nodereference</em>, which creates custom references between Drupal nodes. By adding a <em>nodereference</em> field and two different content types, for instance, you can easily create complex parent/child relationships between data (multiple "employee" nodes may contain a <em>nodereference</em> field linking to an "employer" node).') .'</li>';
-      $output .= '<li>'. t('<em>userreference</em>, which creates custom references to your sites\' user accounts. By adding a <em>userreference</em> field, you can create complex relationships between your site\'s users and posts. To track user involvement in a post beyond Drupal\'s standard <em>Authored by</em> field, for instance, add a <em>userreference</em> field named "Edited by" to a content type to store a link to an editor\'s user account page.') .'</li>';
-      $output .= '<li>'. t('<em>fieldgroup</em>, which creates collapsible fieldsets to hold a group of related fields. A fieldset may either be open or closed by default. The order of your fieldsets, and the order of fields within a fieldset, is managed via a drag-and-drop interface provided by content module.') .'</li>';
-      $output .= '</ul>';
-      $output .= '<p>'. t('For more information, see the online handbook entry for <a href="@handbook-cck">CCK</a> or the <a href="@project-cck">CCK project page</a>.', array('@handbook-cck' => 'http://drupal.org/handbook/modules/cck', '@project-cck' => 'http://drupal.org/project/cck')) .'</p>';
-      return $output;
+  case 'admin/help#content':
+    $output = '<p>'. t('The content module, a required component of the Content Construction Kit (CCK), allows administrators to associate custom fields with content types. In Drupal, content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Using the content module (and the other helper modules included in CCK), custom fields beyond the default "Title" and "Body" may be added. CCK features are accessible through tabs on the <a href="@content-types">content types administration page</a>. (See the <a href="@node-help">node module help page</a> for more information about content types.)', array('@content-types' => url('admin/content/types'), '@node-help' => url('admin/help/node'))) .'</p>';
+    $output .= '<p>'. t('When adding a custom field to a content type, you determine its type (whether it will contain text, numbers, or references to other objects) and how it will be displayed (either as a text field or area, a select box, checkbox, radio button, or autocompleting field). A field may have multiple values (i.e., a "person" may have multiple e-mail addresses) or a single value (i.e., an "employee" has a single employee identification number). As you add and edit fields, CCK automatically adjusts the structure of the database as necessary. CCK also provides a number of other features, including intelligent caching for your custom data, an import and export facility for content type definitions, and integration with other contributed modules.') .'</p>';
+    $output .= '<p>'. t('Custom field types are provided by a set of optional modules included with CCK (each module provides a different type). The <a href="@modules">modules page</a> allows you to enable or disable CCK components. A default installation of CCK includes:', array('@modules' => url('admin/build/modules'))) .'</p>';
+    $output .= '<ul>';
+    $output .= '<li>'. t('<em>number</em>, which adds numeric field types, in integer, decimal or floating point form. You may define a set of allowed inputs, or specify an allowable range of values. A variety of common formats for displaying numeric data are available.') .'</li>';
+    $output .= '<li>'. t("<em>text</em>, which adds text field types. A text field may contain plain text only, or optionally, may use Drupal's input format filters to securely manage rich text input. Text input fields may be either a single line (text field), multiple lines (text area), or for greater input control, a select box, checkbox, or radio buttons. If desired, CCK can validate the input to a set of allowed values.") .'</li>';
+    $output .= '<li>'. t('<em>nodereference</em>, which creates custom references between Drupal nodes. By adding a <em>nodereference</em> field and two different content types, for instance, you can easily create complex parent/child relationships between data (multiple "employee" nodes may contain a <em>nodereference</em> field linking to an "employer" node).') .'</li>';
+    $output .= '<li>'. t('<em>userreference</em>, which creates custom references to your sites\' user accounts. By adding a <em>userreference</em> field, you can create complex relationships between your site\'s users and posts. To track user involvement in a post beyond Drupal\'s standard <em>Authored by</em> field, for instance, add a <em>userreference</em> field named "Edited by" to a content type to store a link to an editor\'s user account page.') .'</li>';
+    $output .= '<li>'. t('<em>fieldgroup</em>, which creates collapsible fieldsets to hold a group of related fields. A fieldset may either be open or closed by default. The order of your fieldsets, and the order of fields within a fieldset, is managed via a drag-and-drop interface provided by content module.') .'</li>';
+    $output .= '</ul>';
+    $output .= '<p>'. t('For more information, see the online handbook entry for <a href="@handbook-cck">CCK</a> or the <a href="@project-cck">CCK project page</a>.', array('@handbook-cck' => 'http://drupal.org/handbook/modules/cck', '@project-cck' => 'http://drupal.org/project/cck')) .'</p>';
+    return $output;
   }
 }
 
@@ -553,27 +553,27 @@ 
  */
 function content_notify($op, $module) {
   switch ($op) {
-    case 'install':
-      content_clear_type_cache();
-      break;
-    case 'uninstall':
-      module_load_include('inc', 'content', 'includes/content.crud');
-      content_module_delete($module);
-      break;
-    case 'enable':
-      content_associate_fields($module);
-      content_clear_type_cache();
-      break;
-    case 'disable':
-      // When CCK modules are disabled before content module's update is run
-      // to add the active column, we can't do this.
-      if (variable_get('content_schema_version', -1) < 6007) {
-        return FALSE;
-      }
-      db_query("UPDATE {". content_field_tablename() ."} SET active=0 WHERE module='%s'", $module);
-      db_query("UPDATE {". content_instance_tablename() ."} SET widget_active=0 WHERE widget_module='%s'", $module);
-      content_clear_type_cache(TRUE);
-      break;
+  case 'install':
+    content_clear_type_cache();
+    break;
+  case 'uninstall':
+    module_load_include('inc', 'content', 'includes/content.crud');
+    content_module_delete($module);
+    break;
+  case 'enable':
+    content_associate_fields($module);
+    content_clear_type_cache();
+    break;
+  case 'disable':
+    // When CCK modules are disabled before content module's update is run
+    // to add the active column, we can't do this.
+    if (variable_get('content_schema_version', -1) < 6007) {
+      return FALSE;
+    }
+    db_query("UPDATE {". content_field_tablename() ."} SET active=0 WHERE module='%s'", $module);
+    db_query("UPDATE {". content_instance_tablename() ."} SET widget_active=0 WHERE widget_module='%s'", $module);
+    content_clear_type_cache(TRUE);
+    break;
   }
 }
 
@@ -685,38 +685,53 @@ 
  */
 function content_field($op, &$node, $field, &$items, $teaser, $page) {
   switch ($op) {
-    case 'validate':
-      // TODO: here we could validate that the number of multiple data is correct ?
-      // We're controlling the number of fields to fill out and saving empty
-      // ones if a specified number is requested, so no reason to do any validation
-      // here right now, but if later create a method to indicate whether
-      // 'required' means all values must be filled out, we can come back
-      // here and check that they're not empty.
-      break;
-
-    case 'presave':
-      if (!empty($node->devel_generate)) {
-        include_once('./'. drupal_get_path('module', 'content') .'/includes/content.devel.inc');
-        content_generate_fields($node, $field);
-        $items = $node->{$field['field_name']};
-      }
+  case 'validate':
+    // TODO: here we could validate that the number of multiple data is correct ?
+    // We're controlling the number of fields to fill out and saving empty
+    // ones if a specified number is requested, so no reason to do any validation
+    // here right now, but if later create a method to indicate whether
+    // 'required' means all values must be filled out, we can come back
+    // here and check that they're not empty.
+    break;
+
+  case 'presave':
+    if (!empty($node->devel_generate)) {
+      include_once('./'. drupal_get_path('module', 'content') .'/includes/content.devel.inc');
+      content_generate_fields($node, $field);
+      $items = $node->{$field['field_name']};
+    }
 
-      // Manual node_save calls might not have all fields filled in.
-      // On node insert, we need to make sure all tables get at least an empty
-      // record, or subsequent edits, using drupal_write_record() in update mode,
-      // won't insert any data.
-      // Missing fields on node update are handled in content_storage().
-      if (empty($items) && !isset($node->nid)) {
-        foreach (array_keys($field['columns']) as $column) {
-          $items[0][$column] = NULL;
-        }
-        $node->$field['field_name'] = $items;
+    // Manual node_save calls might not have all fields filled in.
+    // On node insert, we need to make sure all tables get at least an empty
+    // record, or subsequent edits, using drupal_write_record() in update mode,
+    // won't insert any data.
+    // Missing fields on node update are handled in content_storage().
+    if (empty($items) && !isset($node->nid)) {
+      foreach (array_keys($field['columns']) as $column) {
+        $items[0][$column] = NULL;
       }
+      $node->$field['field_name'] = $items;
+    }
 
-      // If there was an AHAH add more button in this field, don't save it.
-      // TODO: is it still needed ?
-      unset($items[$field['field_name'] .'_add_more']);
+    // If there was an AHAH add more button in this field, don't save it.
+    // TODO: is it still needed ?
+    unset($items[$field['field_name'] .'_add_more']);
+
+    if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
+      // Reorder items to account for drag-n-drop reordering.
+      $items = _content_sort_items($field, $items);
+    }
+
+    // Filter out empty values.
+    $items = content_set_empty($field, $items);
 
+    break;
+
+  case 'view':
+    $addition = array();
+
+    // Previewed nodes bypass the 'presave' op, so we need to some massaging.
+    if ($node->build_mode == NODE_BUILD_PREVIEW && content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
       if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
         // Reorder items to account for drag-n-drop reordering.
         $items = _content_sort_items($field, $items);
@@ -724,166 +739,151 @@ 
 
       // Filter out empty values.
       $items = content_set_empty($field, $items);
+    }
 
-      break;
-
-    case 'view':
-      $addition = array();
+    // NODE_BUILD_NORMAL is 0, and ('whatever' == 0) is TRUE, so we need a ===.
+    if ($node->build_mode === NODE_BUILD_NORMAL || $node->build_mode == NODE_BUILD_PREVIEW) {
+      $context = $teaser ? 'teaser' : 'full';
+    }
+    else {
+      $context = $node->build_mode;
+    }
+    // The field may be missing info for $contexts added by modules
+    // enabled after the field was last edited.
+    $formatter_name = isset($field['display_settings'][$context]) && isset($field['display_settings'][$context]['format']) ? $field['display_settings'][$context]['format'] : 'default';
+    if ($formatter = _content_get_formatter($formatter_name, $field['type'])) {
+      $theme = $formatter['module'] .'_formatter_'. $formatter_name;
+      $single = (content_handle('formatter', 'multiple values', $formatter) == CONTENT_HANDLE_CORE);
+
+      $label_display = isset($field['display_settings']['label']['format']) ? $field['display_settings']['label']['format'] : 'above';
+      // Do not include field labels when indexing content.
+      if ($context == NODE_BUILD_SEARCH_INDEX) {
+        $label_display = 'hidden';
+      }
 
-      // Previewed nodes bypass the 'presave' op, so we need to some massaging.
-      if ($node->build_mode == NODE_BUILD_PREVIEW && content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
-        if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
-          // Reorder items to account for drag-n-drop reordering.
-          $items = _content_sort_items($field, $items);
-        }
+      $element = array(
+        '#type' => 'content_field',
+        '#title' => check_plain(t($field['widget']['label'])),
+        '#field_name' => $field['field_name'],
+        '#access' => $formatter_name != 'hidden' && content_access('view', $field, NULL, $node),
+        '#label_display' => $label_display,
+        '#node' => $node,
+        '#teaser' => $teaser,
+        '#page' => $page,
+        '#context' => $context,
+        '#single' => $single,
+        'items' => array(),
+      );
 
-        // Filter out empty values.
-        $items = content_set_empty($field, $items);
+      // Fill-in items.
+      foreach ($items as $delta => $item) {
+        $element['items'][$delta] = array(
+          '#item' => $item,
+          '#weight' => $delta,
+        );
       }
 
-      // NODE_BUILD_NORMAL is 0, and ('whatever' == 0) is TRUE, so we need a ===.
-      if ($node->build_mode === NODE_BUILD_NORMAL || $node->build_mode == NODE_BUILD_PREVIEW) {
-        $context = $teaser ? 'teaser' : 'full';
+      // Append formatter information either on each item ('single-value' formatter)
+      // or at the upper 'items' level ('multiple-value' formatter)
+      $format_info = array(
+        '#theme' => $theme,
+        '#field_name' => $field['field_name'],
+        '#type_name' => $node->type,
+        '#formatter' => $formatter_name,
+        '#node' => $node,
+      );
+      if ($single) {
+        foreach ($items as $delta => $item) {
+          $element['items'][$delta] += $format_info;
+          $element['items'][$delta]['#item']['#delta'] = $delta;
+        }
       }
       else {
-        $context = $node->build_mode;
+        $element['items'] += $format_info;
       }
-      // The field may be missing info for $contexts added by modules
-      // enabled after the field was last edited.
-      $formatter_name = isset($field['display_settings'][$context]) && isset($field['display_settings'][$context]['format']) ? $field['display_settings'][$context]['format'] : 'default';
-      if ($formatter = _content_get_formatter($formatter_name, $field['type'])) {
-        $theme = $formatter['module'] .'_formatter_'. $formatter_name;
-        $single = (content_handle('formatter', 'multiple values', $formatter) == CONTENT_HANDLE_CORE);
-
-        $label_display = isset($field['display_settings']['label']['format']) ? $field['display_settings']['label']['format'] : 'above';
-        // Do not include field labels when indexing content.
-        if ($context == NODE_BUILD_SEARCH_INDEX) {
-          $label_display = 'hidden';
-        }
 
-        $element = array(
-          '#type' => 'content_field',
-          '#title' => check_plain(t($field['widget']['label'])),
-          '#field_name' => $field['field_name'],
-          '#access' => $formatter_name != 'hidden' && content_access('view', $field, NULL, $node),
-          '#label_display' => $label_display,
-          '#node' => $node,
-          '#teaser' => $teaser,
-          '#page' => $page,
-          '#context' => $context,
-          '#single' => $single,
-          'items' => array(),
-        );
+      // The wrapper lets us get the themed output for the whole field
+      // to populate the $FIELD_NAME_rendered variable for node templates,
+      // and hide it from the $content variable if needed.
+      // See 'preprocess_node' op and theme_content_field_wrapper()?
+      $wrapper = array(
+        'field' => $element,
+        '#weight' => $field['widget']['weight'],
+        '#post_render' => array('content_field_wrapper_post_render'),
+        '#field_name' => $field['field_name'],
+        '#type_name' => $node->type,
+        '#context' => $context,
+      );
 
-        // Fill-in items.
-        foreach ($items as $delta => $item) {
-          $element['items'][$delta] = array(
-            '#item' => $item,
-            '#weight' => $delta,
-          );
-        }
+      $addition = array($field['field_name'] => $wrapper);
+    }
+    return $addition;
+
+  case 'alter':
+    // Add back the formatted values in the 'view' element,
+    // so that tokens and node templates can use it.
+    // Note: Doing this in 'preprocess_node' breaks token integration.
+
+    // The location of the field's rendered output depends on whether the
+    // field is in a fieldgroup or not.
+    $wrapper = NULL;
+    if (isset($node->content[$field['field_name']])) {
+      $wrapper = $node->content[$field['field_name']];
+    }
+    elseif (module_exists('fieldgroup') && ($group_name = fieldgroup_get_group($node->type, $field['field_name'])) && isset($node->content[$group_name]['group'][$field['field_name']])) {
+      $wrapper = $node->content[$group_name]['group'][$field['field_name']];
+    }
 
-        // Append formatter information either on each item ('single-value' formatter)
-        // or at the upper 'items' level ('multiple-value' formatter)
-        $format_info = array(
-          '#theme' => $theme,
-          '#field_name' => $field['field_name'],
-          '#type_name' => $node->type,
-          '#formatter' => $formatter_name,
-          '#node' => $node,
-        );
-        if ($single) {
-          foreach ($items as $delta => $item) {
-            $element['items'][$delta] += $format_info;
-            $element['items'][$delta]['#item']['#delta'] = $delta;
+    if ($wrapper) {
+      $element = $wrapper['field'];
+      // '#single' is not set if the field is hidden or inaccessible.
+      if (isset($element['#single'])) {
+        if (!empty($element['#single'])) {
+          // Single value formatter.
+          foreach (element_children($element['items']) as $delta) {
+            // '#chilren' is not set if the field is empty.
+            $items[$delta]['view'] = isset($element['items'][$delta]['#children']) ? $element['items'][$delta]['#children'] : '';
           }
         }
-        else {
-          $element['items'] += $format_info;
+        elseif (isset($element['items']['#children']))  {
+          // Multiple values formatter.
+          $items[0]['view'] = $element['items']['#children'];
         }
-
-        // The wrapper lets us get the themed output for the whole field
-        // to populate the $FIELD_NAME_rendered variable for node templates,
-        // and hide it from the $content variable if needed.
-        // See 'preprocess_node' op and theme_content_field_wrapper()?
-        $wrapper = array(
-          'field' => $element,
-          '#weight' => $field['widget']['weight'],
-          '#post_render' => array('content_field_wrapper_post_render'),
-          '#field_name' => $field['field_name'],
-          '#type_name' => $node->type,
-          '#context' => $context,
-        );
-
-        $addition = array($field['field_name'] => $wrapper);
-      }
-      return $addition;
-
-    case 'alter':
-      // Add back the formatted values in the 'view' element,
-      // so that tokens and node templates can use it.
-      // Note: Doing this in 'preprocess_node' breaks token integration.
-
-      // The location of the field's rendered output depends on whether the
-      // field is in a fieldgroup or not.
-      $wrapper = NULL;
-      if (isset($node->content[$field['field_name']])) {
-        $wrapper = $node->content[$field['field_name']];
       }
-      elseif (module_exists('fieldgroup') && ($group_name = fieldgroup_get_group($node->type, $field['field_name'])) && isset($node->content[$group_name]['group'][$field['field_name']])) {
-        $wrapper = $node->content[$group_name]['group'][$field['field_name']];
-      }
-
-      if ($wrapper) {
-        $element = $wrapper['field'];
-        // '#single' is not set if the field is hidden or inaccessible.
-        if (isset($element['#single'])) {
-          if (!empty($element['#single'])) {
-            // Single value formatter.
-            foreach (element_children($element['items']) as $delta) {
-              // '#chilren' is not set if the field is empty.
-              $items[$delta]['view'] = isset($element['items'][$delta]['#children']) ? $element['items'][$delta]['#children'] : '';
-            }
-          }
-          elseif (isset($element['items']['#children']))  {
-            // Multiple values formatter.
-            $items[0]['view'] = $element['items']['#children'];
-          }
-        }
-        else {
-          // Hidden or inaccessible field.
-          $items[0]['view'] = '';
-        }
+      else {
+        // Hidden or inaccessible field.
+        $items[0]['view'] = '';
       }
-      break;
+    }
+    break;
 
-    case 'preprocess_node':
-      // Add $FIELD_NAME_rendered variables.
-      $addition = array();
+  case 'preprocess_node':
+    // Add $FIELD_NAME_rendered variables.
+    $addition = array();
 
-      // The location of the field's rendered output depends on whether the
-      // field is in a fieldgroup or not.
-      $wrapper = NULL;
-      if (isset($node->content[$field['field_name']])) {
-        $wrapper = $node->content[$field['field_name']];
-      }
-      elseif (module_exists('fieldgroup') && ($group_name = fieldgroup_get_group($node->type, $field['field_name'])) && isset($node->content[$group_name]['group'][$field['field_name']])) {
-        $wrapper = $node->content[$group_name]['group'][$field['field_name']];
-      }
+    // The location of the field's rendered output depends on whether the
+    // field is in a fieldgroup or not.
+    $wrapper = NULL;
+    if (isset($node->content[$field['field_name']])) {
+      $wrapper = $node->content[$field['field_name']];
+    }
+    elseif (module_exists('fieldgroup') && ($group_name = fieldgroup_get_group($node->type, $field['field_name'])) && isset($node->content[$group_name]['group'][$field['field_name']])) {
+      $wrapper = $node->content[$group_name]['group'][$field['field_name']];
+    }
 
-      if ($wrapper) {
-        // '#chilren' is not set if the field is empty.
-        $addition[$field['field_name'] .'_rendered'] = isset($wrapper['#children']) ? $wrapper['#children'] : '';
-      }
+    if ($wrapper) {
+      // '#chilren' is not set if the field is empty.
+      $addition[$field['field_name'] .'_rendered'] = isset($wrapper['#children']) ? $wrapper['#children'] : '';
+    }
 
-      return $addition;
+    return $addition;
 
-    case 'prepare translation':
-      $addition = array();
-      if (isset($node->translation_source->$field['field_name'])) {
-        $addition[$field['field_name']] = $node->translation_source->$field['field_name'];
-      }
-      return $addition;
+  case 'prepare translation':
+    $addition = array();
+    if (isset($node->translation_source->$field['field_name'])) {
+      $addition[$field['field_name']] = $node->translation_source->$field['field_name'];
+    }
+    return $addition;
   }
 }
 
@@ -974,122 +974,122 @@ 
   $type = content_types($type_name);
 
   switch ($op) {
-    case 'load':
-      // OPTIMIZE: load all non multiple fields in a single JOIN query ?
-      // warning: 61-join limit in MySQL ?
-      $additions = array();
-      // For each table used by this content type,
-      foreach ($type['tables'] as $table) {
-        $schema = drupal_get_schema($table);
-        // The per-type table might not have any fields actually stored in it.
-        if (!$schema['content fields']) {
-          continue;
-        }
-        $query = 'SELECT * FROM {'. $table .'} WHERE vid = %d';
-
-        // If we're loading a table for a multiple field,
-        // we fetch all rows (values) ordered by delta,
-        // else we only fetch one row.
-        $result = isset($schema['fields']['delta']) ? db_query($query .' ORDER BY delta', $node->vid) : db_query_range($query, $node->vid, 0, 1);
-
-        // For each table row, populate the fields.
-        while ($row = db_fetch_array($result)) {
-          // For each field stored in the table, add the field item.
-          foreach ($schema['content fields'] as $field_name) {
-            $item = array();
-            $field = content_fields($field_name, $type_name);
-            $db_info = content_database_info($field);
-            // For each column declared by the field, populate the item.
-            foreach ($db_info['columns'] as $column => $attributes) {
-              $item[$column] = $row[$attributes['column']];
-            }
-
-            // Add the item to the field values for the node.
-            if (!isset($additions[$field_name])) {
-              $additions[$field_name] = array();
-            }
-            $additions[$field_name][] = $item;
-          }
-        }
+  case 'load':
+    // OPTIMIZE: load all non multiple fields in a single JOIN query ?
+    // warning: 61-join limit in MySQL ?
+    $additions = array();
+    // For each table used by this content type,
+    foreach ($type['tables'] as $table) {
+      $schema = drupal_get_schema($table);
+      // The per-type table might not have any fields actually stored in it.
+      if (!$schema['content fields']) {
+        continue;
       }
-      return $additions;
+      $query = 'SELECT * FROM {'. $table .'} WHERE vid = %d';
+
+      // If we're loading a table for a multiple field,
+      // we fetch all rows (values) ordered by delta,
+      // else we only fetch one row.
+      $result = isset($schema['fields']['delta']) ? db_query($query .' ORDER BY delta', $node->vid) : db_query_range($query, $node->vid, 0, 1);
 
-    case 'insert':
-    case 'update':
-      foreach ($type['tables'] as $table) {
-        $schema = drupal_get_schema($table);
-        $record = array();
+      // For each table row, populate the fields.
+      while ($row = db_fetch_array($result)) {
+        // For each field stored in the table, add the field item.
         foreach ($schema['content fields'] as $field_name) {
-          if (isset($node->$field_name)) {
-            $field = content_fields($field_name, $type_name);
-            // Multiple fields need specific handling, we'll deal with them later on.
-            if ($field['multiple']) {
-              continue;
-            }
-            $db_info = content_database_info($field);
-            foreach ($db_info['columns'] as $column => $attributes) {
-              $record[$attributes['column']] = $node->{$field_name}[0][$column];
-            }
+          $item = array();
+          $field = content_fields($field_name, $type_name);
+          $db_info = content_database_info($field);
+          // For each column declared by the field, populate the item.
+          foreach ($db_info['columns'] as $column => $attributes) {
+            $item[$column] = $row[$attributes['column']];
           }
+
+          // Add the item to the field values for the node.
+          if (!isset($additions[$field_name])) {
+            $additions[$field_name] = array();
+          }
+          $additions[$field_name][] = $item;
         }
-        // $record might be empty because
-        // - the table stores a multiple field :
-        //   we do nothing, this is handled later on
-        // - this is the per-type table and no field is actually stored in it :
-        //   we still store the nid and vid
-        if (count($record) || empty($schema['content fields'])) {
-          $record['nid'] = $node->nid;
-          $record['vid'] = $node->vid;
-          // Can't rely on the insert/update op of the node to decide if this
-          // is an insert or an update, a node or revision may have existed
-          // before any fields were created, so there may not be an entry here.
-
-          // TODO - should we auto create an entry for all existing nodes when
-          // fields are added to content types -- either a NULL value
-          // or the default value? May need to offer the user an option of
-          // how to handle that.
-          if (db_result(db_query("SELECT COUNT(*) FROM {". $table ."} WHERE vid = %d", $node->vid))) {
-            content_write_record($table, $record, array('vid'));
+      }
+    }
+    return $additions;
+
+  case 'insert':
+  case 'update':
+    foreach ($type['tables'] as $table) {
+      $schema = drupal_get_schema($table);
+      $record = array();
+      foreach ($schema['content fields'] as $field_name) {
+        if (isset($node->$field_name)) {
+          $field = content_fields($field_name, $type_name);
+          // Multiple fields need specific handling, we'll deal with them later on.
+          if ($field['multiple']) {
+            continue;
           }
-          else {
-            content_write_record($table, $record);
+          $db_info = content_database_info($field);
+          foreach ($db_info['columns'] as $column => $attributes) {
+            $record[$attributes['column']] = $node->{$field_name}[0][$column];
           }
         }
       }
+      // $record might be empty because
+      // - the table stores a multiple field :
+      //   we do nothing, this is handled later on
+      // - this is the per-type table and no field is actually stored in it :
+      //   we still store the nid and vid
+      if (count($record) || empty($schema['content fields'])) {
+        $record['nid'] = $node->nid;
+        $record['vid'] = $node->vid;
+        // Can't rely on the insert/update op of the node to decide if this
+        // is an insert or an update, a node or revision may have existed
+        // before any fields were created, so there may not be an entry here.
+
+        // TODO - should we auto create an entry for all existing nodes when
+        // fields are added to content types -- either a NULL value
+        // or the default value? May need to offer the user an option of
+        // how to handle that.
+        if (db_result(db_query("SELECT COUNT(*) FROM {". $table ."} WHERE vid = %d", $node->vid))) {
+          content_write_record($table, $record, array('vid'));
+        }
+        else {
+          content_write_record($table, $record);
+        }
+      }
+    }
 
-      // Handle multiple fields.
-      foreach ($type['fields'] as $field) {
-        if ($field['multiple'] && isset($node->$field['field_name'])) {
-          $db_info = content_database_info($field);
-          // Delete and insert, rather than update, in case a value was added.
-          if ($op == 'update') {
-            db_query('DELETE FROM {'. $db_info['table'] .'} WHERE vid = %d', $node->vid);
-          }
-          foreach ($node->$field['field_name'] as $delta => $item) {
-            $record = array();
-            foreach ($db_info['columns'] as $column => $attributes) {
-              $record[$attributes['column']] = $item[$column];
-            }
-            $record['nid'] = $node->nid;
-            $record['vid'] = $node->vid;
-            $record['delta'] = $delta;
-            content_write_record($db_info['table'], $record);
+    // Handle multiple fields.
+    foreach ($type['fields'] as $field) {
+      if ($field['multiple'] && isset($node->$field['field_name'])) {
+        $db_info = content_database_info($field);
+        // Delete and insert, rather than update, in case a value was added.
+        if ($op == 'update') {
+          db_query('DELETE FROM {'. $db_info['table'] .'} WHERE vid = %d', $node->vid);
+        }
+        foreach ($node->$field['field_name'] as $delta => $item) {
+          $record = array();
+          foreach ($db_info['columns'] as $column => $attributes) {
+            $record[$attributes['column']] = $item[$column];
           }
+          $record['nid'] = $node->nid;
+          $record['vid'] = $node->vid;
+          $record['delta'] = $delta;
+          content_write_record($db_info['table'], $record);
         }
       }
-      break;
+    }
+    break;
 
-    case 'delete':
-      foreach ($type['tables'] as $table) {
-        db_query('DELETE FROM {'. $table .'} WHERE nid = %d', $node->nid);
-      }
-      break;
+  case 'delete':
+    foreach ($type['tables'] as $table) {
+      db_query('DELETE FROM {'. $table .'} WHERE nid = %d', $node->nid);
+    }
+    break;
 
-    case 'delete revision':
-      foreach ($type['tables'] as $table) {
-        db_query('DELETE FROM {'. $table .'} WHERE vid = %d', $node->vid);
-      }
-      break;
+  case 'delete revision':
+    foreach ($type['tables'] as $table) {
+      db_query('DELETE FROM {'. $table .'} WHERE vid = %d', $node->vid);
+    }
+    break;
   }
 }
 
@@ -1526,18 +1526,18 @@ 
  */
 function content_node_type($op, $info) {
   switch ($op) {
-    case 'insert':
-      module_load_include('inc', 'content', 'includes/content.crud');
-      content_type_create($info);
-      break;
-    case 'update':
-      module_load_include('inc', 'content', 'includes/content.crud');
-      content_type_update($info);
-      break;
-    case 'delete':
-      module_load_include('inc', 'content', 'includes/content.crud');
-      content_type_delete($info);
-      break;
+  case 'insert':
+    module_load_include('inc', 'content', 'includes/content.crud');
+    content_type_create($info);
+    break;
+  case 'update':
+    module_load_include('inc', 'content', 'includes/content.crud');
+    content_type_update($info);
+    break;
+  case 'delete':
+    module_load_include('inc', 'content', 'includes/content.crud');
+    content_type_delete($info);
+    break;
   }
 }
 
@@ -1994,14 +1994,14 @@ 
 
   $name = str_replace('-', '_', $name);
   switch ("$version-$storage") {
-    case '0-'. CONTENT_DB_STORAGE_PER_CONTENT_TYPE :
-      return "node_$name";
-    case '0-'. CONTENT_DB_STORAGE_PER_FIELD :
-      return "node_data_$name";
-    case '1003-'. CONTENT_DB_STORAGE_PER_CONTENT_TYPE :
-      return "content_type_$name";
-    case '1003-'. CONTENT_DB_STORAGE_PER_FIELD :
-      return "content_$name";
+  case '0-'. CONTENT_DB_STORAGE_PER_CONTENT_TYPE :
+    return "node_$name";
+  case '0-'. CONTENT_DB_STORAGE_PER_FIELD :
+    return "node_data_$name";
+  case '1003-'. CONTENT_DB_STORAGE_PER_CONTENT_TYPE :
+    return "content_type_$name";
+  case '1003-'. CONTENT_DB_STORAGE_PER_FIELD :
+    return "content_$name";
   }
 }
 
@@ -2153,13 +2153,13 @@ 
  */
 function content_callback($entity, $op, $field) {
   switch ($entity) {
-    case 'field':
-      $info = module_invoke($field['module'], "field_info");
-      return isset($info[$field['type']]['callbacks'][$op]) ? $info[$field['type']]['callbacks'][$op] : CONTENT_CALLBACK_DEFAULT;
+  case 'field':
+    $info = module_invoke($field['module'], "field_info");
+    return isset($info[$field['type']]['callbacks'][$op]) ? $info[$field['type']]['callbacks'][$op] : CONTENT_CALLBACK_DEFAULT;
 
-    case 'widget':
-      $info = module_invoke($field['widget']['module'], "widget_info");
-      return isset($info[$field['widget']['type']]['callbacks'][$op]) ? $info[$field['widget']['type']]['callbacks'][$op] : CONTENT_CALLBACK_DEFAULT;
+  case 'widget':
+    $info = module_invoke($field['widget']['module'], "widget_info");
+    return isset($info[$field['widget']['type']]['callbacks'][$op]) ? $info[$field['widget']['type']]['callbacks'][$op] : CONTENT_CALLBACK_DEFAULT;
   }
 }
 
@@ -2183,18 +2183,18 @@ 
  */
 function content_handle($entity, $op, $object) {
   switch ($entity) {
-    case 'field':
-      $info = module_invoke($object['module'], "field_info");
-      return isset($info[$object['type']][$op]) ? $info[$object['type']][$op] : CONTENT_HANDLE_CORE;
-
-    case 'widget':
-      $info = module_invoke($object['widget']['module'], "widget_info");
-      return isset($info[$object['widget']['type']][$op]) ? $info[$object['widget']['type']][$op] : CONTENT_HANDLE_CORE;
-
-    case 'formatter':
-      // Much simpler, formatters arrays *are* the 'formatter_info' itself.
-      // We let content_handle deal with them only for code consistency.
-      return isset($object[$op]) ? $object[$op] : CONTENT_HANDLE_CORE;
+  case 'field':
+    $info = module_invoke($object['module'], "field_info");
+    return isset($info[$object['type']][$op]) ? $info[$object['type']][$op] : CONTENT_HANDLE_CORE;
+
+  case 'widget':
+    $info = module_invoke($object['widget']['module'], "widget_info");
+    return isset($info[$object['widget']['type']][$op]) ? $info[$object['widget']['type']][$op] : CONTENT_HANDLE_CORE;
+
+  case 'formatter':
+    // Much simpler, formatters arrays *are* the 'formatter_info' itself.
+    // We let content_handle deal with them only for code consistency.
+    return isset($object[$op]) ? $object[$op] : CONTENT_HANDLE_CORE;
   }
 }
 

Spacing +95 added lines, -95 removed lines

@@ -18,17 +18,17 @@ 
 function content_help($path, $arg) {
   switch ($path) {
     case 'admin/help#content':
-      $output = '<p>'. t('The content module, a required component of the Content Construction Kit (CCK), allows administrators to associate custom fields with content types. In Drupal, content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Using the content module (and the other helper modules included in CCK), custom fields beyond the default "Title" and "Body" may be added. CCK features are accessible through tabs on the <a href="@content-types">content types administration page</a>. (See the <a href="@node-help">node module help page</a> for more information about content types.)', array('@content-types' => url('admin/content/types'), '@node-help' => url('admin/help/node'))) .'</p>';
-      $output .= '<p>'. t('When adding a custom field to a content type, you determine its type (whether it will contain text, numbers, or references to other objects) and how it will be displayed (either as a text field or area, a select box, checkbox, radio button, or autocompleting field). A field may have multiple values (i.e., a "person" may have multiple e-mail addresses) or a single value (i.e., an "employee" has a single employee identification number). As you add and edit fields, CCK automatically adjusts the structure of the database as necessary. CCK also provides a number of other features, including intelligent caching for your custom data, an import and export facility for content type definitions, and integration with other contributed modules.') .'</p>';
-      $output .= '<p>'. t('Custom field types are provided by a set of optional modules included with CCK (each module provides a different type). The <a href="@modules">modules page</a> allows you to enable or disable CCK components. A default installation of CCK includes:', array('@modules' => url('admin/build/modules'))) .'</p>';
+      $output = '<p>'.t('The content module, a required component of the Content Construction Kit (CCK), allows administrators to associate custom fields with content types. In Drupal, content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Using the content module (and the other helper modules included in CCK), custom fields beyond the default "Title" and "Body" may be added. CCK features are accessible through tabs on the <a href="@content-types">content types administration page</a>. (See the <a href="@node-help">node module help page</a> for more information about content types.)', array('@content-types' => url('admin/content/types'), '@node-help' => url('admin/help/node'))).'</p>';
+      $output .= '<p>'.t('When adding a custom field to a content type, you determine its type (whether it will contain text, numbers, or references to other objects) and how it will be displayed (either as a text field or area, a select box, checkbox, radio button, or autocompleting field). A field may have multiple values (i.e., a "person" may have multiple e-mail addresses) or a single value (i.e., an "employee" has a single employee identification number). As you add and edit fields, CCK automatically adjusts the structure of the database as necessary. CCK also provides a number of other features, including intelligent caching for your custom data, an import and export facility for content type definitions, and integration with other contributed modules.').'</p>';
+      $output .= '<p>'.t('Custom field types are provided by a set of optional modules included with CCK (each module provides a different type). The <a href="@modules">modules page</a> allows you to enable or disable CCK components. A default installation of CCK includes:', array('@modules' => url('admin/build/modules'))).'</p>';
       $output .= '<ul>';
-      $output .= '<li>'. t('<em>number</em>, which adds numeric field types, in integer, decimal or floating point form. You may define a set of allowed inputs, or specify an allowable range of values. A variety of common formats for displaying numeric data are available.') .'</li>';
-      $output .= '<li>'. t("<em>text</em>, which adds text field types. A text field may contain plain text only, or optionally, may use Drupal's input format filters to securely manage rich text input. Text input fields may be either a single line (text field), multiple lines (text area), or for greater input control, a select box, checkbox, or radio buttons. If desired, CCK can validate the input to a set of allowed values.") .'</li>';
-      $output .= '<li>'. t('<em>nodereference</em>, which creates custom references between Drupal nodes. By adding a <em>nodereference</em> field and two different content types, for instance, you can easily create complex parent/child relationships between data (multiple "employee" nodes may contain a <em>nodereference</em> field linking to an "employer" node).') .'</li>';
-      $output .= '<li>'. t('<em>userreference</em>, which creates custom references to your sites\' user accounts. By adding a <em>userreference</em> field, you can create complex relationships between your site\'s users and posts. To track user involvement in a post beyond Drupal\'s standard <em>Authored by</em> field, for instance, add a <em>userreference</em> field named "Edited by" to a content type to store a link to an editor\'s user account page.') .'</li>';
-      $output .= '<li>'. t('<em>fieldgroup</em>, which creates collapsible fieldsets to hold a group of related fields. A fieldset may either be open or closed by default. The order of your fieldsets, and the order of fields within a fieldset, is managed via a drag-and-drop interface provided by content module.') .'</li>';
+      $output .= '<li>'.t('<em>number</em>, which adds numeric field types, in integer, decimal or floating point form. You may define a set of allowed inputs, or specify an allowable range of values. A variety of common formats for displaying numeric data are available.').'</li>';
+      $output .= '<li>'.t("<em>text</em>, which adds text field types. A text field may contain plain text only, or optionally, may use Drupal's input format filters to securely manage rich text input. Text input fields may be either a single line (text field), multiple lines (text area), or for greater input control, a select box, checkbox, or radio buttons. If desired, CCK can validate the input to a set of allowed values.").'</li>';
+      $output .= '<li>'.t('<em>nodereference</em>, which creates custom references between Drupal nodes. By adding a <em>nodereference</em> field and two different content types, for instance, you can easily create complex parent/child relationships between data (multiple "employee" nodes may contain a <em>nodereference</em> field linking to an "employer" node).').'</li>';
+      $output .= '<li>'.t('<em>userreference</em>, which creates custom references to your sites\' user accounts. By adding a <em>userreference</em> field, you can create complex relationships between your site\'s users and posts. To track user involvement in a post beyond Drupal\'s standard <em>Authored by</em> field, for instance, add a <em>userreference</em> field named "Edited by" to a content type to store a link to an editor\'s user account page.').'</li>';
+      $output .= '<li>'.t('<em>fieldgroup</em>, which creates collapsible fieldsets to hold a group of related fields. A fieldset may either be open or closed by default. The order of your fieldsets, and the order of fields within a fieldset, is managed via a drag-and-drop interface provided by content module.').'</li>';
       $output .= '</ul>';
-      $output .= '<p>'. t('For more information, see the online handbook entry for <a href="@handbook-cck">CCK</a> or the <a href="@project-cck">CCK project page</a>.', array('@handbook-cck' => 'http://drupal.org/handbook/modules/cck', '@project-cck' => 'http://drupal.org/project/cck')) .'</p>';
+      $output .= '<p>'.t('For more information, see the online handbook entry for <a href="@handbook-cck">CCK</a> or the <a href="@project-cck">CCK project page</a>.', array('@handbook-cck' => 'http://drupal.org/handbook/modules/cck', '@project-cck' => 'http://drupal.org/project/cck')).'</p>';
       return $output;
   }
 }
@@ -44,7 +44,7 @@ 
  * Implementation of hook_init().
  */
 function content_init() {
-  drupal_add_css(drupal_get_path('module', 'content') .'/theme/content-module.css');
+  drupal_add_css(drupal_get_path('module', 'content').'/theme/content-module.css');
   if (module_exists('token') && !function_exists('content_token_values')) {
     module_load_include('inc', 'content', 'includes/content.token');
   }
@@ -67,7 +67,7 @@ 
   // Customize the content types page with our own callback
   $items['admin/content/types']['page callback'] = 'content_types_overview';
   $items['admin/content/types']['file'] = 'content.admin.inc';
-  $items['admin/content/types']['file path'] = drupal_get_path('module', 'content') .'/includes';
+  $items['admin/content/types']['file path'] = drupal_get_path('module', 'content').'/includes';
 }
 
 /**
@@ -97,7 +97,7 @@ 
       $type_name = $type->type;
       $content_type = content_types($type_name);
       $type_url_str = $content_type['url_str'];
-      $items['admin/content/node-type/'. $type_url_str .'/fields'] = array(
+      $items['admin/content/node-type/'.$type_url_str.'/fields'] = array(
         'title' => 'Manage fields',
         'page callback' => 'drupal_get_form',
         'page arguments' => array('content_field_overview_form', $type_name),
@@ -106,7 +106,7 @@ 
         'type' => MENU_LOCAL_TASK,
         'weight' => 1,
       );
-      $items['admin/content/node-type/'. $type_url_str .'/display'] = array(
+      $items['admin/content/node-type/'.$type_url_str.'/display'] = array(
         'title' => 'Display fields',
         'page callback' => 'drupal_get_form',
         'page arguments' => array('content_display_overview_form', $type_name),
@@ -117,7 +117,7 @@ 
       );
       $contexts = content_build_modes('_tabs');
       foreach ($contexts as $key => $tab) {
-        $items['admin/content/node-type/'. $type_url_str .'/display/'. $key] = array(
+        $items['admin/content/node-type/'.$type_url_str.'/display/'.$key] = array(
           'title' => $tab['title'],
           'page arguments' => array('content_display_overview_form', $type_name, $key),
           'access arguments' => array('administer content types'),
@@ -127,9 +127,9 @@ 
       }
       // Cast as an array in case this is called before any fields have
       // been added, like when a new content type is created.
-      foreach ((array) $content_type['fields'] as $field) {
+      foreach ((array)$content_type['fields'] as $field) {
         $field_name = $field['field_name'];
-        $items['admin/content/node-type/'. $type_url_str .'/fields/'. $field_name] = array(
+        $items['admin/content/node-type/'.$type_url_str.'/fields/'.$field_name] = array(
           'title' => $field['widget']['label'],
           'page callback' => 'drupal_get_form',
           'page arguments' => array('content_field_edit_form', $type_name, $field_name),
@@ -137,7 +137,7 @@ 
           'file' => 'includes/content.admin.inc',
           'type' => MENU_LOCAL_TASK,
         );
-        $items['admin/content/node-type/'. $type_url_str .'/fields/'. $field_name .'/remove'] = array(
+        $items['admin/content/node-type/'.$type_url_str.'/fields/'.$field_name.'/remove'] = array(
           'title' => 'Remove field',
           'page callback' => 'drupal_get_form',
           'page arguments' => array('content_field_remove_form', $type_name, $field_name),
@@ -173,7 +173,7 @@ 
  * Implementation of hook_theme().
  */
 function content_theme() {
-  $path = drupal_get_path('module', 'content') .'/theme';
+  $path = drupal_get_path('module', 'content').'/theme';
   require_once "./$path/theme.inc";
 
   return array(
@@ -215,7 +215,7 @@ 
 function content_views_api() {
   return array(
     'api' => 2,
-    'path' => drupal_get_path('module', 'content') . '/includes/views',
+    'path' => drupal_get_path('module', 'content').'/includes/views',
   );
 }
 
@@ -224,7 +224,7 @@ 
  */
 function content_ctools_plugin_directory($module, $plugin) {
   if ($module == 'ctools' && $plugin == 'content_types') {
-    return 'includes/panels/' . $plugin;
+    return 'includes/panels/'.$plugin;
   }
 }
 
@@ -237,7 +237,7 @@ 
  * cache the loaded object structure and invalidate it during the update process.
  */
 function content_load(&$node) {
-  $cid = 'content:'. $node->nid .':'. $node->vid;
+  $cid = 'content:'.$node->nid.':'.$node->vid;
   if ($cached = cache_get($cid, content_cache_tablename())) {
     foreach ($cached->data as $key => $value) {
       $node->$key = $value;
@@ -297,7 +297,7 @@ 
 function content_update(&$node) {
   _content_field_invoke('update', $node);
   _content_field_invoke_default('update', $node);
-  cache_clear_all('content:'. $node->nid .':'. $node->vid, content_cache_tablename());
+  cache_clear_all('content:'.$node->nid.':'.$node->vid, content_cache_tablename());
 }
 
 /**
@@ -308,7 +308,7 @@ 
 function content_delete(&$node) {
   _content_field_invoke('delete', $node);
   _content_field_invoke_default('delete', $node);
-  cache_clear_all('content:'. $node->nid .':', content_cache_tablename(), TRUE);
+  cache_clear_all('content:'.$node->nid.':', content_cache_tablename(), TRUE);
 }
 
 /**
@@ -319,7 +319,7 @@ 
 function content_delete_revision(&$node) {
   _content_field_invoke('delete revision', $node);
   _content_field_invoke_default('delete revision', $node);
-  cache_clear_all('content:'. $node->nid .':'. $node->vid, content_cache_tablename());
+  cache_clear_all('content:'.$node->nid.':'.$node->vid, content_cache_tablename());
 }
 
 /**
@@ -333,7 +333,7 @@ 
 
   // Merge fields.
   $additions = _content_field_invoke_default('view', $node, $teaser, $page);
-  $node->content = array_merge((array) $node->content, $additions);
+  $node->content = array_merge((array)$node->content, $additions);
 }
 
 /**
@@ -371,7 +371,7 @@ 
     // One-field equivalent to _content_field_invoke('sanitize').
     $field_types = _content_field_types();
     $module = $field_types[$field['type']]['module'];
-    $function = $module .'_field';
+    $function = $module.'_field';
     if (function_exists($function)) {
       $function('sanitize', $node, $field, $items, $teaser, $page);
       $node->$field['field_name'] = $items;
@@ -405,7 +405,7 @@ 
   $additions = _content_field_invoke('prepare translation', $node);
   // Merge module additions after the default ones to enable overriding
   // of field values.
-  $node = (object) array_merge((array) $node, $default_additions, $additions);
+  $node = (object)array_merge((array)$node, $default_additions, $additions);
 }
 
 /**
@@ -417,7 +417,7 @@ 
     $type = content_types($node->type);
     // Save cycles if the type has no CCK fields.
     if (!empty($type['fields'])) {
-      $callback = 'content_'. str_replace(' ', '_', $op);
+      $callback = 'content_'.str_replace(' ', '_', $op);
       if (function_exists($callback)) {
         $callback($node, $a3, $a4);
       }
@@ -436,7 +436,7 @@ 
  *  Implementation of hook_form_alter().
  */
 function content_form_alter(&$form, $form_state, $form_id) {
-  if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id) {
+  if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'].'_node_form' == $form_id) {
     $type = content_types($form['#node']->type);
     if (!empty($type['fields'])) {
       module_load_include('inc', 'content', 'includes/content.node_form');
@@ -487,9 +487,9 @@ 
   $output = '';
 
   if ($field['multiple'] >= 1) {
-    $table_id = $element['#field_name'] .'_values';
-    $order_class = $element['#field_name'] .'-delta-order';
-    $required = !empty($element['#required']) ? '<span class="form-required" title="'. t('This field is required.') .'">*</span>' : '';
+    $table_id = $element['#field_name'].'_values';
+    $order_class = $element['#field_name'].'-delta-order';
+    $required = !empty($element['#required']) ? '<span class="form-required" title="'.t('This field is required.').'">*</span>' : '';
 
     $header = array(
       array(
@@ -504,7 +504,7 @@ 
     // preview or failed validation)
     $items = array();
     foreach (element_children($element) as $key) {
-      if ($key !== $element['#field_name'] .'_add_more') {
+      if ($key !== $element['#field_name'].'_add_more') {
         $items[] = &$element[$key];
       }
     }
@@ -526,8 +526,8 @@ 
     }
 
     $output .= theme('table', $header, $rows, array('id' => $table_id, 'class' => 'content-multiple-table'));
-    $output .= $element['#description'] ? '<div class="description">'. $element['#description'] .'</div>' : '';
-    $output .= drupal_render($element[$element['#field_name'] .'_add_more']);
+    $output .= $element['#description'] ? '<div class="description">'.$element['#description'].'</div>' : '';
+    $output .= drupal_render($element[$element['#field_name'].'_add_more']);
 
     drupal_add_tabledrag($table_id, 'order', 'sibling', $order_class);
   }
@@ -570,8 +570,8 @@ 
       if (variable_get('content_schema_version', -1) < 6007) {
         return FALSE;
       }
-      db_query("UPDATE {". content_field_tablename() ."} SET active=0 WHERE module='%s'", $module);
-      db_query("UPDATE {". content_instance_tablename() ."} SET widget_active=0 WHERE widget_module='%s'", $module);
+      db_query("UPDATE {".content_field_tablename()."} SET active=0 WHERE module='%s'", $module);
+      db_query("UPDATE {".content_instance_tablename()."} SET widget_active=0 WHERE widget_module='%s'", $module);
       content_clear_type_cache(TRUE);
       break;
   }
@@ -593,14 +593,14 @@ 
   if ($module_fields) {
     foreach ($module_fields as $name => $field_info) {
       watchdog('content', 'Updating field type %type with module %module.', array('%type' => $name, '%module' => $module));
-      db_query("UPDATE {". content_field_tablename() ."} SET module = '%s', active = %d WHERE type = '%s'", $module, 1, $name);
+      db_query("UPDATE {".content_field_tablename()."} SET module = '%s', active = %d WHERE type = '%s'", $module, 1, $name);
     }
   }
   $module_widgets = module_invoke($module, 'widget_info');
   if ($module_widgets) {
     foreach ($module_widgets as $name => $widget_info) {
       watchdog('content', 'Updating widget type %type with module %module.', array('%type' => $name, '%module' => $module));
-      db_query("UPDATE {". content_instance_tablename() ."} SET widget_module = '%s', widget_active = %d WHERE widget_type = '%s'", $module, 1, $name);
+      db_query("UPDATE {".content_instance_tablename()."} SET widget_module = '%s', widget_active = %d WHERE widget_type = '%s'", $module, 1, $name);
     }
   }
   // This is called from updates and installs, so get the install-safe
@@ -611,8 +611,8 @@ 
   foreach ($types as $type_name => $fields) {
     foreach ($fields as $field) {
       if ($field['module'] == $module && !in_array($field['field_name'], $fields_set)) {
-        $columns = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
-        db_query("UPDATE {". content_field_tablename() ."} SET db_columns = '%s' WHERE field_name = '%s'", serialize($columns), $field['field_name']);
+        $columns = (array)module_invoke($field['module'], 'field_settings', 'database columns', $field);
+        db_query("UPDATE {".content_field_tablename()."} SET db_columns = '%s' WHERE field_name = '%s'", serialize($columns), $field['field_name']);
         $fields_set[] = $field['field_name'];
       }
     }
@@ -696,7 +696,7 @@ 
 
     case 'presave':
       if (!empty($node->devel_generate)) {
-        include_once('./'. drupal_get_path('module', 'content') .'/includes/content.devel.inc');
+        include_once('./'.drupal_get_path('module', 'content').'/includes/content.devel.inc');
         content_generate_fields($node, $field);
         $items = $node->{$field['field_name']};
       }
@@ -715,7 +715,7 @@ 
 
       // If there was an AHAH add more button in this field, don't save it.
       // TODO: is it still needed ?
-      unset($items[$field['field_name'] .'_add_more']);
+      unset($items[$field['field_name'].'_add_more']);
 
       if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
         // Reorder items to account for drag-n-drop reordering.
@@ -752,7 +752,7 @@ 
       // enabled after the field was last edited.
       $formatter_name = isset($field['display_settings'][$context]) && isset($field['display_settings'][$context]['format']) ? $field['display_settings'][$context]['format'] : 'default';
       if ($formatter = _content_get_formatter($formatter_name, $field['type'])) {
-        $theme = $formatter['module'] .'_formatter_'. $formatter_name;
+        $theme = $formatter['module'].'_formatter_'.$formatter_name;
         $single = (content_handle('formatter', 'multiple values', $formatter) == CONTENT_HANDLE_CORE);
 
         $label_display = isset($field['display_settings']['label']['format']) ? $field['display_settings']['label']['format'] : 'above';
@@ -845,7 +845,7 @@ 
               $items[$delta]['view'] = isset($element['items'][$delta]['#children']) ? $element['items'][$delta]['#children'] : '';
             }
           }
-          elseif (isset($element['items']['#children']))  {
+          elseif (isset($element['items']['#children'])) {
             // Multiple values formatter.
             $items[0]['view'] = $element['items']['#children'];
           }
@@ -873,7 +873,7 @@ 
 
       if ($wrapper) {
         // '#chilren' is not set if the field is empty.
-        $addition[$field['field_name'] .'_rendered'] = isset($wrapper['#children']) ? $wrapper['#children'] : '';
+        $addition[$field['field_name'].'_rendered'] = isset($wrapper['#children']) ? $wrapper['#children'] : '';
       }
 
       return $addition;
@@ -901,8 +901,8 @@ 
 function content_set_empty($field, $items) {
   // Filter out empty values.
   $filtered = array();
-  $function = $field['module'] .'_content_is_empty';
-  foreach ((array) $items as $delta => $item) {
+  $function = $field['module'].'_content_is_empty';
+  foreach ((array)$items as $delta => $item) {
     if (!$function($item, $field)) {
       $filtered[] = $item;
     }
@@ -985,12 +985,12 @@ 
         if (!$schema['content fields']) {
           continue;
         }
-        $query = 'SELECT * FROM {'. $table .'} WHERE vid = %d';
+        $query = 'SELECT * FROM {'.$table.'} WHERE vid = %d';
 
         // If we're loading a table for a multiple field,
         // we fetch all rows (values) ordered by delta,
         // else we only fetch one row.
-        $result = isset($schema['fields']['delta']) ? db_query($query .' ORDER BY delta', $node->vid) : db_query_range($query, $node->vid, 0, 1);
+        $result = isset($schema['fields']['delta']) ? db_query($query.' ORDER BY delta', $node->vid) : db_query_range($query, $node->vid, 0, 1);
 
         // For each table row, populate the fields.
         while ($row = db_fetch_array($result)) {
@@ -1048,7 +1048,7 @@ 
           // fields are added to content types -- either a NULL value
           // or the default value? May need to offer the user an option of
           // how to handle that.
-          if (db_result(db_query("SELECT COUNT(*) FROM {". $table ."} WHERE vid = %d", $node->vid))) {
+          if (db_result(db_query("SELECT COUNT(*) FROM {".$table."} WHERE vid = %d", $node->vid))) {
             content_write_record($table, $record, array('vid'));
           }
           else {
@@ -1063,7 +1063,7 @@ 
           $db_info = content_database_info($field);
           // Delete and insert, rather than update, in case a value was added.
           if ($op == 'update') {
-            db_query('DELETE FROM {'. $db_info['table'] .'} WHERE vid = %d', $node->vid);
+            db_query('DELETE FROM {'.$db_info['table'].'} WHERE vid = %d', $node->vid);
           }
           foreach ($node->$field['field_name'] as $delta => $item) {
             $record = array();
@@ -1081,13 +1081,13 @@ 
 
     case 'delete':
       foreach ($type['tables'] as $table) {
-        db_query('DELETE FROM {'. $table .'} WHERE nid = %d', $node->nid);
+        db_query('DELETE FROM {'.$table.'} WHERE nid = %d', $node->nid);
       }
       break;
 
     case 'delete revision':
       foreach ($type['tables'] as $table) {
-        db_query('DELETE FROM {'. $table .'} WHERE vid = %d', $node->vid);
+        db_query('DELETE FROM {'.$table.'} WHERE vid = %d', $node->vid);
       }
       break;
   }
@@ -1132,7 +1132,7 @@ 
 
   // Convert to an object if needed.
   if (is_array($object)) {
-    $object = (object) $object;
+    $object = (object)$object;
     $array = TRUE;
   }
   else {
@@ -1188,7 +1188,7 @@ 
   // Build the SQL.
   $query = '';
   if (!count($update)) {
-    $query = "INSERT INTO {". $table ."} (". implode(', ', $fields) .') VALUES ('. implode(', ', $placeholders) .')';
+    $query = "INSERT INTO {".$table."} (".implode(', ', $fields).') VALUES ('.implode(', ', $placeholders).')';
     $return = SAVED_NEW;
   }
   else {
@@ -1197,15 +1197,15 @@ 
       if ($query) {
         $query .= ', ';
       }
-      $query .= $field .' = '. $placeholders[$id];
+      $query .= $field.' = '.$placeholders[$id];
     }
 
     foreach ($update as $key) {
-      $conditions[] = "$key = ". db_type_placeholder($schema['fields'][$key]['type']);
+      $conditions[] = "$key = ".db_type_placeholder($schema['fields'][$key]['type']);
       $values[] = $object->$key;
     }
 
-    $query = "UPDATE {". $table ."} SET $query WHERE ". implode(' AND ', $conditions);
+    $query = "UPDATE {".$table."} SET $query WHERE ".implode(' AND ', $conditions);
     $return = SAVED_UPDATED;
   }
 
@@ -1220,7 +1220,7 @@ 
 
     // If we began with an array, convert back so we don't surprise the caller.
     if ($array) {
-      $object = (array) $object;
+      $object = (array)$object;
     }
 
     return $return;
@@ -1245,10 +1245,10 @@ 
     $items = isset($node->$field['field_name']) ? $node->$field['field_name'] : array();
 
     // Make sure AHAH 'add more' button isn't sent to the fields for processing.
-    unset($items[$field['field_name'] .'_add_more']);
+    unset($items[$field['field_name'].'_add_more']);
 
     $module = $field_types[$field['type']]['module'];
-    $function = $module .'_field';
+    $function = $module.'_field';
     if (function_exists($function)) {
       $result = $function($op, $node, $field, $items, $teaser, $page);
       if (is_array($result)) {
@@ -1408,7 +1408,7 @@ 
       return array();
     }
 
-    if (!$reset && $cached = cache_get('content_type_info:'. $language->language, content_cache_tablename())) {
+    if (!$reset && $cached = cache_get('content_type_info:'.$language->language, content_cache_tablename())) {
       $info = $cached->data;
     }
     else {
@@ -1469,7 +1469,7 @@ 
       // Populate actual field instances.
       module_load_include('inc', 'content', 'includes/content.crud');
       foreach (node_get_types('types', NULL, TRUE) as $type_name => $data) {
-        $type = (array) $data;
+        $type = (array)$data;
         $type['url_str'] = str_replace('_', '-', $type['type']);
         $type['fields'] = array();
         $type['tables'] = array();
@@ -1502,7 +1502,7 @@ 
         $extra = module_invoke_all('content_extra_fields', $type_name);
         drupal_alter('content_extra_fields', $extra, $type_name);
         // Add saved weights.
-        foreach (variable_get('content_extra_weights_'. $type_name, array()) as $key => $value) {
+        foreach (variable_get('content_extra_weights_'.$type_name, array()) as $key => $value) {
           // Some stored entries might not exist anymore, for instance if uploads
           // have been disabled, or vocabularies removed...
           if (isset($extra[$key])) {
@@ -1514,7 +1514,7 @@ 
         $info['content types'][$type_name] = $type;
       }
 
-      cache_set('content_type_info:'. $language->language, $info, content_cache_tablename());
+      cache_set('content_type_info:'.$language->language, $info, content_cache_tablename());
     }
   }
   return $info;
@@ -1585,10 +1585,10 @@ 
     $db_info['table'] = _content_tablename($field['type_name'], CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
   }
 
-  $db_info['columns'] = (array) $field['columns'];
+  $db_info['columns'] = (array)$field['columns'];
   // Generate column names for this field from generic column names.
   foreach ($db_info['columns'] as $column_name => $attributes) {
-    $db_info['columns'][$column_name]['column'] = $field['field_name'] .'_'. $column_name;
+    $db_info['columns'][$column_name]['column'] = $field['field_name'].'_'.$column_name;
   }
 
   return $db_info;
@@ -1682,7 +1682,7 @@ 
 function content_allowed_values($field, $flatten = TRUE) {
   static $allowed_values;
 
-  $cid = $field['field_name'] .':'. ($flatten ? '1' : '0');
+  $cid = $field['field_name'].':'.($flatten ? '1' : '0');
   if (isset($allowed_values[$cid])) {
     return $allowed_values[$cid];
   }
@@ -1710,7 +1710,7 @@ 
       $opt = content_filter_xss($opt);
       if (strpos($opt, '|') !== FALSE) {
         list($key, $value) = explode('|', $opt);
-        $allowed_values[$cid][$key] = (isset($value) && $value !=='') ? $value : $key;
+        $allowed_values[$cid][$key] = (isset($value) && $value !== '') ? $value : $key;
       }
       else {
         $allowed_values[$cid][$opt] = $opt;
@@ -1755,14 +1755,14 @@ 
  * List of tags allowed by content_filter_xss().
  */
 function _content_filter_xss_allowed_tags() {
-  return array('a', 'b', 'big',  'code', 'del', 'em', 'i', 'ins',  'pre', 'q', 'small', 'span', 'strong', 'sub', 'sup', 'tt', 'ol', 'ul', 'li', 'p', 'br', 'img');
+  return array('a', 'b', 'big', 'code', 'del', 'em', 'i', 'ins', 'pre', 'q', 'small', 'span', 'strong', 'sub', 'sup', 'tt', 'ol', 'ul', 'li', 'p', 'br', 'img');
 }
 
 /**
  * Human-readable list of allowed tags, for display in help texts.
  */
 function _content_filter_xss_display_allowed_tags() {
-  return '<'. implode('> <', _content_filter_xss_allowed_tags()) .'>';
+  return '<'.implode('> <', _content_filter_xss_allowed_tags()).'>';
 }
 
 /**
@@ -1795,12 +1795,12 @@ 
   }
 
   if (content_access('view', $field, NULL, $node) && $formatter = _content_get_formatter($formatter_name, $field['type'])) {
-    $theme = $formatter['module'] .'_formatter_'. $formatter_name;
+    $theme = $formatter['module'].'_formatter_'.$formatter_name;
 
     $element = array(
       '#theme' => $theme,
       '#field_name' => $field['field_name'],
-      '#type_name' => isset($node->type) ? $node->type :'',
+      '#type_name' => isset($node->type) ? $node->type : '',
       '#formatter' => $formatter_name,
       '#node' => $node,
       '#delta' => isset($item['#delta']) ? $item['#delta'] : NULL,
@@ -1811,7 +1811,7 @@ 
 
       // hook_field('sanitize') expects an array of items, so we build one.
       $items = array($item);
-      $function = $field['module'] .'_field';
+      $function = $field['module'].'_field';
       if (function_exists($function)) {
         $function('sanitize', $node, $field, $items, FALSE, FALSE);
       }
@@ -1821,7 +1821,7 @@ 
     else {
       // Multiple values formatter.
       $items = $item;
-      $function = $field['module'] .'_field';
+      $function = $field['module'].'_field';
       if (function_exists($function)) {
         $function('sanitize', $node, $field, $items, FALSE, FALSE);
       }
@@ -1856,13 +1856,13 @@ 
   if (!isset($info)) {
     $data = array();
     foreach (module_implements('content_build_modes') as $module) {
-      $function = $module .'_content_build_modes';
-      $data = array_merge($data, (array) $function());
+      $function = $module.'_content_build_modes';
+      $data = array_merge($data, (array)$function());
     }
     $flat = array();
     foreach ($data as $tab) {
       // Use the + operator to preserve numeric indexes (core build modes).
-      $flat += (array) $tab['build modes'];
+      $flat += (array)$tab['build modes'];
     }
     $info = array('tabs' => $data, 'build modes' => $flat);
   }
@@ -1994,13 +1994,13 @@ 
 
   $name = str_replace('-', '_', $name);
   switch ("$version-$storage") {
-    case '0-'. CONTENT_DB_STORAGE_PER_CONTENT_TYPE :
+    case '0-'.CONTENT_DB_STORAGE_PER_CONTENT_TYPE :
       return "node_$name";
-    case '0-'. CONTENT_DB_STORAGE_PER_FIELD :
+    case '0-'.CONTENT_DB_STORAGE_PER_FIELD :
       return "node_data_$name";
-    case '1003-'. CONTENT_DB_STORAGE_PER_CONTENT_TYPE :
+    case '1003-'.CONTENT_DB_STORAGE_PER_CONTENT_TYPE :
       return "content_type_$name";
-    case '1003-'. CONTENT_DB_STORAGE_PER_FIELD :
+    case '1003-'.CONTENT_DB_STORAGE_PER_FIELD :
       return "content_$name";
   }
 }
@@ -2083,7 +2083,7 @@ 
 
   if (!empty($field['columns'])) {
     foreach ($field['columns'] as $column => $attributes) {
-      $column_name =  $field['field_name'] .'_'. $column;
+      $column_name = $field['field_name'].'_'.$column;
       if (isset($attributes['index']) && $attributes['index']) {
         $schema['indexes'][$column_name] = array($column_name);
         unset($attributes['index']);
@@ -2116,7 +2116,7 @@ 
   if ($db_type == 'mysql' || $db_type == 'mysqli') {
     if (version_compare(db_version(), '5.0.3') < 0) {
       // Earlier versions of MySQL don't support a WHERE clause for SHOW.
-      $result = db_query('SHOW INDEX FROM {'. $table .'}');
+      $result = db_query('SHOW INDEX FROM {'.$table.'}');
       while ($row = db_fetch_array($result)) {
         if ($row['Key_name'] == $name) {
           return TRUE;
@@ -2124,12 +2124,12 @@ 
       }
       return FALSE;
     }
-    return (bool)db_result(db_query("SHOW INDEX FROM {". $table ."} WHERE key_name = '$name'"));
+    return (bool)db_result(db_query("SHOW INDEX FROM {".$table."} WHERE key_name = '$name'"));
   }
   elseif ($db_type == 'pgsql') {
     // Note that the index names in Schema API for PostgreSQL are prefixed by
     // the table name and suffixed by '_idx'.
-    return (bool)db_result(db_query("SELECT COUNT(indexname) FROM pg_indexes WHERE indexname = '{". $table ."}_{$name}_idx'"));
+    return (bool)db_result(db_query("SELECT COUNT(indexname) FROM pg_indexes WHERE indexname = '{".$table."}_{$name}_idx'"));
   }
   return FALSE;
 }
@@ -2226,7 +2226,7 @@ 
   elseif (!empty($field['widget']['default_value'])) {
     $default_value = $field['widget']['default_value'];
   }
-  return (array) $default_value;
+  return (array)$default_value;
 }
 
 /**
@@ -2373,7 +2373,7 @@ 
       $variables['items'][$delta]['view'] = isset($element['items'][$delta]['#children']) ? $element['items'][$delta]['#children'] : '';
     }
   }
-  else  {
+  else {
     // Multiple values formatter.
     // We display the 'all items' output as $items[0], as if it was the
     // output of a single valued field.
@@ -2409,9 +2409,9 @@ 
     'field_empty' => $field_empty,
     'template_files' => array(
       'content-field',
-      'content-field-'. $element['#field_name'],
-      'content-field-'. $element['#node']->type,
-      'content-field-'. $element['#field_name'] .'-'. $element['#node']->type,
+      'content-field-'.$element['#field_name'],
+      'content-field-'.$element['#node']->type,
+      'content-field-'.$element['#field_name'].'-'.$element['#node']->type,
     ),
   );
   $variables = array_merge($variables, $additions);
@@ -2629,7 +2629,7 @@ 
       if (empty($type_name) || $content_type['type'] == $type_name) {
         foreach ($content_type['fields'] as $field) {
           $db_info = content_database_info($field);
-          if (db_result(db_query("SELECT COUNT(*) FROM {". $db_info['table'] ."}")) >= 1) {
+          if (db_result(db_query("SELECT COUNT(*) FROM {".$db_info['table']."}")) >= 1) {
             return 0;
           }
         }
@@ -2642,10 +2642,10 @@ 
   else {
     $db_info = content_database_info($field);
     if (!empty($type_name)) {
-      $delta = db_result(db_query("SELECT MAX(delta) FROM {". $db_info['table'] ."} f LEFT JOIN {node} n ON f.vid = n.vid WHERE n.type = '%s'", $type_name));
+      $delta = db_result(db_query("SELECT MAX(delta) FROM {".$db_info['table']."} f LEFT JOIN {node} n ON f.vid = n.vid WHERE n.type = '%s'", $type_name));
     }
     else {
-      $delta = db_result(db_query("SELECT MAX(delta) FROM {". $db_info['table'] ."}"));
+      $delta = db_result(db_query("SELECT MAX(delta) FROM {".$db_info['table']."}"));
     }
     if ($delta >= 0) {
       return $delta;

Braces +36 added lines, -72 removed lines

@@ -242,8 +242,7 @@ 
     foreach ($cached->data as $key => $value) {
       $node->$key = $value;
     }
-  }
-  else {
+  } else {
     $default_additions = _content_field_invoke_default('load', $node);
     if ($default_additions) {
       foreach ($default_additions as $key => $value) {
@@ -458,8 +457,7 @@ 
       // render arrays. Check we're not on a form first.
       if (!isset($elements['#build_id']) && isset($value['view']) && isset($elements[$value['view']])) {
         $elements[$value['view']]['#weight'] = $value['weight'];
-      }
-      elseif (isset($elements[$key])) {
+      } elseif (isset($elements[$key])) {
         $elements[$key]['#weight'] = $value['weight'];
       }
     }
@@ -530,8 +528,7 @@ 
     $output .= drupal_render($element[$element['#field_name'] .'_add_more']);
 
     drupal_add_tabledrag($table_id, 'order', 'sibling', $order_class);
-  }
-  else {
+  } else {
     foreach (element_children($element) as $key) {
       $output .= drupal_render($element[$key]);
     }
@@ -744,8 +741,7 @@ 
       // NODE_BUILD_NORMAL is 0, and ('whatever' == 0) is TRUE, so we need a ===.
       if ($node->build_mode === NODE_BUILD_NORMAL || $node->build_mode == NODE_BUILD_PREVIEW) {
         $context = $teaser ? 'teaser' : 'full';
-      }
-      else {
+      } else {
         $context = $node->build_mode;
       }
       // The field may be missing info for $contexts added by modules
@@ -797,8 +793,7 @@ 
             $element['items'][$delta] += $format_info;
             $element['items'][$delta]['#item']['#delta'] = $delta;
           }
-        }
-        else {
+        } else {
           $element['items'] += $format_info;
         }
 
@@ -829,8 +824,7 @@ 
       $wrapper = NULL;
       if (isset($node->content[$field['field_name']])) {
         $wrapper = $node->content[$field['field_name']];
-      }
-      elseif (module_exists('fieldgroup') && ($group_name = fieldgroup_get_group($node->type, $field['field_name'])) && isset($node->content[$group_name]['group'][$field['field_name']])) {
+      } elseif (module_exists('fieldgroup') && ($group_name = fieldgroup_get_group($node->type, $field['field_name'])) && isset($node->content[$group_name]['group'][$field['field_name']])) {
         $wrapper = $node->content[$group_name]['group'][$field['field_name']];
       }
 
@@ -844,13 +838,11 @@ 
               // '#chilren' is not set if the field is empty.
               $items[$delta]['view'] = isset($element['items'][$delta]['#children']) ? $element['items'][$delta]['#children'] : '';
             }
-          }
-          elseif (isset($element['items']['#children']))  {
+          } elseif (isset($element['items']['#children'])) {
             // Multiple values formatter.
             $items[0]['view'] = $element['items']['#children'];
           }
-        }
-        else {
+        } else {
           // Hidden or inaccessible field.
           $items[0]['view'] = '';
         }
@@ -866,8 +858,7 @@ 
       $wrapper = NULL;
       if (isset($node->content[$field['field_name']])) {
         $wrapper = $node->content[$field['field_name']];
-      }
-      elseif (module_exists('fieldgroup') && ($group_name = fieldgroup_get_group($node->type, $field['field_name'])) && isset($node->content[$group_name]['group'][$field['field_name']])) {
+      } elseif (module_exists('fieldgroup') && ($group_name = fieldgroup_get_group($node->type, $field['field_name'])) && isset($node->content[$group_name]['group'][$field['field_name']])) {
         $wrapper = $node->content[$group_name]['group'][$field['field_name']];
       }
 
@@ -1050,8 +1041,7 @@ 
           // how to handle that.
           if (db_result(db_query("SELECT COUNT(*) FROM {". $table ."} WHERE vid = %d", $node->vid))) {
             content_write_record($table, $record, array('vid'));
-          }
-          else {
+          } else {
             content_write_record($table, $record);
           }
         }
@@ -1134,8 +1124,7 @@ 
   if (is_array($object)) {
     $object = (object) $object;
     $array = TRUE;
-  }
-  else {
+  } else {
     $array = FALSE;
   }
 
@@ -1174,12 +1163,10 @@ 
 
         if (empty($info['serialize'])) {
           $values[] = $object->$field;
-        }
-        else {
+        } else {
           $values[] = serialize($object->$field);
         }
-      }
-      else {
+      } else {
         $placeholders[] = 'NULL';
       }
     }
@@ -1190,8 +1177,7 @@ 
   if (!count($update)) {
     $query = "INSERT INTO {". $table ."} (". implode(', ', $fields) .') VALUES ('. implode(', ', $placeholders) .')';
     $return = SAVED_NEW;
-  }
-  else {
+  } else {
     $query = '';
     foreach ($fields as $id => $field) {
       if ($query) {
@@ -1253,8 +1239,7 @@ 
       $result = $function($op, $node, $field, $items, $teaser, $page);
       if (is_array($result)) {
         $return = array_merge($return, $result);
-      }
-      else if (isset($result)) {
+      } else if (isset($result)) {
         $return[] = $result;
       }
     }
@@ -1279,15 +1264,13 @@ 
   // rather than by field.
   if (in_array($op, array('load', 'insert', 'update', 'delete', 'delete revision'))) {
     return content_storage($op, $node);
-  }
-  else {
+  } else {
     foreach ($type['fields'] as $field) {
       $items = isset($node->$field['field_name']) ? $node->$field['field_name'] : array();
       $result = content_field($op, $node, $field, $items, $teaser, $page);
       if (is_array($result)) {
         $return = array_merge($return, $result);
-      }
-      else if (isset($result)) {
+      } else if (isset($result)) {
         $return[] = $result;
       }
       if (isset($node->$field['field_name'])) {
@@ -1410,8 +1393,7 @@ 
 
     if (!$reset && $cached = cache_get('content_type_info:'. $language->language, content_cache_tablename())) {
       $info = $cached->data;
-    }
-    else {
+    } else {
       $info = array(
         'field types' => array(),
         'widget types' => array(),
@@ -1580,8 +1562,7 @@ 
   $db_info = array();
   if ($field['db_storage'] == CONTENT_DB_STORAGE_PER_FIELD) {
     $db_info['table'] = _content_tablename($field['field_name'], CONTENT_DB_STORAGE_PER_FIELD);
-  }
-  else {
+  } else {
     $db_info['table'] = _content_tablename($field['type_name'], CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
   }
 
@@ -1600,8 +1581,7 @@ 
 function content_storage_type($field) {
   if ($field['multiple'] > 0) {
     return CONTENT_DB_STORAGE_PER_FIELD;
-  }
-  else {
+  } else {
     module_load_include('inc', 'content', 'includes/content.crud');
     $instances = content_field_instance_read(array('field_name' => $field['field_name']));
     if (count($instances) > 1) {
@@ -1655,8 +1635,7 @@ 
     foreach ($array as $key => $value) {
       if (is_array($value)) {
         $result += content_array_flatten($value);
-      }
-      else {
+      } else {
         $result[$key] = $value;
       }
     }
@@ -1711,8 +1690,7 @@ 
       if (strpos($opt, '|') !== FALSE) {
         list($key, $value) = explode('|', $opt);
         $allowed_values[$cid][$key] = (isset($value) && $value !=='') ? $value : $key;
-      }
-      else {
+      } else {
         $allowed_values[$cid][$opt] = $opt;
       }
     }
@@ -1733,8 +1711,7 @@ 
   foreach ($options as $key => $opt) {
     if (is_array($opt)) {
       content_allowed_values_filter_html($options[$key]);
-    }
-    else {
+    } else {
       $options[$key] = html_entity_decode(strip_tags($opt), ENT_QUOTES);
     }
   }
@@ -1817,8 +1794,7 @@ 
       }
 
       $element['#item'] = $items[0];
-    }
-    else {
+    } else {
       // Multiple values formatter.
       $items = $item;
       $function = $field['module'] .'_field';
@@ -1869,11 +1845,9 @@ 
 
   if ($selector === '_tabs') {
     return $info['tabs'];
-  }
-  elseif (isset($selector) && isset($info['tabs'][$selector])) {
+  } elseif (isset($selector) && isset($info['tabs'][$selector])) {
     return isset($info['tabs'][$selector]) ? $info['tabs'][$selector]['build modes'] : array();
-  }
-  else {
+  } else {
     return $info['build modes'];
   }
 }
@@ -1987,8 +1961,7 @@ 
 
   if ($version < 1003) {
     $version = 0;
-  }
-  else {
+  } else {
     $version = 1003;
   }
 
@@ -2042,8 +2015,7 @@ 
 function content_cache_tablename() {
   if (variable_get('content_schema_version', -1) < 6000) {
     return 'cache';
-  }
-  else {
+  } else {
     return 'cache_content';
   }
 }
@@ -2125,8 +2097,7 @@ 
       return FALSE;
     }
     return (bool)db_result(db_query("SHOW INDEX FROM {". $table ."} WHERE key_name = '$name'"));
-  }
-  elseif ($db_type == 'pgsql') {
+  } elseif ($db_type == 'pgsql') {
     // Note that the index names in Schema API for PostgreSQL are prefixed by
     // the table name and suffixed by '_idx'.
     return (bool)db_result(db_query("SELECT COUNT(indexname) FROM pg_indexes WHERE indexname = '{". $table ."}_{$name}_idx'"));
@@ -2222,8 +2193,7 @@ 
     if (is_array($result)) {
       $default_value = $result;
     }
-  }
-  elseif (!empty($field['widget']['default_value'])) {
+  } elseif (!empty($field['widget']['default_value'])) {
     $default_value = $field['widget']['default_value'];
   }
   return (array) $default_value;
@@ -2336,8 +2306,7 @@ 
     || !is_array($object['display_settings'][$context])
     || empty($object['display_settings'][$context]['exclude'])) {
     return FALSE;
-  }
-  else {
+  } else {
     return TRUE;
   }
 }
@@ -2372,8 +2341,7 @@ 
       // Use isset() to avoid undefined index message on #children when field values are empty.
       $variables['items'][$delta]['view'] = isset($element['items'][$delta]['#children']) ? $element['items'][$delta]['#children'] : '';
     }
-  }
-  else  {
+  } else {
     // Multiple values formatter.
     // We display the 'all items' output as $items[0], as if it was the
     // output of a single valued field.
@@ -2392,8 +2360,7 @@ 
   foreach ($variables['items'] as $delta => $item) {
     if (!isset($item['view']) || (empty($item['view']) && (string)$item['view'] !== '0')) {
       $variables['items'][$delta]['empty'] = TRUE;
-    }
-    else {
+    } else {
       $field_empty = FALSE;
       $variables['items'][$delta]['empty'] = FALSE;
     }
@@ -2643,8 +2610,7 @@ 
     $db_info = content_database_info($field);
     if (!empty($type_name)) {
       $delta = db_result(db_query("SELECT MAX(delta) FROM {". $db_info['table'] ."} f LEFT JOIN {node} n ON f.vid = n.vid WHERE n.type = '%s'", $type_name));
-    }
-    else {
+    } else {
       $delta = db_result(db_query("SELECT MAX(delta) FROM {". $db_info['table'] ."}"));
     }
     if ($delta >= 0) {
@@ -2663,8 +2629,7 @@ 
   if (!empty($type_name)) {
     $param = array('type_name' => $type_name);
     $inactive = array($type_name => array());
-  }
-  else {
+  } else {
     $param = array();
     $inactive = array();
   }
@@ -2693,8 +2658,7 @@ 
   if (!empty($type_name)) {
     $param = array('type_name' => $type_name);
     $inactive = array($type_name => array());
-  }
-  else {
+  } else {
     $param = array();
     $inactive = array();
   }

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

@@ -179,7 +179,7 @@ 
   return array(
     'content_field' => array(
       'template' => 'content-field',
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
       'path' => $path,
     ),
     'content_overview_links' => array(
@@ -189,22 +189,22 @@ 
       'template' => 'content-admin-field-overview-form',
       'file' => 'theme.inc',
       'path' => $path,
-      'arguments' => array('form' => NULL),
+      'arguments' => array('form' => null),
     ),
     'content_display_overview_form' => array(
       'template' => 'content-admin-display-overview-form',
       'file' => 'theme.inc',
       'path' => $path,
-      'arguments' => array('form' => NULL),
+      'arguments' => array('form' => null),
     ),
     'content_exclude' => array(
-      'arguments' => array('content' => NULL, 'object' => array(), 'context' => NULL),
+      'arguments' => array('content' => null, 'object' => array(), 'context' => null),
     ),
     'content_view_multiple_field' => array(
-      'arguments' => array('items' => NULL, 'field' => NULL, 'data' => NULL),
+      'arguments' => array('items' => null, 'field' => null, 'data' => null),
     ),
     'content_multiple_values' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
   );
 }
@@ -265,7 +265,7 @@ 
  * Implementation of hook_nodeapi 'validate' op.
  *
  */
-function content_validate(&$node, $form = NULL) {
+function content_validate(&$node, $form = null) {
   _content_field_invoke('validate', $node, $form);
   _content_field_invoke_default('validate', $node, $form);
 }
@@ -308,7 +308,7 @@ 
 function content_delete(&$node) {
   _content_field_invoke('delete', $node);
   _content_field_invoke_default('delete', $node);
-  cache_clear_all('content:'. $node->nid .':', content_cache_tablename(), TRUE);
+  cache_clear_all('content:'. $node->nid .':', content_cache_tablename(), true);
 }
 
 /**
@@ -327,7 +327,7 @@ 
  *
  * Generate field render arrays.
  */
-function content_view(&$node, $teaser = FALSE, $page = FALSE) {
+function content_view(&$node, $teaser = false, $page = false) {
   // Let field modules sanitize their data for output.
   _content_field_invoke('sanitize', $node, $teaser, $page);
 
@@ -360,7 +360,7 @@ 
  * @return
  *   The themed output for the field.
  */
-function content_view_field($field, $node, $teaser = FALSE, $page = FALSE) {
+function content_view_field($field, $node, $teaser = false, $page = false) {
   $output = '';
   if (isset($node->$field['field_name'])) {
     $items = $node->$field['field_name'];
@@ -391,7 +391,7 @@ 
  * Add back the formatted values in the 'view' element for all fields,
  * so that node templates can use it.
  */
-function content_alter(&$node, $teaser = FALSE, $page = FALSE) {
+function content_alter(&$node, $teaser = false, $page = false) {
   _content_field_invoke_default('alter', $node, $teaser, $page);
 }
 
@@ -411,7 +411,7 @@ 
 /**
  * Implementation of hook_nodeapi().
  */
-function content_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
+function content_nodeapi(&$node, $op, $a3 = null, $a4 = null) {
   // Prevent against invalid 'nodes' built by broken 3rd party code.
   if (isset($node->type)) {
     $type = content_types($node->type);
@@ -568,11 +568,11 @@ 
       // When CCK modules are disabled before content module's update is run
       // to add the active column, we can't do this.
       if (variable_get('content_schema_version', -1) < 6007) {
-        return FALSE;
+        return false;
       }
       db_query("UPDATE {". content_field_tablename() ."} SET active=0 WHERE module='%s'", $module);
       db_query("UPDATE {". content_instance_tablename() ."} SET widget_active=0 WHERE widget_module='%s'", $module);
-      content_clear_type_cache(TRUE);
+      content_clear_type_cache(true);
       break;
   }
 }
@@ -587,7 +587,7 @@ 
   // When CCK modules are enabled before content module's update is run,
   // to add module and active columns, we can't do this.
   if (variable_get('content_schema_version', -1) < 6007) {
-    return FALSE;
+    return false;
   }
   $module_fields = module_invoke($module, 'field_info');
   if ($module_fields) {
@@ -708,7 +708,7 @@ 
       // Missing fields on node update are handled in content_storage().
       if (empty($items) && !isset($node->nid)) {
         foreach (array_keys($field['columns']) as $column) {
-          $items[0][$column] = NULL;
+          $items[0][$column] = null;
         }
         $node->$field['field_name'] = $items;
       }
@@ -765,7 +765,7 @@ 
           '#type' => 'content_field',
           '#title' => check_plain(t($field['widget']['label'])),
           '#field_name' => $field['field_name'],
-          '#access' => $formatter_name != 'hidden' && content_access('view', $field, NULL, $node),
+          '#access' => $formatter_name != 'hidden' && content_access('view', $field, null, $node),
           '#label_display' => $label_display,
           '#node' => $node,
           '#teaser' => $teaser,
@@ -826,7 +826,7 @@ 
 
       // The location of the field's rendered output depends on whether the
       // field is in a fieldgroup or not.
-      $wrapper = NULL;
+      $wrapper = null;
       if (isset($node->content[$field['field_name']])) {
         $wrapper = $node->content[$field['field_name']];
       }
@@ -863,7 +863,7 @@ 
 
       // The location of the field's rendered output depends on whether the
       // field is in a fieldgroup or not.
-      $wrapper = NULL;
+      $wrapper = null;
       if (isset($node->content[$field['field_name']])) {
         $wrapper = $node->content[$field['field_name']];
       }
@@ -911,7 +911,7 @@ 
   // Make sure we store the right number of 'empty' values.
   $empty = array();
   foreach (array_keys($field['columns']) as $column) {
-    $empty[$column] = NULL;
+    $empty[$column] = null;
   }
   $pad = $field['multiple'] > 1 ? $field['multiple'] : 1;
   $filtered = array_pad($filtered, $pad, $empty);
@@ -967,7 +967,7 @@ 
   // Don't try this before content module's update is run to add
   // the active and module columns.
   if (variable_get('content_schema_version', -1) < 6007) {
-    return FALSE;
+    return false;
   }
 
   $type_name = $node->type;
@@ -1133,15 +1133,15 @@ 
   // Convert to an object if needed.
   if (is_array($object)) {
     $object = (object) $object;
-    $array = TRUE;
+    $array = true;
   }
   else {
-    $array = FALSE;
+    $array = false;
   }
 
   $schema = drupal_get_schema($table);
   if (empty($schema)) {
-    return FALSE;
+    return false;
   }
 
   $fields = $defs = $values = $serials = $placeholders = array();
@@ -1226,7 +1226,7 @@ 
     return $return;
   }
 
-  return FALSE;
+  return false;
 }
 
 /**
@@ -1235,7 +1235,7 @@ 
  * For each operation, both this function and _content_field_invoke_default() are
  * called so that the default database handling can occur.
  */
-function _content_field_invoke($op, &$node, $teaser = NULL, $page = NULL) {
+function _content_field_invoke($op, &$node, $teaser = null, $page = null) {
   $type_name = is_string($node) ? $node : (is_array($node) ? $node['type'] : $node->type);
   $type = content_types($type_name);
   $field_types = _content_field_types();
@@ -1269,7 +1269,7 @@ 
 /**
  * Invoke content.module's version of a field hook.
  */
-function _content_field_invoke_default($op, &$node, $teaser = NULL, $page = NULL) {
+function _content_field_invoke_default($op, &$node, $teaser = null, $page = null) {
   $type_name = is_string($node) ? $node : (is_array($node) ? $node['type'] : $node->type);
   $type = content_types($type_name);
   $field_types = _content_field_types();
@@ -1307,9 +1307,9 @@ 
  * Do some type checking and set up empty arrays for missing
  * info to avoid foreach errors elsewhere in the code.
  */
-function content_types($type_name = NULL) {
+function content_types($type_name = null) {
   // handle type name with either an underscore or a dash
-  $type_name = !empty($type_name) ? str_replace('-', '_', $type_name) : NULL;
+  $type_name = !empty($type_name) ? str_replace('-', '_', $type_name) : null;
 
   $info = _content_type_info();
   if (isset($info['content types'])) {
@@ -1336,7 +1336,7 @@ 
  * content_type_name to avoid bad results when the value is set
  * but empty, as sometimes happens in the formatter.
  */
-function content_fields($field_name = NULL, $content_type_name = NULL) {
+function content_fields($field_name = null, $content_type_name = null) {
   $info = _content_type_info();
   if (isset($info['fields'])) {
     if (empty($field_name)) {
@@ -1383,7 +1383,7 @@ 
     $formatter_name = 'default';
   }
 
-  return isset($formatters[$formatter_name]) ? $formatters[$formatter_name] : FALSE;
+  return isset($formatters[$formatter_name]) ? $formatters[$formatter_name] : false;
 }
 
 /**
@@ -1392,7 +1392,7 @@ 
  * @param $reset
  *   If TRUE, clear the cache and fetch the information from the database again.
  */
-function _content_type_info($reset = FALSE) {
+function _content_type_info($reset = false) {
   global $language;
   static $info;
 
@@ -1468,7 +1468,7 @@ 
 
       // Populate actual field instances.
       module_load_include('inc', 'content', 'includes/content.crud');
-      foreach (node_get_types('types', NULL, TRUE) as $type_name => $data) {
+      foreach (node_get_types('types', null, true) as $type_name => $data) {
         $type = (array) $data;
         $type['url_str'] = str_replace('_', '-', $type['type']);
         $type['fields'] = array();
@@ -1545,13 +1545,13 @@ 
  * Clear the cache of content_types; called in several places when content
  * information is changed.
  */
-function content_clear_type_cache($rebuild_schema = FALSE) {
-  cache_clear_all('*', content_cache_tablename(), TRUE);
-  _content_type_info(TRUE);
+function content_clear_type_cache($rebuild_schema = false) {
+  cache_clear_all('*', content_cache_tablename(), true);
+  _content_type_info(true);
 
   // Refresh the schema to pick up new information.
   if ($rebuild_schema) {
-    $schema = drupal_get_schema(NULL, TRUE);
+    $schema = drupal_get_schema(null, true);
   }
 
   if (module_exists('views')) {
@@ -1679,7 +1679,7 @@ 
  *   FALSE can be used to support optgroups for select widgets
  *   when allowed values list is generated using PHP code.
  */
-function content_allowed_values($field, $flatten = TRUE) {
+function content_allowed_values($field, $flatten = true) {
   static $allowed_values;
 
   $cid = $field['field_name'] .':'. ($flatten ? '1' : '0');
@@ -1708,7 +1708,7 @@ 
     foreach ($list as $opt) {
       // Sanitize the user input with a permissive filter.
       $opt = content_filter_xss($opt);
-      if (strpos($opt, '|') !== FALSE) {
+      if (strpos($opt, '|') !== false) {
         list($key, $value) = explode('|', $opt);
         $allowed_values[$cid][$key] = (isset($value) && $value !=='') ? $value : $key;
       }
@@ -1789,12 +1789,12 @@ 
  *   It will have been passed through the necessary check_plain() or check_markup()
  *   functions as necessary.
  */
-function content_format($field, $item, $formatter_name = 'default', $node = NULL) {
+function content_format($field, $item, $formatter_name = 'default', $node = null) {
   if (!is_array($field)) {
     $field = content_fields($field);
   }
 
-  if (content_access('view', $field, NULL, $node) && $formatter = _content_get_formatter($formatter_name, $field['type'])) {
+  if (content_access('view', $field, null, $node) && $formatter = _content_get_formatter($formatter_name, $field['type'])) {
     $theme = $formatter['module'] .'_formatter_'. $formatter_name;
 
     $element = array(
@@ -1803,7 +1803,7 @@ 
       '#type_name' => isset($node->type) ? $node->type :'',
       '#formatter' => $formatter_name,
       '#node' => $node,
-      '#delta' => isset($item['#delta']) ? $item['#delta'] : NULL,
+      '#delta' => isset($item['#delta']) ? $item['#delta'] : null,
     );
 
     if (content_handle('formatter', 'multiple values', $formatter) == CONTENT_HANDLE_CORE) {
@@ -1813,7 +1813,7 @@ 
       $items = array($item);
       $function = $field['module'] .'_field';
       if (function_exists($function)) {
-        $function('sanitize', $node, $field, $items, FALSE, FALSE);
+        $function('sanitize', $node, $field, $items, false, false);
       }
 
       $element['#item'] = $items[0];
@@ -1823,7 +1823,7 @@ 
       $items = $item;
       $function = $field['module'] .'_field';
       if (function_exists($function)) {
-        $function('sanitize', $node, $field, $items, FALSE, FALSE);
+        $function('sanitize', $node, $field, $items, false, false);
       }
 
       foreach ($items as $delta => $item) {
@@ -1850,7 +1850,7 @@ 
  *   - '_tabs': the list of tabs to be shown on the 'Display fields' screens.
  *   - a string tab id: the build modes in this tab.
  */
-function content_build_modes($selector = NULL) {
+function content_build_modes($selector = null) {
   static $info;
 
   if (!isset($info)) {
@@ -1920,11 +1920,11 @@ 
       'build modes' => array(
         'teaser' => array(
           'title' => t('Teaser'),
-          'views style' => TRUE,
+          'views style' => true,
         ),
         'full' => array(
           'title' => t('Full node'),
-          'views style' => TRUE,
+          'views style' => true,
         ),
       ),
     ),
@@ -1933,7 +1933,7 @@ 
       'build modes' => array(
         NODE_BUILD_RSS => array(
           'title' => t('RSS'),
-          'views style' => FALSE,
+          'views style' => false,
         ),
       ),
     ),
@@ -1946,11 +1946,11 @@ 
       'build modes' => array(
         NODE_BUILD_SEARCH_INDEX => array(
           'title' => t('Search Index'),
-          'views style' => FALSE,
+          'views style' => false,
         ),
         NODE_BUILD_SEARCH_RESULT => array(
           'title' => t('Search Result'),
-          'views style' => FALSE,
+          'views style' => false,
         ),
       ),
     ),
@@ -1963,7 +1963,7 @@ 
       'build modes' => array(
         NODE_BUILD_PRINT => array(
           'title' => t('Print'),
-          'views style' => TRUE,
+          'views style' => true,
         ),
       ),
     ),
@@ -1980,7 +1980,7 @@ 
  * @return
  *   A string containing the generated name for the database table
  */
-function _content_tablename($name, $storage, $version = NULL) {
+function _content_tablename($name, $storage, $version = null) {
   if (is_null($version)) {
     $version = variable_get('content_schema_version', 0);
   }
@@ -2013,7 +2013,7 @@ 
  * to avoid conflicts with field tables that will be prefixed
  * with 'content_field'.
  */
-function content_field_tablename($version = NULL) {
+function content_field_tablename($version = null) {
   if (is_null($version)) {
     $version = variable_get('content_schema_version', 0);
   }
@@ -2025,7 +2025,7 @@ 
  *
  * Needed because the table name changes depending on version.
  */
-function content_instance_tablename($version = NULL) {
+function content_instance_tablename($version = null) {
   if (is_null($version)) {
     $version = variable_get('content_schema_version', 0);
   }
@@ -2055,11 +2055,11 @@ 
  * Leave $field['columns'] empty to get only the base schema,
  * otherwise the function will return the whole thing.
  */
-function content_table_schema($field = NULL) {
+function content_table_schema($field = null) {
   $schema = array(
     'fields' => array(
-      'vid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
-      'nid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0)
+      'vid' => array('type' => 'int', 'unsigned' => true, 'not null' => true, 'default' => 0),
+      'nid' => array('type' => 'int', 'unsigned' => true, 'not null' => true, 'default' => 0)
     ),
     'primary key' => array('vid'),
     'indexes' => array(
@@ -2069,7 +2069,7 @@ 
 
   // Add delta column if needed.
   if (!empty($field['multiple'])) {
-    $schema['fields']['delta'] = array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0);
+    $schema['fields']['delta'] = array('type' => 'int', 'unsigned' => true, 'not null' => true, 'default' => 0);
     $schema['primary key'][] = 'delta';
   }
   $schema['content fields'] = array();
@@ -2119,10 +2119,10 @@ 
       $result = db_query('SHOW INDEX FROM {'. $table .'}');
       while ($row = db_fetch_array($result)) {
         if ($row['Key_name'] == $name) {
-          return TRUE;
+          return true;
         }
       }
-      return FALSE;
+      return false;
     }
     return (bool)db_result(db_query("SHOW INDEX FROM {". $table ."} WHERE key_name = '$name'"));
   }
@@ -2131,7 +2131,7 @@ 
     // the table name and suffixed by '_idx'.
     return (bool)db_result(db_query("SELECT COUNT(indexname) FROM pg_indexes WHERE indexname = '{". $table ."}_{$name}_idx'"));
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -2246,7 +2246,7 @@ 
  *   TRUE if the operation is allowed;
  *   FALSE if the operation is denied.
  */
-function content_access($op, $field, $account = NULL, $node = NULL) {
+function content_access($op, $field, $account = null, $node = null) {
   global $user;
 
   if (is_null($account)) {
@@ -2254,15 +2254,15 @@ 
   }
   // Check for valid field data.
   if (!isset($field['field_name'])) {
-    return FALSE;
+    return false;
   }
   $access = module_invoke_all('field_access', $op, $field, $account, $node);
   foreach ($access as $value) {
-    if ($value === FALSE) {
-      return FALSE;
+    if ($value === false) {
+      return false;
     }
   }
-  return TRUE;
+  return true;
 }
 
  /**
@@ -2335,10 +2335,10 @@ 
     || empty($object['display_settings'][$context])
     || !is_array($object['display_settings'][$context])
     || empty($object['display_settings'][$context]['exclude'])) {
-    return FALSE;
+    return false;
   }
   else {
-    return TRUE;
+    return true;
   }
 }
 
@@ -2387,15 +2387,15 @@ 
   $variables['teaser'] = $element['#teaser'];
   $variables['page'] = $element['#page'];
 
-  $field_empty = TRUE;
+  $field_empty = true;
 
   foreach ($variables['items'] as $delta => $item) {
     if (!isset($item['view']) || (empty($item['view']) && (string)$item['view'] !== '0')) {
-      $variables['items'][$delta]['empty'] = TRUE;
+      $variables['items'][$delta]['empty'] = true;
     }
     else {
-      $field_empty = FALSE;
-      $variables['items'][$delta]['empty'] = FALSE;
+      $field_empty = false;
+      $variables['items'][$delta]['empty'] = false;
     }
   }
 
@@ -2549,7 +2549,7 @@ 
       'weight' => -3
     );
   }
-  if (module_exists('upload') && variable_get("upload_$type_name", TRUE)) {
+  if (module_exists('upload') && variable_get("upload_$type_name", true)) {
     $extra['attachments'] = array(
       'label' => t('File attachments'),
       'description' => t('Upload module form.'),
@@ -2616,7 +2616,7 @@ 
  * Fields with only NULL data will show up as being in use.
  * Do we want to eliminate them from the results?
  */
-function content_max_delta($field_name, $type_name = NULL) {
+function content_max_delta($field_name, $type_name = null) {
   $fields = content_fields();
   $field = $fields[$field_name];
 
@@ -2652,13 +2652,13 @@ 
     }
   }
   // If we got this far, there is no data for this field.
-  return NULL;
+  return null;
 }
 
 /**
  * Helper function to identify inactive fields.
  */
-function content_inactive_fields($type_name = NULL) {
+function content_inactive_fields($type_name = null) {
   module_load_include('inc', 'content', 'includes/content.crud');
   if (!empty($type_name)) {
     $param = array('type_name' => $type_name);
@@ -2668,7 +2668,7 @@ 
     $param = array();
     $inactive = array();
   }
-  $all = content_field_instance_read($param, TRUE);
+  $all = content_field_instance_read($param, true);
   $active = array_keys(content_fields());
   foreach ($all as $field) {
     if (!in_array($field['field_name'], $active)) {
@@ -2688,7 +2688,7 @@ 
  * EXCEPT that his function will return inactive instances even 
  * if the fields have other (shared) instances that are still active.
  */
-function content_inactive_instances($type_name = NULL) {
+function content_inactive_instances($type_name = null) {
   module_load_include('inc', 'content', 'includes/content.crud');
   if (!empty($type_name)) {
     $param = array('type_name' => $type_name);
@@ -2698,7 +2698,7 @@ 
     $param = array();
     $inactive = array();
   }
-  $all = content_field_instance_read($param, TRUE);
+  $all = content_field_instance_read($param, true);
   foreach ($all as $field) {
     $inactive[$field['type_name']][$field['field_name']] = content_field_instance_expand($field);
   }

drupal/sites/default/boinc/modules/contrib/content_profile/modules/content_profile_registration.module

Indentation +107 added lines, -107 removed lines

@@ -10,7 +10,7 @@ 
  * Implementation of hook_form_alter().
  */
 function content_profile_registration_form_alter(&$form, &$form_state, $form_id) {
-  if ($form_id == 'user_register') {
+    if ($form_id == 'user_register') {
     require_once drupal_get_path('module', 'node') .'/node.pages.inc';
 
     // Allow other modules to customize the used profile types, so modules
@@ -19,44 +19,44 @@ 
     $form += array('#content_profile_registration_use_types' => $default_types);
 
     foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
-      content_profile_registration_add_profile_form($type, $form, $form_state);
+        content_profile_registration_add_profile_form($type, $form, $form_state);
     }
-  }
-  elseif ($form_id == 'content_profile_admin_settings') {
+    }
+    elseif ($form_id == 'content_profile_admin_settings') {
     $type = $form_state['type'];
     // Let other modules add registration child elements before us!
     $form += array('registration' => array());
     $form['registration'] += array(
-      '#type' => 'fieldset',
-      '#title' => t('User Registration'),
-      '#description' => t('Customize how this content profile shows up on the user registration page.'),
-      '#collapsible' => TRUE,
+        '#type' => 'fieldset',
+        '#title' => t('User Registration'),
+        '#description' => t('Customize how this content profile shows up on the user registration page.'),
+        '#collapsible' => TRUE,
     );
     $form['registration']['registration_use'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Use on Registration'),
-      '#description' => t('Use this content type on the user registration page'),
-      '#default_value' => content_profile_get_settings($type, 'registration_use'),
+        '#type' => 'checkbox',
+        '#title' => t('Use on Registration'),
+        '#description' => t('Use this content type on the user registration page'),
+        '#default_value' => content_profile_get_settings($type, 'registration_use'),
     );
     $form['registration']['admin_user_create_use'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Use on administrative user creation form'),
-      '#description' => t('Use this content type when an administrative user creates a new user'),
-      '#default_value' => content_profile_get_settings($type, 'admin_user_create_use'),
+        '#type' => 'checkbox',
+        '#title' => t('Use on administrative user creation form'),
+        '#description' => t('Use this content type when an administrative user creates a new user'),
+        '#default_value' => content_profile_get_settings($type, 'admin_user_create_use'),
     );
     $form['registration']['registration_hide'] = array(
-      '#type' => 'checkboxes',
-      '#title' => t('Hide form fields'),
-      '#description' => t('Hide fields from the user registration form. Required fields cannot be hidden and are not shown here.'),
-      '#options' => _content_profile_registration_get_field_select($type),
-      '#default_value' => content_profile_get_settings($type, 'registration_hide'),
+        '#type' => 'checkboxes',
+        '#title' => t('Hide form fields'),
+        '#description' => t('Hide fields from the user registration form. Required fields cannot be hidden and are not shown here.'),
+        '#options' => _content_profile_registration_get_field_select($type),
+        '#default_value' => content_profile_get_settings($type, 'registration_hide'),
     );
     array_unshift($form['#submit'], 'content_profile_registration_admin_form_submit');
-  }
+    }
 }
 
 function content_profile_registration_admin_form_submit($form, &$form_state) {
-  $form_state['values']['registration_hide'] = array_keys(array_filter($form_state['values']['registration_hide']));
+    $form_state['values']['registration_hide'] = array_keys(array_filter($form_state['values']['registration_hide']));
 }
 
 /**
@@ -68,8 +68,8 @@ 
  *   Associated fields for the given content type.
  */
 function _content_profile_registration_get_fields($type) {
-  $typeinfo = content_types($type);
-  return $typeinfo['fields'];
+    $typeinfo = content_types($type);
+    return $typeinfo['fields'];
 }
 
 /**
@@ -81,19 +81,19 @@ 
  *   An array of fields suitable for use in a select field.
 */
 function _content_profile_registration_get_field_select($type) {
-  $fields = module_exists('content') ? _content_profile_registration_get_fields($type) : array();
-  $return = array();
-  if (!module_exists('auto_nodetitle') || auto_nodetitle_get_setting($type) != AUTO_NODETITLE_ENABLED) {
+    $fields = module_exists('content') ? _content_profile_registration_get_fields($type) : array();
+    $return = array();
+    if (!module_exists('auto_nodetitle') || auto_nodetitle_get_setting($type) != AUTO_NODETITLE_ENABLED) {
     $return['title'] = t('Title');
-  }
-  foreach ($fields as $fieldname => $info) {
+    }
+    foreach ($fields as $fieldname => $info) {
     if (!$info['required']) {
-      $return[$fieldname] = drupal_ucfirst($info['widget']['label']);
+        $return[$fieldname] = drupal_ucfirst($info['widget']['label']);
     }
-  }
-  $return['other'] = t('Other form elements (except for required CCK fields)');
+    }
+    $return['other'] = t('Other form elements (except for required CCK fields)');
   
-  return $return;
+    return $return;
 }
 
 /**
@@ -104,28 +104,28 @@ 
  * @see content_profile_registration_user_register_submit()
  */
 function content_profile_registration_add_profile_form($type, &$form, &$form_state) {
-  // Initialize new node and add in its form.
-  $node = array('uid' => 0, 'name' => '', 'type' => $type);
-  // Get the original node form.
-  $node_form = drupal_retrieve_form($type .'_node_form', $form_state, $node);
-  drupal_prepare_form($type .'_node_form', $node_form, $form_state);
+    // Initialize new node and add in its form.
+    $node = array('uid' => 0, 'name' => '', 'type' => $type);
+    // Get the original node form.
+    $node_form = drupal_retrieve_form($type .'_node_form', $form_state, $node);
+    drupal_prepare_form($type .'_node_form', $node_form, $form_state);
 
-  $node_form += array('#field_info' => array());
-  $form_add = array();
+    $node_form += array('#field_info' => array());
+    $form_add = array();
 
-  // If non-CCK form elements are hidden, only copy over the CCK stuff
-  if (in_array('other', content_profile_get_settings($type, 'registration_hide'))) {
+    // If non-CCK form elements are hidden, only copy over the CCK stuff
+    if (in_array('other', content_profile_get_settings($type, 'registration_hide'))) {
     foreach ($node_form['#field_info'] as $field_name => $info) {
-      if (isset($node_form[$field_name])) {
+        if (isset($node_form[$field_name])) {
         $form_add[$field_name] = $node_form[$field_name];
-      }
+        }
     }
     // Copy over any fieldgroups
     $keys = array_keys($node_form);
     foreach ($keys as $key) {
-      if (stristr($key, 'group_')) {
+        if (stristr($key, 'group_')) {
         $form_add[$key] = $node_form[$key];
-      }
+        }
     }
     // Add the title
     $form_add['title'] = $node_form['title'];
@@ -133,51 +133,51 @@ 
     // Set this to the values of one node, as it might be need by some #ahah callbacks
     $form_add['#node'] = $node_form['#node'];
     $form_add['type'] = $node_form['type'];
-  }
-  else {
+    }
+    else {
     foreach (array('uid', 'name', 'author', 'buttons', 'language', '#theme', 'options') as $key) {
-      unset($node_form[$key]);
+        unset($node_form[$key]);
     }
     $form_add = $node_form;
-  }
+    }
 
-  // Hide fields as configured
-  foreach (content_profile_get_settings($type, 'registration_hide') as $field_name) {
+    // Hide fields as configured
+    foreach (content_profile_get_settings($type, 'registration_hide') as $field_name) {
     if (module_exists('fieldgroup') && ($group_name = _fieldgroup_field_get_group($type, $field_name))) {
-      unset($form_add[$group_name][$field_name]);
-      if (count(element_children($form_add[$group_name])) == 0) {
+        unset($form_add[$group_name][$field_name]);
+        if (count(element_children($form_add[$group_name])) == 0) {
         unset($form_add[$group_name]);
-      }
+        }
     }
     else {
-      unset($form_add[$field_name]);
+        unset($form_add[$field_name]);
+    }
     }
-  }
   
-  // Add in the new form elements into $form.
-  $form += array('#field_info' => array());
-  $form['#field_info'] += $node_form['#field_info'];
-  $form += $form_add;
+    // Add in the new form elements into $form.
+    $form += array('#field_info' => array());
+    $form['#field_info'] += $node_form['#field_info'];
+    $form += $form_add;
   
-  // Add in further callbacks needed, if not yet done.
-  if (!isset($form['#content_profile_weights'])) {
+    // Add in further callbacks needed, if not yet done.
+    if (!isset($form['#content_profile_weights'])) {
     $form['#submit'][] = 'content_profile_registration_user_register_submit';
     $form['#validate'][] = 'content_profile_registration_user_register_validate';
     $form['#pre_render'][] = 'content_profile_registration_alter_weights';
-  }
+    }
 
-  // Care for the weights: Make use of the content types weight and sort the fields in behalf
-  // The weights will be applied by the pre_render callback.
-  $form += array('#content_profile_weights' => array());
-  $weight = content_profile_get_settings($type, 'weight') + 1;
-  foreach (element_children($form_add) as $key) {
+    // Care for the weights: Make use of the content types weight and sort the fields in behalf
+    // The weights will be applied by the pre_render callback.
+    $form += array('#content_profile_weights' => array());
+    $weight = content_profile_get_settings($type, 'weight') + 1;
+    foreach (element_children($form_add) as $key) {
     $form['#content_profile_weights'] += array($key => $weight);
-  }
+    }
 
-  // Set the enctype, if necessary.
-  if (isset($node_form['#attributes']['enctype'])){
+    // Set the enctype, if necessary.
+    if (isset($node_form['#attributes']['enctype'])){
     $form['#attributes']['enctype'] = $node_form['#attributes']['enctype'];
-  }
+    }
 }
 
 /**
@@ -187,13 +187,13 @@ 
  * @see content_profile_registration_add_profile_form().
  */
 function content_profile_registration_alter_weights($elements) {
-  foreach ($elements['#content_profile_weights'] as $key => $weight) {
+    foreach ($elements['#content_profile_weights'] as $key => $weight) {
     if (isset($elements[$key]) && is_array($elements[$key])) {
-      $elements[$key] += array('#weight' => 0);
-      $elements[$key]['#weight'] = $weight + $elements[$key]['#weight'] / 1000;
+        $elements[$key] += array('#weight' => 0);
+        $elements[$key]['#weight'] = $weight + $elements[$key]['#weight'] / 1000;
     }
-  }
-  return $elements;
+    }
+    return $elements;
 }
 
 
@@ -201,9 +201,9 @@ 
  * Validates the user registration form
  */
 function content_profile_registration_user_register_validate($form, &$form_state) {
-  require_once drupal_get_path('module', 'node') .'/node.pages.inc';
+    require_once drupal_get_path('module', 'node') .'/node.pages.inc';
 
-  foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
+    foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
     $node = (object)$form_state['values'];
     $node->type = $type;
     node_object_prepare($node);
@@ -212,32 +212,32 @@ 
     unset($node->name);
 
     if (!in_array('other', content_profile_get_settings($type, 'registration_hide'))) {
-      node_validate($node, $form);
+        node_validate($node, $form);
     }
     elseif (module_exists('content')) {
-      content_validate($node);
+        content_validate($node);
     }
 
     $form_state['content_profile_registration'][$type]['node'] = $node;
-  }
-  // Remove our added values
-  foreach ($form['#content_profile_weights'] as $key => $weight) {
+    }
+    // Remove our added values
+    foreach ($form['#content_profile_weights'] as $key => $weight) {
     _content_profile_registration_remove_values($key, $form[$key], $form_state);
-  }
+    }
 }
 
 /**
  * Recursivly removes all form values created by this element or its children.
  */
 function _content_profile_registration_remove_values($key, $element, &$form_state) {
-  if ((isset($element['#input']) || !empty($element['#tree'])) && isset($form_state['values'][$key])) {
+    if ((isset($element['#input']) || !empty($element['#tree'])) && isset($form_state['values'][$key])) {
     unset($form_state['values'][$key]);
-  }
-  elseif (empty($element['#input']) && empty($element['#tree'])) {
+    }
+    elseif (empty($element['#input']) && empty($element['#tree'])) {
     foreach (element_children($element) as $key) {
-      _content_profile_registration_remove_values($key, $element[$key], $form_state);
+        _content_profile_registration_remove_values($key, $element[$key], $form_state);
+    }
     }
-  }
 }
 
 
@@ -245,33 +245,33 @@ 
  * Submits the user registration form
  */
 function content_profile_registration_user_register_submit($form, &$form_state) {
-  foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
+    foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
     if ($node = &$form_state['content_profile_registration'][$type]['node']) {
-      // Set user's information for the node.
-      if (empty($node->title) && (!module_exists('auto_nodetitle') || auto_nodetitle_get_setting($type) != AUTO_NODETITLE_OPTIONAL)) {
+        // Set user's information for the node.
+        if (empty($node->title) && (!module_exists('auto_nodetitle') || auto_nodetitle_get_setting($type) != AUTO_NODETITLE_OPTIONAL)) {
         $node->title = $form_state['user']->name;
-      }
-      $node->uid = $form_state['user']->uid;
-      $node->name = $form_state['user']->name;
+        }
+        $node->uid = $form_state['user']->uid;
+        $node->name = $form_state['user']->name;
 
-      // Create the node.
-      $node = node_submit($node);
-      node_save($node);
-      // Give us a nice log message.
-      if ($node->nid) {
+        // Create the node.
+        $node = node_submit($node);
+        node_save($node);
+        // Give us a nice log message.
+        if ($node->nid) {
         watchdog('content', 'Content Profile: added %user %type upon registration.', array('%user' => $node->name, '%type' => $type), WATCHDOG_NOTICE, l(t('view'), "node/$node->nid"));
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_content_profile_settings().
  */
 function content_profile_registration_content_profile_settings() {
-  return array(
+    return array(
     'registration_use' => FALSE,
     'admin_user_create_use' => FALSE,
     'registration_hide' => array(),
-  );
+    );
 }

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
  */
 function content_profile_registration_form_alter(&$form, &$form_state, $form_id) {
   if ($form_id == 'user_register') {
-    require_once drupal_get_path('module', 'node') .'/node.pages.inc';
+    require_once drupal_get_path('module', 'node').'/node.pages.inc';
 
     // Allow other modules to customize the used profile types, so modules
     // can easily customize the registration form.
@@ -107,8 +107,8 @@ 
   // Initialize new node and add in its form.
   $node = array('uid' => 0, 'name' => '', 'type' => $type);
   // Get the original node form.
-  $node_form = drupal_retrieve_form($type .'_node_form', $form_state, $node);
-  drupal_prepare_form($type .'_node_form', $node_form, $form_state);
+  $node_form = drupal_retrieve_form($type.'_node_form', $form_state, $node);
+  drupal_prepare_form($type.'_node_form', $node_form, $form_state);
 
   $node_form += array('#field_info' => array());
   $form_add = array();
@@ -175,7 +175,7 @@ 
   }
 
   // Set the enctype, if necessary.
-  if (isset($node_form['#attributes']['enctype'])){
+  if (isset($node_form['#attributes']['enctype'])) {
     $form['#attributes']['enctype'] = $node_form['#attributes']['enctype'];
   }
 }
@@ -190,7 +190,7 @@ 
   foreach ($elements['#content_profile_weights'] as $key => $weight) {
     if (isset($elements[$key]) && is_array($elements[$key])) {
       $elements[$key] += array('#weight' => 0);
-      $elements[$key]['#weight'] = $weight + $elements[$key]['#weight'] / 1000;
+      $elements[$key]['#weight'] = $weight + $elements[$key]['#weight']/1000;
     }
   }
   return $elements;
@@ -201,7 +201,7 @@ 
  * Validates the user registration form
  */
 function content_profile_registration_user_register_validate($form, &$form_state) {
-  require_once drupal_get_path('module', 'node') .'/node.pages.inc';
+  require_once drupal_get_path('module', 'node').'/node.pages.inc';
 
   foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
     $node = (object)$form_state['values'];

Braces +6 added lines, -11 removed lines

@@ -21,8 +21,7 @@ 
     foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
       content_profile_registration_add_profile_form($type, $form, $form_state);
     }
-  }
-  elseif ($form_id == 'content_profile_admin_settings') {
+  } elseif ($form_id == 'content_profile_admin_settings') {
     $type = $form_state['type'];
     // Let other modules add registration child elements before us!
     $form += array('registration' => array());
@@ -133,8 +132,7 @@ 
     // Set this to the values of one node, as it might be need by some #ahah callbacks
     $form_add['#node'] = $node_form['#node'];
     $form_add['type'] = $node_form['type'];
-  }
-  else {
+  } else {
     foreach (array('uid', 'name', 'author', 'buttons', 'language', '#theme', 'options') as $key) {
       unset($node_form[$key]);
     }
@@ -148,8 +146,7 @@ 
       if (count(element_children($form_add[$group_name])) == 0) {
         unset($form_add[$group_name]);
       }
-    }
-    else {
+    } else {
       unset($form_add[$field_name]);
     }
   }
@@ -175,7 +172,7 @@ 
   }
 
   // Set the enctype, if necessary.
-  if (isset($node_form['#attributes']['enctype'])){
+  if (isset($node_form['#attributes']['enctype'])) {
     $form['#attributes']['enctype'] = $node_form['#attributes']['enctype'];
   }
 }
@@ -213,8 +210,7 @@ 
 
     if (!in_array('other', content_profile_get_settings($type, 'registration_hide'))) {
       node_validate($node, $form);
-    }
-    elseif (module_exists('content')) {
+    } elseif (module_exists('content')) {
       content_validate($node);
     }
 
@@ -232,8 +228,7 @@ 
 function _content_profile_registration_remove_values($key, $element, &$form_state) {
   if ((isset($element['#input']) || !empty($element['#tree'])) && isset($form_state['values'][$key])) {
     unset($form_state['values'][$key]);
-  }
-  elseif (empty($element['#input']) && empty($element['#tree'])) {
+  } elseif (empty($element['#input']) && empty($element['#tree'])) {
     foreach (element_children($element) as $key) {
       _content_profile_registration_remove_values($key, $element[$key], $form_state);
     }

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

@@ -30,7 +30,7 @@ 
       '#type' => 'fieldset',
       '#title' => t('User Registration'),
       '#description' => t('Customize how this content profile shows up on the user registration page.'),
-      '#collapsible' => TRUE,
+      '#collapsible' => true,
     );
     $form['registration']['registration_use'] = array(
       '#type' => 'checkbox',
@@ -270,8 +270,8 @@ 
  */
 function content_profile_registration_content_profile_settings() {
   return array(
-    'registration_use' => FALSE,
-    'admin_user_create_use' => FALSE,
+    'registration_use' => false,
+    'admin_user_create_use' => false,
     'registration_hide' => array(),
   );
 }

drupal/sites/default/boinc/modules/contrib/content_profile/modules/content_profile_tokens.module

Indentation +43 added lines, -43 removed lines

@@ -12,83 +12,83 @@
  * Implementation of hook_token_values().
  */
 function content_profile_tokens_token_values($type, $object = NULL, $options = array()) {
-  $values = array();
-  $types = content_profile_get_types('types');
-  switch ($type) {
+    $values = array();
+    $types = content_profile_get_types('types');
+    switch ($type) {
     case 'user':
       foreach($types as $type_name => $type) {
         if (isset($object)) {
-          $profile = content_profile_load($type_name, $object->uid);
+            $profile = content_profile_load($type_name, $object->uid);
         }
         else {
-          global $user;
-          $profile = content_profile_load($type_name, $user->uid);
+            global $user;
+            $profile = content_profile_load($type_name, $user->uid);
         }
         $fields = content_types($type_name);
         foreach ($fields['fields'] as $field_name => $field) {
-          if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
-          }
+            if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
+                $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
+                $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
+            }
+        }
         }
-      }
-      break;
+        break;
 
     case 'flag_friend':
       if(!empty($object)) {
         foreach($types as $type_name => $type) {
-          $profile_requestor = content_profile_load($type_name, $object->friend->uid);
-          $profile_requestee = content_profile_load($type_name, $object->uid);
+            $profile_requestor = content_profile_load($type_name, $object->friend->uid);
+            $profile_requestee = content_profile_load($type_name, $object->uid);
           
-          $fields = content_types($type_name);
-          foreach ($fields['fields'] as $field_name => $field) {
+            $fields = content_types($type_name);
+            foreach ($fields['fields'] as $field_name => $field) {
             if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
+                $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
+                $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
               
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
+                $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
+                $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
             }
-          }
+            }
+        }
         }
-      }
-      break;
-  }
-  return $values;
+        break;
+    }
+    return $values;
 }
 
 /**
  * Implementation of hook_token_list().
  */
 function content_profile_tokens_token_list($type = 'all') {
-  $tokens = array();
-  if ($type == 'user' || $type == 'all') {
+    $tokens = array();
+    if ($type == 'user' || $type == 'all') {
     $types = content_profile_get_types('types');
     foreach ($types as $type_name => $type) {
     
-      $fields = content_types($type_name);
-      foreach ($fields['fields'] as $field_name => $field) {
+        $fields = content_types($type_name);
+        foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-          $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6)] = t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+            $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6)] = t($fields['description']) .'-'. t($field['widget']['label']);
+            $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+        }
         }
-      }
     }
-  }
+    }
   
-  if ($type == 'flag_friend' && module_exists('flag_friend')) {
+    if ($type == 'flag_friend' && module_exists('flag_friend')) {
     foreach($types as $type_name => $type) {
-      $fields = content_types($type_name);
-      foreach ($fields['fields'] as $field_name => $field) {
+        $fields = content_types($type_name);
+        foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-          $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6)] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+            $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6)] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']);
+            $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
 
-          $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6)] = t('Requestee:') . t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestee:') .t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+            $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6)] = t('Requestee:') . t($fields['description']) .'-'. t($field['widget']['label']);
+            $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestee:') .t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+        }
         }
-      }
     }
-  }
-  return $tokens;
+    }
+    return $tokens;
 }

Switch Indentation +30 added lines, -30 removed lines

@@ -15,44 +15,44 @@
   $values = array();
   $types = content_profile_get_types('types');
   switch ($type) {
-    case 'user':
-      foreach($types as $type_name => $type) {
-        if (isset($object)) {
-          $profile = content_profile_load($type_name, $object->uid);
-        }
-        else {
-          global $user;
-          $profile = content_profile_load($type_name, $user->uid);
-        }
-        $fields = content_types($type_name);
-        foreach ($fields['fields'] as $field_name => $field) {
-          if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
-          }
+  case 'user':
+    foreach($types as $type_name => $type) {
+      if (isset($object)) {
+        $profile = content_profile_load($type_name, $object->uid);
+      }
+      else {
+        global $user;
+        $profile = content_profile_load($type_name, $user->uid);
+      }
+      $fields = content_types($type_name);
+      foreach ($fields['fields'] as $field_name => $field) {
+        if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
+            $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
+            $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
         }
       }
-      break;
+    }
+    break;
 
-    case 'flag_friend':
-      if(!empty($object)) {
-        foreach($types as $type_name => $type) {
-          $profile_requestor = content_profile_load($type_name, $object->friend->uid);
-          $profile_requestee = content_profile_load($type_name, $object->uid);
+  case 'flag_friend':
+    if(!empty($object)) {
+      foreach($types as $type_name => $type) {
+        $profile_requestor = content_profile_load($type_name, $object->friend->uid);
+        $profile_requestee = content_profile_load($type_name, $object->uid);
           
-          $fields = content_types($type_name);
-          foreach ($fields['fields'] as $field_name => $field) {
-            if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
+        $fields = content_types($type_name);
+        foreach ($fields['fields'] as $field_name => $field) {
+          if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
+            $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
+            $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
               
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
-            }
+            $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
+            $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
           }
         }
       }
-      break;
+    }
+    break;
   }
   return $values;
 }

Spacing +16 added lines, -16 removed lines

@@ -16,7 +16,7 @@ 
   $types = content_profile_get_types('types');
   switch ($type) {
     case 'user':
-      foreach($types as $type_name => $type) {
+      foreach ($types as $type_name => $type) {
         if (isset($object)) {
           $profile = content_profile_load($type_name, $object->uid);
         }
@@ -27,27 +27,27 @@ 
         $fields = content_types($type_name);
         foreach ($fields['fields'] as $field_name => $field) {
           if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
+              $values['content-profile-'.$type_name.'-'.substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
+              $values['content-profile-'.$type_name.'-'.substr($field_name, 6).'-raw'] = $profile->{$field_name}[0]['value'];
           }
         }
       }
       break;
 
     case 'flag_friend':
-      if(!empty($object)) {
-        foreach($types as $type_name => $type) {
+      if (!empty($object)) {
+        foreach ($types as $type_name => $type) {
           $profile_requestor = content_profile_load($type_name, $object->friend->uid);
           $profile_requestee = content_profile_load($type_name, $object->uid);
           
           $fields = content_types($type_name);
           foreach ($fields['fields'] as $field_name => $field) {
             if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
+              $values['requestor-'.$type_name.'-'.substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
+              $values['requestor-'.$type_name.'-'.substr($field_name, 6).'-raw'] = $profile_requestor->{$field_name}[0]['value'];
               
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
+              $values['requestee-'.$type_name.'-'.substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
+              $values['requestee-'.$type_name.'-'.substr($field_name, 6).'-raw'] = $profile_requestee->{$field_name}[0]['value'];
             }
           }
         }
@@ -69,23 +69,23 @@ 
       $fields = content_types($type_name);
       foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-          $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6)] = t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+          $tokens['user']['content-profile-'.$type_name.'-'.substr($field_name, 6)] = t($fields['description']).'-'.t($field['widget']['label']);
+          $tokens['user']['content-profile-'.$type_name.'-'.substr($field_name, 6).'-raw'] = t($fields['description']).'-'.t($field['widget']['label']).' '.t('WARNING - raw user input');
         }
       }
     }
   }
   
   if ($type == 'flag_friend' && module_exists('flag_friend')) {
-    foreach($types as $type_name => $type) {
+    foreach ($types as $type_name => $type) {
       $fields = content_types($type_name);
       foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-          $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6)] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+          $tokens['content_profile_flag_friend']['requestor-'.$type_name.'-'.substr($field_name, 6)] = t('Requestor:').t($fields['description']).'-'.t($field['widget']['label']);
+          $tokens['content_profile_flag_friend']['requestor-'.$type_name.'-'.substr($field_name, 6).'-raw'] = t('Requestor:').t($fields['description']).'-'.t($field['widget']['label']).' '.t('WARNING - raw user input');
 
-          $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6)] = t('Requestee:') . t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestee:') .t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+          $tokens['content_profile_flag_friend']['requestee-'.$type_name.'-'.substr($field_name, 6)] = t('Requestee:').t($fields['description']).'-'.t($field['widget']['label']);
+          $tokens['content_profile_flag_friend']['requestee-'.$type_name.'-'.substr($field_name, 6).'-raw'] = t('Requestee:').t($fields['description']).'-'.t($field['widget']['label']).' '.t('WARNING - raw user input');
         }
       }
     }

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
       foreach($types as $type_name => $type) {
         if (isset($object)) {
           $profile = content_profile_load($type_name, $object->uid);
-        }
-        else {
+        } else {
           global $user;
           $profile = content_profile_load($type_name, $user->uid);
         }

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

@@ -11,7 +11,7 @@
 /**
  * Implementation of hook_token_values().
  */
-function content_profile_tokens_token_values($type, $object = NULL, $options = array()) {
+function content_profile_tokens_token_values($type, $object = null, $options = array()) {
   $values = array();
   $types = content_profile_get_types('types');
   switch ($type) {

drupal/sites/default/boinc/modules/contrib/content_profile/content_profile.module

Indentation +230 added lines, -230 removed lines

@@ -11,56 +11,56 @@ 
  * Implementation of hook_init().
  */
 function content_profile_init() {
-  module_load_include('inc', 'content_profile', 'content_profile.theme_vars');
+    module_load_include('inc', 'content_profile', 'content_profile.theme_vars');
 }
 
 /**
  * Implementation of hook_ctools_plugin_directory().
  */
 function content_profile_ctools_plugin_directory($module, $plugin) {
-  if ($module == 'ctools' && $plugin == 'relationships') {
+    if ($module == 'ctools' && $plugin == 'relationships') {
     return 'panels/' . $plugin;
-  }
+    }
 }
 
 /**
  * Implementation of hook_menu().
  */
 function content_profile_menu() {
-  $items = array();
+    $items = array();
 
-  //Register a path for each content profile type
-  foreach (content_profile_get_types('names') as $type => $typename) {
+    //Register a path for each content profile type
+    foreach (content_profile_get_types('names') as $type => $typename) {
     $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/edit'] = array(
-      'title' => 'Edit',
-      'type' => MENU_DEFAULT_LOCAL_TASK,
+        'title' => 'Edit',
+        'type' => MENU_DEFAULT_LOCAL_TASK,
     );
     $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/profile'] = array(
-      'title' => 'Content profile',
-      'description' => 'Configure the display and management of this content profile.',
-      'page callback' => 'drupal_get_form',
-      'page arguments' => array('content_profile_admin_settings', $type),
-      'access callback' => 'user_access',
-      'access arguments' => array('administer nodes'),
-      'type' => MENU_LOCAL_TASK,
-      'weight' => 1,
+        'title' => 'Content profile',
+        'description' => 'Configure the display and management of this content profile.',
+        'page callback' => 'drupal_get_form',
+        'page arguments' => array('content_profile_admin_settings', $type),
+        'access callback' => 'user_access',
+        'access arguments' => array('administer nodes'),
+        'type' => MENU_LOCAL_TASK,
+        'weight' => 1,
     );
-  }
-  foreach (content_profile_get_types('names') as $type => $type_name) {
+    }
+    foreach (content_profile_get_types('names') as $type => $type_name) {
     $items['user/%user/profile/'. $type] = array(
-      'title callback' => 'check_plain',
-      'title' => drupal_ucfirst($type_name),
-      'page callback' => 'content_profile_page_edit',
-      'page arguments' => array($type, 1),
-      'access callback' => 'content_profile_page_access',
-      'access arguments' => array($type, 1),
-      'weight' => content_profile_get_settings($type, 'weight'),
-      'file' => 'node.pages.inc',
-      'file path' => drupal_get_path('module', 'node'),
-      'type' => content_profile_get_settings($type, 'edit_tab') == 'top' ? MENU_LOCAL_TASK : MENU_CALLBACK,
+        'title callback' => 'check_plain',
+        'title' => drupal_ucfirst($type_name),
+        'page callback' => 'content_profile_page_edit',
+        'page arguments' => array($type, 1),
+        'access callback' => 'content_profile_page_access',
+        'access arguments' => array($type, 1),
+        'weight' => content_profile_get_settings($type, 'weight'),
+        'file' => 'node.pages.inc',
+        'file path' => drupal_get_path('module', 'node'),
+        'type' => content_profile_get_settings($type, 'edit_tab') == 'top' ? MENU_LOCAL_TASK : MENU_CALLBACK,
     );
-  }
-  return $items;
+    }
+    return $items;
 }
 
 /**
@@ -68,45 +68,45 @@ 
  * Take over menu items generated by the user module for our categories.
  */
 function content_profile_menu_alter(&$items) {
-  foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
+    foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
     if (!empty($items['user/%user_category/edit/'. $type])) {
-      $item = &$items['user/%user_category/edit/'. $type];
-      $item = array(
+        $item = &$items['user/%user_category/edit/'. $type];
+        $item = array(
         'page callback' => 'content_profile_page_edit',
         'page arguments' => array($type, 1),
         'access callback' => 'content_profile_page_access',
         'access arguments' => array($type, 1),
         'file' => 'node.pages.inc',
         'file path' => drupal_get_path('module', 'node'),
-      ) + $item;
+        ) + $item;
+    }
     }
-  }
 }
 
 
 function content_profile_page_access($type, $account) {
-  if ($node = content_profile_load($type, $account->uid)) {
+    if ($node = content_profile_load($type, $account->uid)) {
     return node_access('update', $node);
-  }
-  // Else user may view the page when they are going to create their own profile
-  // or have permission to create it for others.
-  global $user;
-  if ($user->uid == $account->uid || user_access('administer nodes') ){
+    }
+    // Else user may view the page when they are going to create their own profile
+    // or have permission to create it for others.
+    global $user;
+    if ($user->uid == $account->uid || user_access('administer nodes') ){
     return node_access('create', $type);
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Presents a node editing or adding form for the given content profile.
  */
 function content_profile_page_edit($type, $account) {
-  drupal_set_title(check_plain($account->name));
-  $node = content_profile_load($type, $account->uid);
-  if (!$node) {
+    drupal_set_title(check_plain($account->name));
+    $node = content_profile_load($type, $account->uid);
+    if (!$node) {
     $node = array('uid' => $account->uid, 'name' => (isset($account->name) ? $account->name : ''), 'type' => $type, 'language' => '');
-  }
-  return drupal_get_form($type .'_node_form', $node);
+    }
+    return drupal_get_form($type .'_node_form', $node);
 }
 
 
@@ -114,10 +114,10 @@ 
  * Implementation of hook_views_api().
  */
 function content_profile_views_api() {
-  return array(
+    return array(
     'api' => 2,
     'path' => drupal_get_path('module', 'content_profile') .'/views',
-  );
+    );
 }
 
 
@@ -125,71 +125,71 @@ 
  * Menu callback; content profile settings.
  */
 function content_profile_admin_settings(&$form_state, $type) {
-  $form_state['type'] = $type;
+    $form_state['type'] = $type;
 
-  $form['weight'] = array(
+    $form['weight'] = array(
     '#type' => 'weight',
     '#title' => t("Weight"),
     '#default_value' => content_profile_get_settings($type, 'weight'),
     '#description' => t('The weight of content of this content type where ever they appear - this applies to the input form integration as well to the display integration.'),
     '#weight' => 5,
-  );
-  $form['display'] = array(
+    );
+    $form['display'] = array(
     '#type' => 'fieldset',
     '#title' => t('Display settings'),
     '#description' => t('Customize the display of this content profile.'),
     '#collapsible' => TRUE,
-  );
-  $form['display']['user_display'] = array(
+    );
+    $form['display']['user_display'] = array(
     '#type' => 'radios',
     '#title' => t("User page display style"),
     '#default_value' => content_profile_get_settings($type, 'user_display'),
     '#options' => array(
-      0 => t("Don't display this content profile on the user account page"),
-      'link' => t('Display it as link to the profile content'),
-      'full' => t('Display the full content'),
-      'teaser' => t("Display the content's teaser"),
+        0 => t("Don't display this content profile on the user account page"),
+        'link' => t('Display it as link to the profile content'),
+        'full' => t('Display the full content'),
+        'teaser' => t("Display the content's teaser"),
     ),
-  );
-  $form['display']['edit_link'] = array(
+    );
+    $form['display']['edit_link'] = array(
     '#type' => 'checkbox',
     '#title' => t("Include an edit link to the display"),
     '#default_value' => content_profile_get_settings($type, 'edit_link'),
-  );
-  $form['display']['add_link'] = array(
+    );
+    $form['display']['add_link'] = array(
     '#type' => 'checkbox',
     '#title' => t("Show a link to the content profile creation page, if there is no profile."),
     '#default_value' => content_profile_get_settings($type, 'add_link'),
     '#description' => t("If selected and the user has no profile of this type yet, a link to add one is shown on the user page."),
-  );
-  $form['display']['edit_tab'] = array(
+    );
+    $form['display']['edit_tab'] = array(
     '#type' => 'radios',
     '#title' => t("Profile edit tab"),
     '#default_value' => content_profile_get_settings($type, 'edit_tab'),
     '#options' => array(
-      0 => t('None'),
-      'top' => t("Show a tab at the user's page"),
-      'sub' => t("Show a secondary tab below the user's edit tab"),
+        0 => t('None'),
+        'top' => t("Show a tab at the user's page"),
+        'sub' => t("Show a secondary tab below the user's edit tab"),
     ),
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit'),
     '#weight' => 10,
-  );
-  return $form;
+    );
+    return $form;
 }
 
 function content_profile_admin_settings_submit($form, &$form_state) {
-  $settings = content_profile_get_settings($form_state['type']);
-  foreach (content_profile_settings_info() as $setting => $default) {
+    $settings = content_profile_get_settings($form_state['type']);
+    foreach (content_profile_settings_info() as $setting => $default) {
     if (isset($form_state['values'][$setting])) {
-      $settings[$setting] = $form_state['values'][$setting];
+        $settings[$setting] = $form_state['values'][$setting];
+    }
     }
-  }
-  content_profile_set_settings($form_state['type'], $settings);
-  drupal_set_message('Your changes have been saved.');
-  menu_rebuild();
+    content_profile_set_settings($form_state['type'], $settings);
+    drupal_set_message('Your changes have been saved.');
+    menu_rebuild();
 }
 
 /**
@@ -198,10 +198,10 @@ 
  *   The node object or the node's type
  */
 function is_content_profile($type) {
-  if (is_object($type)) {
+    if (is_object($type)) {
     $type = $type->type;
-  }
-  return variable_get('content_profile_use_'. $type, FALSE);
+    }
+    return variable_get('content_profile_use_'. $type, FALSE);
 }
 
 /**
@@ -218,14 +218,14 @@ 
  *   The value to compare the given setting too.
  */
 function content_profile_get_types($op = 'types', $setting = NULL , $value = TRUE) {
-  $types = array();
+    $types = array();
 
-  foreach (node_get_types($op) as $type => $info) {
+    foreach (node_get_types($op) as $type => $info) {
     if (is_content_profile($type) && (!isset($setting) || content_profile_get_settings($type, $setting) == $value)) {
-      $types[$type] = $info;
+        $types[$type] = $info;
     }
-  }
-  return $types;
+    }
+    return $types;
 }
 
 /**
@@ -233,79 +233,79 @@ 
  * Rename or delete the settings variable if a type changes.
  */
 function content_profile_node_type($op, $info) {
-  switch ($op) {
+    switch ($op) {
     case 'delete':
       variable_del('content_profile_use_'. $info->type);
-      variable_del('content_profile_'. $info->type);
-      break;
+        variable_del('content_profile_'. $info->type);
+        break;
     case 'update':
       if (!empty($info->old_type) && $info->old_type != $info->type) {
         if (is_content_profile($info->old_type)) {
-          $settings = variable_get('content_profile_'. $info->old_type, array());
-          variable_del('content_profile_use_'. $info->old_type);
-          variable_del('content_profile_'. $info->old_type);
-          variable_set('content_profile_use_'. $info->type, 1);
-          variable_set('content_profile_'. $info->type, $settings);
+            $settings = variable_get('content_profile_'. $info->old_type, array());
+            variable_del('content_profile_use_'. $info->old_type);
+            variable_del('content_profile_'. $info->old_type);
+            variable_set('content_profile_use_'. $info->type, 1);
+            variable_set('content_profile_'. $info->type, $settings);
+        }
         }
-      }
-      break;
-  }
+        break;
+    }
 }
 
 /**
  * Implementation of hook_form_alter().
  */
 function content_profile_form_alter(&$form, $form_state, $form_id) {
-  if ($form_id == 'node_type_form') {
+    if ($form_id == 'node_type_form') {
     $form['content_profile'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Content Profile'),
-      '#group' => 'additional_settings',
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
-      '#weight' => 32,
+        '#type' => 'fieldset',
+        '#title' => t('Content Profile'),
+        '#group' => 'additional_settings',
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+        '#weight' => 32,
     );
     $form['content_profile']['content_profile_use'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Use this content type as a content profile for users'),
-      '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
+        '#type' => 'checkbox',
+        '#title' => t('Use this content type as a content profile for users'),
+        '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
     );
-  }
-  elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
+    }
+    elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
     // Customize the redirect target and buttons of our own node forms.
     if (arg(0) == 'user' && is_numeric(arg(1)) && arg(2) == 'edit' || arg(2) == 'profile') {
-      $form['buttons']['preview']['#access'] = FALSE;
-      $form['buttons']['delete']['#access'] = FALSE;
-      $form['#redirect'] = arg(2) == 'profile' ? 'user/'. $form['#node']->uid : $_GET['q'];
+        $form['buttons']['preview']['#access'] = FALSE;
+        $form['buttons']['delete']['#access'] = FALSE;
+        $form['#redirect'] = arg(2) == 'profile' ? 'user/'. $form['#node']->uid : $_GET['q'];
     }
     // Set the author value - note that this works only for admins.
     if (!empty($_GET['uid']) && ($uid = intval($_GET['uid'])) && ($user = user_load($uid))) {
-      $form['author']['name']['#default_value'] = $user->name;
+        $form['author']['name']['#default_value'] = $user->name;
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_user().
  */
 function content_profile_user($op, &$edit, &$account, $category = NULL) {
-  global $user;
+    global $user;
 
-  switch ($op) {
+    switch ($op) {
     case 'categories':
       $data = array();
-      foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
+        foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
         $data[] = array(
-          'name' => $type,
-          'title' => drupal_ucfirst($type_name),
-          'weight' => content_profile_get_settings($type, 'weight') + 1,
+            'name' => $type,
+            'title' => drupal_ucfirst($type_name),
+            'weight' => content_profile_get_settings($type, 'weight') + 1,
         );
-      }
-      return $data;
+        }
+        return $data;
 
     case 'view':
       $account->content['content_profile'] = content_profile_show_profiles($account->uid);
-      break;
+        break;
 
     case 'delete':
       // Retrieve all profile nodes (in any language) for this user by issueing an SQL query.
@@ -315,11 +315,11 @@ 
 
         $result = db_query("SELECT * FROM {node} WHERE (". implode(' OR ', $condition) .") AND uid = %d", $arguments);
         while ($node = db_fetch_object($result)) {
-          _content_profile_node_delete($node);
+            _content_profile_node_delete($node);
+        }
         }
-      }
-      break;
-  }
+        break;
+    }
 }
 
 /**
@@ -333,42 +333,42 @@ 
  * "SELECT * FROM {node}" query) instead of just the $nid.
  */
 function _content_profile_node_delete($node) {
-  // Copied over from node_load(), so that node_invoke('delete') gets
-  // the fully extended node object, like modules would expect:
+    // Copied over from node_load(), so that node_invoke('delete') gets
+    // the fully extended node object, like modules would expect:
 
-  if ($node->nid) {
+    if ($node->nid) {
     // Call the node specific callback (if any) and piggy-back the
     // results to the node or overwrite some values.
     if ($extra = node_invoke($node, 'load')) {
-      foreach ($extra as $key => $value) {
+        foreach ($extra as $key => $value) {
         $node->$key = $value;
-      }
+        }
     }
     if ($extra = node_invoke_nodeapi($node, 'load')) {
-      foreach ($extra as $key => $value) {
+        foreach ($extra as $key => $value) {
         $node->$key = $value;
-      }
+        }
+    }
     }
-  }
 
-  // Copied over from node_delete():
+    // Copied over from node_delete():
 
-  db_query('DELETE FROM {node} WHERE nid = %d', $node->nid);
-  db_query('DELETE FROM {node_revisions} WHERE nid = %d', $node->nid);
+    db_query('DELETE FROM {node} WHERE nid = %d', $node->nid);
+    db_query('DELETE FROM {node_revisions} WHERE nid = %d', $node->nid);
 
-  // Call the node-specific callback (if any):
-  node_invoke($node, 'delete');
-  node_invoke_nodeapi($node, 'delete');
+    // Call the node-specific callback (if any):
+    node_invoke($node, 'delete');
+    node_invoke_nodeapi($node, 'delete');
 
-  // Clear the cache so an anonymous poster can see the node being deleted.
-  cache_clear_all();
+    // Clear the cache so an anonymous poster can see the node being deleted.
+    cache_clear_all();
 
-  // Remove this node from the search index if needed.
-  if (function_exists('search_wipe')) {
+    // Remove this node from the search index if needed.
+    if (function_exists('search_wipe')) {
     search_wipe($node->nid, 'node');
-  }
-  watchdog('content', '@type: deleted %title.', array('@type' => $node->type, '%title' => $node->title));
-  drupal_set_message(t('@type %title has been deleted.', array('@type' => node_get_types('name', $node), '%title' => $node->title)));
+    }
+    watchdog('content', '@type: deleted %title.', array('@type' => $node->type, '%title' => $node->title));
+    drupal_set_message(t('@type %title has been deleted.', array('@type' => node_get_types('name', $node), '%title' => $node->title)));
 }
 
 /**
@@ -376,30 +376,30 @@ 
  */
 function content_profile_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
 
-  if ($op == 'prepare' && is_content_profile($node) && !isset($node->nid) && $node->uid && !user_access('administer nodes') && arg(0) != 'admin') {
+    if ($op == 'prepare' && is_content_profile($node) && !isset($node->nid) && $node->uid && !user_access('administer nodes') && arg(0) != 'admin') {
     // Check if this nodetype already exists
     if ($nid = content_profile_profile_exists($node, $node->uid)) {
-      // This node already exists, redirect to edit page
-      drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid);
+        // This node already exists, redirect to edit page
+        drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid);
     }
-  }
-  elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
+    }
+    elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
     $form = $a3;
     // Only validate if the user-name changed or we add a new node
     if (!empty($node->nid) && $form['author']['name']['#default_value'] == $node->name) {
-      return;
+        return;
     }
     //check whether the selected user has already a profile
     $uid = db_result(db_query("SELECT uid FROM {users} WHERE name = '%s'", $node->name));
     if ($uid && content_profile_profile_exists($node, $uid)) {
-      form_set_error('name', t('This user already has a content profile of this type. You can only create one profile per user.'));
+        form_set_error('name', t('This user already has a content profile of this type. You can only create one profile per user.'));
+    }
     }
-  }
-  elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
+    elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
     // Make sure the translated profile belongs to the same user.
     $node->uid = $node->translation_source->uid;
     $node->name = $node->translation_source->name;
-  }
+    }
 }
 
 /**
@@ -412,11 +412,11 @@ 
  * @return If a node exists, the node id, FALSE else.
  */
 function content_profile_profile_exists($node, $uid) {
-  $query = "SELECT n.nid AS nid FROM {node} n WHERE n.type = '%s' AND n.uid = %d ";
-  if (module_exists('translation') && translation_supported_type($node->type)) {
+    $query = "SELECT n.nid AS nid FROM {node} n WHERE n.type = '%s' AND n.uid = %d ";
+    if (module_exists('translation') && translation_supported_type($node->type)) {
     $query .= "AND n.language = '%s'";
-  }
-  return db_result(db_query($query, $node->type, $uid, $node->language));
+    }
+    return db_result(db_query($query, $node->type, $uid, $node->language));
 }
 
 /**
@@ -428,19 +428,19 @@ 
  *   e.g. user_edit, register or weight.
  */
 function content_profile_get_settings($type, $return = 'all') {
-  $settings = variable_get('content_profile_'. $type, array());
-  $settings += content_profile_settings_info();
-  if ($return == 'all') {
+    $settings = variable_get('content_profile_'. $type, array());
+    $settings += content_profile_settings_info();
+    if ($return == 'all') {
     return $settings;
-  }
-  return $settings[$return];
+    }
+    return $settings[$return];
 }
 
 /**
  * Saves the content_profile settings of a content type.
  */
 function content_profile_set_settings($type, $settings) {
-  variable_set('content_profile_'. $type, $settings);
+    variable_set('content_profile_'. $type, $settings);
 }
 
 /**
@@ -448,7 +448,7 @@ 
  * and their default value.
  */
 function content_profile_settings_info() {
-  return module_invoke_all('content_profile_settings');
+    return module_invoke_all('content_profile_settings');
 }
 
 /**
@@ -457,13 +457,13 @@ 
  * Defines content profile settings and their default value.
  */
 function content_profile_content_profile_settings() {
-  return array(
+    return array(
     'weight' => 0,
     'user_display' => 'full',
     'edit_link' => 0,
     'edit_tab' => 'sub',
     'add_link' => 1,
-  );
+    );
 }
 
 /**
@@ -479,17 +479,17 @@ 
  *   Optional. If set, the cache is reset.
  */
 function content_profile_load($type, $uid, $lang = '', $reset = NULL) {
-  static $cache = array();
+    static $cache = array();
 
-  if (!isset($cache[$type][$uid][$lang]) || $reset) {
+    if (!isset($cache[$type][$uid][$lang]) || $reset) {
     $cache[$type][$uid][$lang] = FALSE;
     $params = array('type' => $type, 'uid' => $uid);
     if ($node = node_load($lang ? $params + array('language' => $lang) : $params, NULL, $reset)) {
-      $cache[$type][$uid][$lang] = $node->nid;
+        $cache[$type][$uid][$lang] = $node->nid;
     }
     return $node;
-  }
-  return !empty($cache[$type][$uid][$lang]) ? node_load($cache[$type][$uid][$lang]) : FALSE;
+    }
+    return !empty($cache[$type][$uid][$lang]) ? node_load($cache[$type][$uid][$lang]) : FALSE;
 }
 
 /**
@@ -498,19 +498,19 @@ 
  * Show node submission guidelines for content profile node forms.
  */
 function content_profile_help($path, $arg) {
-  if (preg_match('/user\/\%\/(profile|edit)\/(.*)/', $path, $matches)) {
+    if (preg_match('/user\/\%\/(profile|edit)\/(.*)/', $path, $matches)) {
     foreach (content_profile_get_types('names') as $type => $typename) {
-      if ($type == $matches[2]) {
+        if ($type == $matches[2]) {
         $node = content_profile_load($type, $arg[1]);
         if ($node) {
-          return node_help('node/%/edit', array(1 => $node->nid));
+            return node_help('node/%/edit', array(1 => $node->nid));
         }
         else {
-          return node_help('node/add/'. $type, array('node', 'add', $type));
+            return node_help('node/add/'. $type, array('node', 'add', $type));
         }
-      }
+        }
+    }
     }
-  }
 }
 
 /**
@@ -518,14 +518,14 @@ 
  * that shows all content_profiles as configured by the admin.
  */
 function content_profile_show_profiles($uid) {
-  global $user;
+    global $user;
 
-  $content = array();
-  foreach (content_profile_get_types('names') as $type => $type_name) {
+    $content = array();
+    foreach (content_profile_get_types('names') as $type => $type_name) {
     $node = content_profile_load($type, $uid);
 
     if (($style = content_profile_get_settings($type, 'user_display')) && $node && node_access('view', $node)) {
-      $content['content_profile_'. $type] = array(
+        $content['content_profile_'. $type] = array(
         '#theme' => ($style == 'link') ? 'content_profile_display_link' : 'content_profile_display_view',
         '#edit_link' => content_profile_get_settings($type, 'edit_link'),
         '#uid' => $uid,
@@ -533,59 +533,59 @@ 
         '#content_type' => $type,
         '#weight' => content_profile_get_settings($type, 'weight'),
         '#suffix' => '<br />',
-      );
+        );
 
-      // Working around the bug described at http://drupal.org/node/302873
-      module_load_include('inc', 'content_profile', 'content_profile.theme');
+        // Working around the bug described at http://drupal.org/node/302873
+        module_load_include('inc', 'content_profile', 'content_profile.theme');
     }
     elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
-      $content['content_profile_'. $type] = array(
+        $content['content_profile_'. $type] = array(
         '#admin' => $uid != $user->uid,
         '#theme' => 'content_profile_display_add_link',
         '#uid' => $uid,
         '#content_type' => $type,
         '#weight' => content_profile_get_settings($type, 'weight'),
         '#suffix' => '<br />',
-      );
+        );
+    }
     }
-  }
-  if ($content) {
+    if ($content) {
     $content['#prefix'] = '<p id="content-profile-view">';
     $content['#suffix'] = '</p>';
-  }
-  return $content;
+    }
+    return $content;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function content_profile_theme() {
-  $return = array(
+    $return = array(
     'content_profile_display_view' => array(
-      'template'  => 'content_profile-display-view',
-      'arguments' => array('element' => NULL),
-      'file' => 'content_profile.theme.inc',
+        'template'  => 'content_profile-display-view',
+        'arguments' => array('element' => NULL),
+        'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_add_link' => array(
-      'file' => 'content_profile.theme.inc',
+        'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_link' => array(
-      'file' => 'content_profile.theme.inc',
+        'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_tab_view' => array(
-      'file' => 'content_profile.theme.inc',
+        'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_tab_edit' => array(
-      'file' => 'content_profile.theme.inc',
+        'file' => 'content_profile.theme.inc',
     ),
-  );
-  if (module_exists('pageroute')) {
+    );
+    if (module_exists('pageroute')) {
     $return['content_profile_pageroute_empty']  = array(
-      'arguments' => array('type_name' => NULL),
-    	'file' => 'content_profile.pageroute.inc',
+        'arguments' => array('type_name' => NULL),
+        'file' => 'content_profile.pageroute.inc',
     );
-  }
-  return $return;
+    }
+    return $return;
 }
 
 /**
@@ -594,7 +594,7 @@ 
  * $conf['content_profile_extra_templates'] in settings.php.
  */
 function content_profile_theme_registry_alter(&$items) {
-  $templates = array_merge(array(
+    $templates = array_merge(array(
     'author_pane',
     'comment',
     'node',
@@ -603,47 +603,47 @@ 
     'username',
     'user_profile',
     'user_signature',
-  ), variable_get('content_profile_extra_templates', array()));
+    ), variable_get('content_profile_extra_templates', array()));
 
-  foreach ($templates as $key) {
+    foreach ($templates as $key) {
     if (isset($items[$key])) {
-      $items[$key] += array('preprocess functions' => array());
-      $items[$key]['preprocess functions'][] = 'content_profile_template_preprocess';
+        $items[$key] += array('preprocess functions' => array());
+        $items[$key]['preprocess functions'][] = 'content_profile_template_preprocess';
+    }
     }
-  }
 }
 
 /**
  * Adds $content_profile variable if we can find a $uid.
  */
 function content_profile_template_preprocess(&$variables, $hook) {
-  // Search the uid
-  foreach (array('account_id', 'uid', 'account', 'node', 'comment', 'user') as $name) {
+    // Search the uid
+    foreach (array('account_id', 'uid', 'account', 'node', 'comment', 'user') as $name) {
     if (isset($variables[$name])) {
-      $uid = is_object($variables[$name]) ? $variables[$name]->uid : $variables[$name];
-      $variables['content_profile'] = new content_profile_theme_variables($uid);
-      break;
+        $uid = is_object($variables[$name]) ? $variables[$name]->uid : $variables[$name];
+        $variables['content_profile'] = new content_profile_theme_variables($uid);
+        break;
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_simpletest().
  */
 function content_profile_simpletest() {
-  // Scan through content_profile/tests directory for any .test files to tell SimpleTest module.
-  $tests = file_scan_directory(drupal_get_path('module', 'content_profile') .'/tests', '\.test');
-  return array_keys($tests);
+    // Scan through content_profile/tests directory for any .test files to tell SimpleTest module.
+    $tests = file_scan_directory(drupal_get_path('module', 'content_profile') .'/tests', '\.test');
+    return array_keys($tests);
 }
 
 /**
  * Implementation of hook_pageroute_info() for Pageroute integration.
  */
 function content_profile_pageroute_info() {
-  return array(
+    return array(
     'content_profile' => array(
-      'viewprofile' => 'content_profile.pageroute',
-      'editprofile' => 'content_profile.pageroute',
+        'viewprofile' => 'content_profile.pageroute',
+        'editprofile' => 'content_profile.pageroute',
     )
-  );
+    );
 }

Switch Indentation +37 added lines, -37 removed lines

@@ -234,21 +234,21 @@ 
  */
 function content_profile_node_type($op, $info) {
   switch ($op) {
-    case 'delete':
-      variable_del('content_profile_use_'. $info->type);
-      variable_del('content_profile_'. $info->type);
-      break;
-    case 'update':
-      if (!empty($info->old_type) && $info->old_type != $info->type) {
-        if (is_content_profile($info->old_type)) {
-          $settings = variable_get('content_profile_'. $info->old_type, array());
-          variable_del('content_profile_use_'. $info->old_type);
-          variable_del('content_profile_'. $info->old_type);
-          variable_set('content_profile_use_'. $info->type, 1);
-          variable_set('content_profile_'. $info->type, $settings);
-        }
+  case 'delete':
+    variable_del('content_profile_use_'. $info->type);
+    variable_del('content_profile_'. $info->type);
+    break;
+  case 'update':
+    if (!empty($info->old_type) && $info->old_type != $info->type) {
+      if (is_content_profile($info->old_type)) {
+        $settings = variable_get('content_profile_'. $info->old_type, array());
+        variable_del('content_profile_use_'. $info->old_type);
+        variable_del('content_profile_'. $info->old_type);
+        variable_set('content_profile_use_'. $info->type, 1);
+        variable_set('content_profile_'. $info->type, $settings);
       }
-      break;
+    }
+    break;
   }
 }
 
@@ -292,33 +292,33 @@ 
   global $user;
 
   switch ($op) {
-    case 'categories':
-      $data = array();
-      foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
-        $data[] = array(
-          'name' => $type,
-          'title' => drupal_ucfirst($type_name),
-          'weight' => content_profile_get_settings($type, 'weight') + 1,
-        );
-      }
-      return $data;
+  case 'categories':
+    $data = array();
+    foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
+      $data[] = array(
+        'name' => $type,
+        'title' => drupal_ucfirst($type_name),
+        'weight' => content_profile_get_settings($type, 'weight') + 1,
+      );
+    }
+    return $data;
 
-    case 'view':
-      $account->content['content_profile'] = content_profile_show_profiles($account->uid);
-      break;
+  case 'view':
+    $account->content['content_profile'] = content_profile_show_profiles($account->uid);
+    break;
 
-    case 'delete':
-      // Retrieve all profile nodes (in any language) for this user by issueing an SQL query.
-      if ($types = content_profile_get_types()) {
-        $condition = array_fill(0, count($types), "type = '%s'");
-        $arguments = array_merge(array_keys($types), array($account->uid));
+  case 'delete':
+    // Retrieve all profile nodes (in any language) for this user by issueing an SQL query.
+    if ($types = content_profile_get_types()) {
+      $condition = array_fill(0, count($types), "type = '%s'");
+      $arguments = array_merge(array_keys($types), array($account->uid));
 
-        $result = db_query("SELECT * FROM {node} WHERE (". implode(' OR ', $condition) .") AND uid = %d", $arguments);
-        while ($node = db_fetch_object($result)) {
-          _content_profile_node_delete($node);
-        }
+      $result = db_query("SELECT * FROM {node} WHERE (". implode(' OR ', $condition) .") AND uid = %d", $arguments);
+      while ($node = db_fetch_object($result)) {
+        _content_profile_node_delete($node);
       }
-      break;
+    }
+    break;
   }
 }
 

Spacing +31 added lines, -31 removed lines

@@ -19,7 +19,7 @@ 
  */
 function content_profile_ctools_plugin_directory($module, $plugin) {
   if ($module == 'ctools' && $plugin == 'relationships') {
-    return 'panels/' . $plugin;
+    return 'panels/'.$plugin;
   }
 }
 
@@ -31,11 +31,11 @@ 
 
   //Register a path for each content profile type
   foreach (content_profile_get_types('names') as $type => $typename) {
-    $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/edit'] = array(
+    $items['admin/content/node-type/'.str_replace('_', '-', $type).'/edit'] = array(
       'title' => 'Edit',
       'type' => MENU_DEFAULT_LOCAL_TASK,
     );
-    $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/profile'] = array(
+    $items['admin/content/node-type/'.str_replace('_', '-', $type).'/profile'] = array(
       'title' => 'Content profile',
       'description' => 'Configure the display and management of this content profile.',
       'page callback' => 'drupal_get_form',
@@ -47,7 +47,7 @@ 
     );
   }
   foreach (content_profile_get_types('names') as $type => $type_name) {
-    $items['user/%user/profile/'. $type] = array(
+    $items['user/%user/profile/'.$type] = array(
       'title callback' => 'check_plain',
       'title' => drupal_ucfirst($type_name),
       'page callback' => 'content_profile_page_edit',
@@ -69,8 +69,8 @@ 
  */
 function content_profile_menu_alter(&$items) {
   foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) {
-    if (!empty($items['user/%user_category/edit/'. $type])) {
-      $item = &$items['user/%user_category/edit/'. $type];
+    if (!empty($items['user/%user_category/edit/'.$type])) {
+      $item = &$items['user/%user_category/edit/'.$type];
       $item = array(
         'page callback' => 'content_profile_page_edit',
         'page arguments' => array($type, 1),
@@ -91,7 +91,7 @@ 
   // Else user may view the page when they are going to create their own profile
   // or have permission to create it for others.
   global $user;
-  if ($user->uid == $account->uid || user_access('administer nodes') ){
+  if ($user->uid == $account->uid || user_access('administer nodes')) {
     return node_access('create', $type);
   }
   return FALSE;
@@ -106,7 +106,7 @@ 
   if (!$node) {
     $node = array('uid' => $account->uid, 'name' => (isset($account->name) ? $account->name : ''), 'type' => $type, 'language' => '');
   }
-  return drupal_get_form($type .'_node_form', $node);
+  return drupal_get_form($type.'_node_form', $node);
 }
 
 
@@ -116,7 +116,7 @@ 
 function content_profile_views_api() {
   return array(
     'api' => 2,
-    'path' => drupal_get_path('module', 'content_profile') .'/views',
+    'path' => drupal_get_path('module', 'content_profile').'/views',
   );
 }
 
@@ -201,7 +201,7 @@ 
   if (is_object($type)) {
     $type = $type->type;
   }
-  return variable_get('content_profile_use_'. $type, FALSE);
+  return variable_get('content_profile_use_'.$type, FALSE);
 }
 
 /**
@@ -217,7 +217,7 @@ 
  * @param $value
  *   The value to compare the given setting too.
  */
-function content_profile_get_types($op = 'types', $setting = NULL , $value = TRUE) {
+function content_profile_get_types($op = 'types', $setting = NULL, $value = TRUE) {
   $types = array();
 
   foreach (node_get_types($op) as $type => $info) {
@@ -235,17 +235,17 @@ 
 function content_profile_node_type($op, $info) {
   switch ($op) {
     case 'delete':
-      variable_del('content_profile_use_'. $info->type);
-      variable_del('content_profile_'. $info->type);
+      variable_del('content_profile_use_'.$info->type);
+      variable_del('content_profile_'.$info->type);
       break;
     case 'update':
       if (!empty($info->old_type) && $info->old_type != $info->type) {
         if (is_content_profile($info->old_type)) {
-          $settings = variable_get('content_profile_'. $info->old_type, array());
-          variable_del('content_profile_use_'. $info->old_type);
-          variable_del('content_profile_'. $info->old_type);
-          variable_set('content_profile_use_'. $info->type, 1);
-          variable_set('content_profile_'. $info->type, $settings);
+          $settings = variable_get('content_profile_'.$info->old_type, array());
+          variable_del('content_profile_use_'.$info->old_type);
+          variable_del('content_profile_'.$info->old_type);
+          variable_set('content_profile_use_'.$info->type, 1);
+          variable_set('content_profile_'.$info->type, $settings);
         }
       }
       break;
@@ -268,15 +268,15 @@ 
     $form['content_profile']['content_profile_use'] = array(
       '#type' => 'checkbox',
       '#title' => t('Use this content type as a content profile for users'),
-      '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
+      '#default_value' => variable_get('content_profile_use_'.$form['#node_type']->type, FALSE),
     );
   }
-  elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
+  elseif (isset($form['#node']) && $form['#node']->type.'_node_form' == $form_id && is_content_profile($form['#node'])) {
     // Customize the redirect target and buttons of our own node forms.
     if (arg(0) == 'user' && is_numeric(arg(1)) && arg(2) == 'edit' || arg(2) == 'profile') {
       $form['buttons']['preview']['#access'] = FALSE;
       $form['buttons']['delete']['#access'] = FALSE;
-      $form['#redirect'] = arg(2) == 'profile' ? 'user/'. $form['#node']->uid : $_GET['q'];
+      $form['#redirect'] = arg(2) == 'profile' ? 'user/'.$form['#node']->uid : $_GET['q'];
     }
     // Set the author value - note that this works only for admins.
     if (!empty($_GET['uid']) && ($uid = intval($_GET['uid'])) && ($user = user_load($uid))) {
@@ -313,7 +313,7 @@ 
         $condition = array_fill(0, count($types), "type = '%s'");
         $arguments = array_merge(array_keys($types), array($account->uid));
 
-        $result = db_query("SELECT * FROM {node} WHERE (". implode(' OR ', $condition) .") AND uid = %d", $arguments);
+        $result = db_query("SELECT * FROM {node} WHERE (".implode(' OR ', $condition).") AND uid = %d", $arguments);
         while ($node = db_fetch_object($result)) {
           _content_profile_node_delete($node);
         }
@@ -380,7 +380,7 @@ 
     // Check if this nodetype already exists
     if ($nid = content_profile_profile_exists($node, $node->uid)) {
       // This node already exists, redirect to edit page
-      drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid);
+      drupal_goto('node/'.$nid.'/edit', 'destination=user/'.$node->uid);
     }
   }
   elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
@@ -428,7 +428,7 @@ 
  *   e.g. user_edit, register or weight.
  */
 function content_profile_get_settings($type, $return = 'all') {
-  $settings = variable_get('content_profile_'. $type, array());
+  $settings = variable_get('content_profile_'.$type, array());
   $settings += content_profile_settings_info();
   if ($return == 'all') {
     return $settings;
@@ -440,7 +440,7 @@ 
  * Saves the content_profile settings of a content type.
  */
 function content_profile_set_settings($type, $settings) {
-  variable_set('content_profile_'. $type, $settings);
+  variable_set('content_profile_'.$type, $settings);
 }
 
 /**
@@ -506,7 +506,7 @@ 
           return node_help('node/%/edit', array(1 => $node->nid));
         }
         else {
-          return node_help('node/add/'. $type, array('node', 'add', $type));
+          return node_help('node/add/'.$type, array('node', 'add', $type));
         }
       }
     }
@@ -525,7 +525,7 @@ 
     $node = content_profile_load($type, $uid);
 
     if (($style = content_profile_get_settings($type, 'user_display')) && $node && node_access('view', $node)) {
-      $content['content_profile_'. $type] = array(
+      $content['content_profile_'.$type] = array(
         '#theme' => ($style == 'link') ? 'content_profile_display_link' : 'content_profile_display_view',
         '#edit_link' => content_profile_get_settings($type, 'edit_link'),
         '#uid' => $uid,
@@ -538,8 +538,8 @@ 
       // Working around the bug described at http://drupal.org/node/302873
       module_load_include('inc', 'content_profile', 'content_profile.theme');
     }
-    elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
-      $content['content_profile_'. $type] = array(
+    elseif (user_access('create '.$type.' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
+      $content['content_profile_'.$type] = array(
         '#admin' => $uid != $user->uid,
         '#theme' => 'content_profile_display_add_link',
         '#uid' => $uid,
@@ -580,7 +580,7 @@ 
     ),
   );
   if (module_exists('pageroute')) {
-    $return['content_profile_pageroute_empty']  = array(
+    $return['content_profile_pageroute_empty'] = array(
       'arguments' => array('type_name' => NULL),
     	'file' => 'content_profile.pageroute.inc',
     );
@@ -632,7 +632,7 @@ 
  */
 function content_profile_simpletest() {
   // Scan through content_profile/tests directory for any .test files to tell SimpleTest module.
-  $tests = file_scan_directory(drupal_get_path('module', 'content_profile') .'/tests', '\.test');
+  $tests = file_scan_directory(drupal_get_path('module', 'content_profile').'/tests', '\.test');
   return array_keys($tests);
 }
 

Braces +6 added lines, -11 removed lines

@@ -91,7 +91,7 @@ 
   // Else user may view the page when they are going to create their own profile
   // or have permission to create it for others.
   global $user;
-  if ($user->uid == $account->uid || user_access('administer nodes') ){
+  if ($user->uid == $account->uid || user_access('administer nodes') ) {
     return node_access('create', $type);
   }
   return FALSE;
@@ -270,8 +270,7 @@ 
       '#title' => t('Use this content type as a content profile for users'),
       '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
     );
-  }
-  elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
+  } elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
     // Customize the redirect target and buttons of our own node forms.
     if (arg(0) == 'user' && is_numeric(arg(1)) && arg(2) == 'edit' || arg(2) == 'profile') {
       $form['buttons']['preview']['#access'] = FALSE;
@@ -382,8 +381,7 @@ 
       // This node already exists, redirect to edit page
       drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid);
     }
-  }
-  elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
+  } elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) {
     $form = $a3;
     // Only validate if the user-name changed or we add a new node
     if (!empty($node->nid) && $form['author']['name']['#default_value'] == $node->name) {
@@ -394,8 +392,7 @@ 
     if ($uid && content_profile_profile_exists($node, $uid)) {
       form_set_error('name', t('This user already has a content profile of this type. You can only create one profile per user.'));
     }
-  }
-  elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
+  } elseif ($op == 'prepare translation' && is_content_profile($node->translation_source)) {
     // Make sure the translated profile belongs to the same user.
     $node->uid = $node->translation_source->uid;
     $node->name = $node->translation_source->name;
@@ -504,8 +501,7 @@ 
         $node = content_profile_load($type, $arg[1]);
         if ($node) {
           return node_help('node/%/edit', array(1 => $node->nid));
-        }
-        else {
+        } else {
           return node_help('node/add/'. $type, array('node', 'add', $type));
         }
       }
@@ -537,8 +533,7 @@ 
 
       // Working around the bug described at http://drupal.org/node/302873
       module_load_include('inc', 'content_profile', 'content_profile.theme');
-    }
-    elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
+    } elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) {
       $content['content_profile_'. $type] = array(
         '#admin' => $uid != $user->uid,
         '#theme' => 'content_profile_display_add_link',

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

@@ -94,7 +94,7 @@ 
   if ($user->uid == $account->uid || user_access('administer nodes') ){
     return node_access('create', $type);
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -138,7 +138,7 @@ 
     '#type' => 'fieldset',
     '#title' => t('Display settings'),
     '#description' => t('Customize the display of this content profile.'),
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
   );
   $form['display']['user_display'] = array(
     '#type' => 'radios',
@@ -201,7 +201,7 @@ 
   if (is_object($type)) {
     $type = $type->type;
   }
-  return variable_get('content_profile_use_'. $type, FALSE);
+  return variable_get('content_profile_use_'. $type, false);
 }
 
 /**
@@ -217,7 +217,7 @@ 
  * @param $value
  *   The value to compare the given setting too.
  */
-function content_profile_get_types($op = 'types', $setting = NULL , $value = TRUE) {
+function content_profile_get_types($op = 'types', $setting = null , $value = true) {
   $types = array();
 
   foreach (node_get_types($op) as $type => $info) {
@@ -261,21 +261,21 @@ 
       '#type' => 'fieldset',
       '#title' => t('Content Profile'),
       '#group' => 'additional_settings',
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
+      '#collapsible' => true,
+      '#collapsed' => true,
       '#weight' => 32,
     );
     $form['content_profile']['content_profile_use'] = array(
       '#type' => 'checkbox',
       '#title' => t('Use this content type as a content profile for users'),
-      '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE),
+      '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, false),
     );
   }
   elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) {
     // Customize the redirect target and buttons of our own node forms.
     if (arg(0) == 'user' && is_numeric(arg(1)) && arg(2) == 'edit' || arg(2) == 'profile') {
-      $form['buttons']['preview']['#access'] = FALSE;
-      $form['buttons']['delete']['#access'] = FALSE;
+      $form['buttons']['preview']['#access'] = false;
+      $form['buttons']['delete']['#access'] = false;
       $form['#redirect'] = arg(2) == 'profile' ? 'user/'. $form['#node']->uid : $_GET['q'];
     }
     // Set the author value - note that this works only for admins.
@@ -288,7 +288,7 @@ 
 /**
  * Implementation of hook_user().
  */
-function content_profile_user($op, &$edit, &$account, $category = NULL) {
+function content_profile_user($op, &$edit, &$account, $category = null) {
   global $user;
 
   switch ($op) {
@@ -374,7 +374,7 @@ 
 /**
  * Implementation of hook_nodeapi().
  */
-function content_profile_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
+function content_profile_nodeapi(&$node, $op, $a3 = null, $a4 = null) {
 
   if ($op == 'prepare' && is_content_profile($node) && !isset($node->nid) && $node->uid && !user_access('administer nodes') && arg(0) != 'admin') {
     // Check if this nodetype already exists
@@ -478,18 +478,18 @@ 
  * @param $reset
  *   Optional. If set, the cache is reset.
  */
-function content_profile_load($type, $uid, $lang = '', $reset = NULL) {
+function content_profile_load($type, $uid, $lang = '', $reset = null) {
   static $cache = array();
 
   if (!isset($cache[$type][$uid][$lang]) || $reset) {
-    $cache[$type][$uid][$lang] = FALSE;
+    $cache[$type][$uid][$lang] = false;
     $params = array('type' => $type, 'uid' => $uid);
-    if ($node = node_load($lang ? $params + array('language' => $lang) : $params, NULL, $reset)) {
+    if ($node = node_load($lang ? $params + array('language' => $lang) : $params, null, $reset)) {
       $cache[$type][$uid][$lang] = $node->nid;
     }
     return $node;
   }
-  return !empty($cache[$type][$uid][$lang]) ? node_load($cache[$type][$uid][$lang]) : FALSE;
+  return !empty($cache[$type][$uid][$lang]) ? node_load($cache[$type][$uid][$lang]) : false;
 }
 
 /**
@@ -563,7 +563,7 @@ 
   $return = array(
     'content_profile_display_view' => array(
       'template'  => 'content_profile-display-view',
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
       'file' => 'content_profile.theme.inc',
     ),
     'content_profile_display_add_link' => array(
@@ -581,7 +581,7 @@ 
   );
   if (module_exists('pageroute')) {
     $return['content_profile_pageroute_empty']  = array(
-      'arguments' => array('type_name' => NULL),
+      'arguments' => array('type_name' => null),
     	'file' => 'content_profile.pageroute.inc',
     );
   }

drupal/sites/default/boinc/modules/contrib/content_profile/content_profile.rules.inc

Indentation +28 added lines, -28 removed lines

@@ -10,79 +10,79 @@ 
  * Implementation of hook_rules_condition_info().
  */
 function content_profile_rules_condition_info() {
-  return array(
+    return array(
     'content_profile_user_has_profile_condition' => array(
-      'label' => t('User has content profile'),
-      'arguments' => array(
+        'label' => t('User has content profile'),
+        'arguments' => array(
         'user' => array('type' => 'user', 'label' => t('User')),
-      ),
-      'module' => 'Content Profile',
+        ),
+        'module' => 'Content Profile',
     ),
-  );
+    );
 }
 
 function content_profile_user_has_profile_condition($user, $settings) {
-  $node = content_profile_load($settings['type'], $user->uid);
-  return (bool)$node;
+    $node = content_profile_load($settings['type'], $user->uid);
+    return (bool)$node;
 }
 
 function content_profile_user_has_profile_condition_form($settings, &$form) {
-  $settings += array('type' => array());
-  $form['settings']['type'] = array(
+    $settings += array('type' => array());
+    $form['settings']['type'] = array(
     '#type' => 'select',
     '#title' => t('Content Profile Content Type'),
     '#options' => content_profile_get_types('names'),
     '#default_value' => $settings['type'],
     '#description' => t('Select the Content Profile content type to check for.'),
     '#required' => TRUE,
-  );
+    );
 }
 
 function content_profile_user_has_profile_condition_label($settings, $argument_labels) {
-  return t('@user has his @type created', $argument_labels + array('@type' => node_get_types('name', $settings['type'])));
+    return t('@user has his @type created', $argument_labels + array('@type' => node_get_types('name', $settings['type'])));
 }
 
 /**
  * Implementation of hook_rules_action_info().
  */
 function content_profile_rules_action_info() {
-  return array(
+    return array(
     'content_profile_action_load' => array(
-      'label' => t('Load Content Profile'),
-      'arguments' => array(
+        'label' => t('Load Content Profile'),
+        'arguments' => array(
         'user' => array('type' => 'user', 'label' => t('User, whose profile should be loaded')),
-      ),
-      'new variables' => array(
+        ),
+        'new variables' => array(
         'profile_node' => array('type' => 'node', 'label' => t('Content Profile')),
-      ),
-      'module' => 'Content Profile',
+        ),
+        'module' => 'Content Profile',
     ),
-  );
+    );
 }
 
 /**
  * Loads a Content Profile
  */
 function content_profile_action_load($user, $settings) {
-  if ($node = content_profile_load($settings['type'], $user->uid)) {
+    if ($node = content_profile_load($settings['type'], $user->uid)) {
     return array('profile_node' => $node);
-  }
+    }
 }
 
 function content_profile_action_load_form($settings, &$form) {
-  $settings += array('type' => array());
-  $form['settings']['type'] = array(
+    $settings += array('type' => array());
+    $form['settings']['type'] = array(
     '#type' => 'select',
     '#title' => t('Content Profile Content Type'),
     '#options' => content_profile_get_types('names'),
     '#default_value' => $settings['type'],
     '#description' => t('Select the Content Profile content type to load.'),
     '#required' => TRUE,
-  );
+    );
 }
 
 function content_profile_action_load_label($settings, $argument_labels) {
-  return t("Load @user's @type", $argument_labels + array('@type' => node_get_types('name', $settings['type'])));
+    return t("Load @user's @type", $argument_labels + array('@type' => node_get_types('name', $settings['type'])));
 }
 
 
@@ -90,8 +90,8 @@ 
  * Support upgrading from nodeprofile-workflow-ng integration.
  */
 function nodeprofile_user_has_profile_condition_upgrade(&$element) {
-  $element['#name'] = 'content_profile_user_has_profile_condition';
+    $element['#name'] = 'content_profile_user_has_profile_condition';
 }
 function nodeprofile_action_load_upgrade(&$element) {
-  $element['#name'] = 'content_profile_action_load';
+    $element['#name'] = 'content_profile_action_load';
 }

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

@@ -34,7 +34,7 @@ 
     '#options' => content_profile_get_types('names'),
     '#default_value' => $settings['type'],
     '#description' => t('Select the Content Profile content type to check for.'),
-    '#required' => TRUE,
+    '#required' => true,
   );
 }
 
@@ -77,7 +77,7 @@ 
     '#options' => content_profile_get_types('names'),
     '#default_value' => $settings['type'],
     '#description' => t('Select the Content Profile content type to load.'),
-    '#required' => TRUE,
+    '#required' => true,
   );
 }
 

drupal/sites/default/boinc/modules/contrib/content_profile/views/content_profile_views_handler_relationship.inc

Indentation +24 added lines, -24 removed lines

@@ -6,46 +6,46 @@ 
  * Specialized relationship handler to adding content profiles.
  */
 class content_profile_views_handler_relationship extends views_handler_relationship {
-  function option_definition() {
+    function option_definition() {
     $options = parent::option_definition();
 
     $options['type'] = array('default' => '');
     return $options;
-  }
+    }
 
-  /**
-   * Adds a form element for choosing the right content type.
-   */
-  function options_form(&$form, &$form_state) {
+    /**
+     * Adds a form element for choosing the right content type.
+     */
+    function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['type'] = array(
-      '#type' => 'radios',
-      '#title' => t('Content type'),
-      '#default_value' => $this->options['type'],
-      '#options' => content_profile_get_types('names'),
-      '#required' => TRUE,
+        '#type' => 'radios',
+        '#title' => t('Content type'),
+        '#default_value' => $this->options['type'],
+        '#options' => content_profile_get_types('names'),
+        '#required' => TRUE,
     );
-  }
+    }
 
-  /**
-   * Called to implement a relationship in a query.
-   */
-  function query() {
+    /**
+     * Called to implement a relationship in a query.
+     */
+    function query() {
     // Figure out what base table this relationship brings to the party.
     $join = new views_join();
     $join->definition = array(
-      'table' => 'node',
-      'field' => 'uid',
-      'left_table' => !empty($this->relationship) ? $this->relationship : 'users',
-      'left_field' => 'uid',
-      'extra' => array(
+        'table' => 'node',
+        'field' => 'uid',
+        'left_table' => !empty($this->relationship) ? $this->relationship : 'users',
+        'left_field' => 'uid',
+        'extra' => array(
         array('field' => 'type', 'value' => $this->options['type']),
-      ),
+        ),
     );
 
     if (!empty($this->options['required'])) {
-      $join->definition['type'] = 'INNER';
+        $join->definition['type'] = 'INNER';
     }
 
     $join->construct();
@@ -53,5 +53,5 @@ 
 
     $alias = $join->definition['table'] .'_'. $join->definition['left_table'];
     $this->alias = $this->query->add_relationship($alias, $join, $this->definition['base'], $this->relationship);
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     $join->construct();
     $this->ensure_my_table();
 
-    $alias = $join->definition['table'] .'_'. $join->definition['left_table'];
+    $alias = $join->definition['table'].'_'.$join->definition['left_table'];
     $this->alias = $this->query->add_relationship($alias, $join, $this->definition['base'], $this->relationship);
   }
 }

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

@@ -24,7 +24,7 @@
       '#title' => t('Content type'),
       '#default_value' => $this->options['type'],
       '#options' => content_profile_get_types('names'),
-      '#required' => TRUE,
+      '#required' => true,
     );
   }
 

drupal/sites/default/boinc/modules/contrib/content_profile/views/content_profile.views.inc

Indentation +13 added lines, -13 removed lines

@@ -10,18 +10,18 @@ 
  * Implementation of hook_views_data_alter().
  */
 function content_profile_views_data_alter(&$data) {
-  // node relationship for profiles
-  $data['users']['content_profile_rel'] = array(
+    // node relationship for profiles
+    $data['users']['content_profile_rel'] = array(
     'group' => t('Node'),
     'title' => t('Content Profile'),
     'help' => t('Create a relationship to a content profile of the user.'),
     'relationship' => array(
-      'handler' => 'content_profile_views_handler_relationship',
-      'base' => 'node',
-      'base field' => 'uid',
-      'label' => t('Content Profile'),
+        'handler' => 'content_profile_views_handler_relationship',
+        'base' => 'node',
+        'base field' => 'uid',
+        'label' => t('Content Profile'),
     ),
-  );
+    );
 }
 
 
@@ -29,14 +29,14 @@ 
  * Implementation of hook_views_handlers().
  */
 function content_profile_views_handlers() {
-  return array(
-  'info' => array(
+    return array(
+    'info' => array(
     'path' => drupal_get_path('module', 'content_profile') .'/views',
     ),
-  'handlers' => array(
+    'handlers' => array(
     'content_profile_views_handler_relationship' => array(
-     'parent' => 'views_handler_relationship',
-     ),
+        'parent' => 'views_handler_relationship',
+        ),
     ),
-  );
+    );
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 function content_profile_views_handlers() {
   return array(
   'info' => array(
-    'path' => drupal_get_path('module', 'content_profile') .'/views',
+    'path' => drupal_get_path('module', 'content_profile').'/views',
     ),
   'handlers' => array(
     'content_profile_views_handler_relationship' => array(

drupal/sites/default/boinc/modules/contrib/content_profile/panels/relationships/node_from_user.inc

Indentation +18 added lines, -18 removed lines

@@ -11,7 +11,7 @@ 
  * Implementation of specially named hook_ctools_relationships().
  */
 function content_profile_node_from_user_ctools_relationships() {
-  $args['node_from_user'] = array(
+    $args['node_from_user'] = array(
     'title' => t("Profile Node"),
     'keyword' => 'content_profile',
     'description' => t('Adds a Content Profile from user context'),
@@ -19,49 +19,49 @@ 
     'context' => 'content_profile_node_from_user_ctools_context',
     'settings form' => 'content_profile_node_from_user_ctools_settings_form',
     'settings form validate' => 'content_profile_node_from_user_ctools_settings_form_validate',
-  );
+    );
   
-  return $args;
+    return $args;
 }
 
 /**
  * Return a new context based on an existing context.
  */
 function content_profile_node_from_user_ctools_context($context, $conf) {
-  // If unset it wants a generic, unfilled context, which is just NULL.
-  if (empty($context->data) || !isset($context->data->uid)) {
+    // If unset it wants a generic, unfilled context, which is just NULL.
+    if (empty($context->data) || !isset($context->data->uid)) {
     $new_context = ctools_context_create_empty('node', NULL);
-  }
-  else {
+    }
+    else {
     // Load the node for the requested type
     $uid = $context->data->uid;
     $content_profile_node = content_profile_load($conf['type'], $uid);
 
     // Send it to ctools.
     $new_context = ctools_context_create('node', $content_profile_node);
-  }
+    }
 
-  // Have content profile relationships limit CCK field availability.
-  if (isset($new_context->restrictions['type'])) {
+    // Have content profile relationships limit CCK field availability.
+    if (isset($new_context->restrictions['type'])) {
     $new_context->restrictions['type'][] = $conf['type'];
-  }
-  else {
+    }
+    else {
     $new_context->restrictions['type'] = array($conf['type']);
-  }
-  return $new_context;
+    }
+    return $new_context;
 }
 
 /**
  * Settings form for the relationship
  */
 function content_profile_node_from_user_ctools_settings_form($conf) {
-  $options = content_profile_get_types('names');
-  $form['type'] = array(
+    $options = content_profile_get_types('names');
+    $form['type'] = array(
     '#type' => 'select',
     '#title' => t('Relationship type'),
     '#options' => $options,
     '#default_value' => $conf['type']
-  );
+    );
 
-  return $form;
+    return $form;
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -31,8 +31,7 @@ 
   // If unset it wants a generic, unfilled context, which is just NULL.
   if (empty($context->data) || !isset($context->data->uid)) {
     $new_context = ctools_context_create_empty('node', NULL);
-  }
-  else {
+  } else {
     // Load the node for the requested type
     $uid = $context->data->uid;
     $content_profile_node = content_profile_load($conf['type'], $uid);
@@ -44,8 +43,7 @@ 
   // Have content profile relationships limit CCK field availability.
   if (isset($new_context->restrictions['type'])) {
     $new_context->restrictions['type'][] = $conf['type'];
-  }
-  else {
+  } else {
     $new_context->restrictions['type'] = array($conf['type']);
   }
   return $new_context;

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

@@ -30,7 +30,7 @@
 function content_profile_node_from_user_ctools_context($context, $conf) {
   // If unset it wants a generic, unfilled context, which is just NULL.
   if (empty($context->data) || !isset($context->data->uid)) {
-    $new_context = ctools_context_create_empty('node', NULL);
+    $new_context = ctools_context_create_empty('node', null);
   }
   else {
     // Load the node for the requested type

drupal/sites/default/boinc/modules/contrib/content_profile/content_profile.theme_vars.inc

Indentation +69 added lines, -69 removed lines

@@ -11,109 +11,109 @@
  */
 class content_profile_theme_variables {
 
-  var $uid;
-  var $_cache = array();
+    var $uid;
+    var $_cache = array();
 
-  function content_profile_theme_variables($uid) {
+    function content_profile_theme_variables($uid) {
     $this->uid = $uid;
-  }
+    }
 
-  /**
-   * Gets the user id of the profiles owner.
-   */
-  function get_uid() {
+    /**
+     * Gets the user id of the profiles owner.
+     */
+    function get_uid() {
     return $uid;
-  }
+    }
 
-  /**
-   * Gets all type names keyed with their machine readable names.
-   */
-  function get_profile_types() {
+    /**
+     * Gets all type names keyed with their machine readable names.
+     */
+    function get_profile_types() {
     return content_profile_get_types('names');
-  }
+    }
 
-  /**
-   * Gets all template variables for the content profile of this type.
-   *
-   * @param $type
-   *   The type of the user's content profile
-   * @param $teaser
-   *   Whether the value is to be generated for the teaser.
-   * @param $page
-   *   Whether the value is to be generated for the page view.
-   *
-   * @return
-   *   An array of variables available for the profile node
-   *   or FALSE if there has been no profile created yet.
-   */
-  function get_variables($type, $teaser = FALSE, $page = FALSE) {
+    /**
+     * Gets all template variables for the content profile of this type.
+     *
+     * @param $type
+     *   The type of the user's content profile
+     * @param $teaser
+     *   Whether the value is to be generated for the teaser.
+     * @param $page
+     *   Whether the value is to be generated for the page view.
+     *
+     * @return
+     *   An array of variables available for the profile node
+     *   or FALSE if there has been no profile created yet.
+     */
+    function get_variables($type, $teaser = FALSE, $page = FALSE) {
     if (!isset($this->_cache[$type][$teaser][$page])) {
-      $this->_cache[$type][$teaser][$page] = FALSE;
+        $this->_cache[$type][$teaser][$page] = FALSE;
 
-      if ($node = content_profile_load($type, $this->uid)) {
+        if ($node = content_profile_load($type, $this->uid)) {
         // Make sure the node is prepared for viewing
         $node = node_build_content($node, $teaser, $page);
         $vars = array('node' => $node, 'teaser' => $teaser, 'page' => $page);
 
         // Apply all node template preprocessors
         foreach ($this->_get_node_preprocessors() as $function) {
-          if (function_exists($function)) {
+            if (function_exists($function)) {
             $function($vars, 'node');
-          }
+            }
         }
         $this->_cache[$type][$teaser][$page] = $vars;
-      }
+        }
     }
     return $this->_cache[$type][$teaser][$page];
-  }
+    }
 
-  /**
-   * Gets a single template variable for the content profile of this type.
-   *
-   * @param $type
-   *   The type of the user's content profile
-   * @param $name
-   *   The name of the variable to get.
-   *
-   * @return
-   *   The variable or FALSE if there has been no profile created yet.
-   */
-  function get_variable($type, $name) {
+    /**
+     * Gets a single template variable for the content profile of this type.
+     *
+     * @param $type
+     *   The type of the user's content profile
+     * @param $name
+     *   The name of the variable to get.
+     *
+     * @return
+     *   The variable or FALSE if there has been no profile created yet.
+     */
+    function get_variable($type, $name) {
     if ($vars = $this->get_variables($type)) {
-      return $vars[$name];
+        return $vars[$name];
     }
     return FALSE;
-  }
+    }
 
 
-  /**
-   * Generate a display of the given node.
-   *
-   * @param $type
-   *   The type of the user's content profile
-   * @param $teaser
-   *   Whether to display the teaser only or the full form.
-   * @param $page
-   *   Whether the node is being displayed by itself as a page.
-   * @param $links
-   *   Whether or not to display node links. Links are omitted for node previews.
-   *
-   * @return
-   *   An HTML representation of the themed node or FALSE if there has been no profile created yet.
-   */
-  function get_view($type, $teaser = FALSE, $page = FALSE, $links = TRUE) {
+    /**
+     * Generate a display of the given node.
+     *
+     * @param $type
+     *   The type of the user's content profile
+     * @param $teaser
+     *   Whether to display the teaser only or the full form.
+     * @param $page
+     *   Whether the node is being displayed by itself as a page.
+     * @param $links
+     *   Whether or not to display node links. Links are omitted for node previews.
+     *
+     * @return
+     *   An HTML representation of the themed node or FALSE if there has been no profile created yet.
+     */
+    function get_view($type, $teaser = FALSE, $page = FALSE, $links = TRUE) {
     if ($node = content_profile_load($type, $this->uid)) {
-      return node_view($node, $teaser, $page, $links);
+        return node_view($node, $teaser, $page, $links);
     }
     return FALSE;
-  }
+    }
 
 
-  function _get_node_preprocessors() {
+    function _get_node_preprocessors() {
     $hooks = theme_get_registry();
     $functions = $hooks['node']['preprocess functions'];
     // We don't need 'template_preprocess'
     unset($functions[0]);
     return $functions;
-  }
+    }
 }

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

@@ -46,9 +46,9 @@ 
    *   An array of variables available for the profile node
    *   or FALSE if there has been no profile created yet.
    */
-  function get_variables($type, $teaser = FALSE, $page = FALSE) {
+  function get_variables($type, $teaser = false, $page = false) {
     if (!isset($this->_cache[$type][$teaser][$page])) {
-      $this->_cache[$type][$teaser][$page] = FALSE;
+      $this->_cache[$type][$teaser][$page] = false;
 
       if ($node = content_profile_load($type, $this->uid)) {
         // Make sure the node is prepared for viewing
@@ -82,7 +82,7 @@ 
     if ($vars = $this->get_variables($type)) {
       return $vars[$name];
     }
-    return FALSE;
+    return false;
   }
 
 
@@ -101,11 +101,11 @@ 
    * @return
    *   An HTML representation of the themed node or FALSE if there has been no profile created yet.
    */
-  function get_view($type, $teaser = FALSE, $page = FALSE, $links = TRUE) {
+  function get_view($type, $teaser = false, $page = false, $links = true) {
     if ($node = content_profile_load($type, $this->uid)) {
       return node_view($node, $teaser, $page, $links);
     }
-    return FALSE;
+    return false;
   }