BOINC / boinc

drupal/sites/default/boinc/modules/contrib/htmlpurifier/library/HTMLPurifier/HTMLDefinition.php

Switch Indentation +24 added lines, -24 removed lines

@@ -364,32 +364,32 @@
                 $bits = preg_split('/[.@]/', $elattr, 2);
                 $c = count($bits);
                 switch ($c) {
-                    case 2:
-                        if ($bits[0] !== '*') {
-                            $element = htmlspecialchars($bits[0]);
-                            $attribute = htmlspecialchars($bits[1]);
-                            if (!isset($this->info[$element])) {
-                                trigger_error(
-                                    "Cannot allow attribute '$attribute' if element " .
-                                    "'$element' is not allowed/supported $support"
-                                );
-                            } else {
-                                trigger_error(
-                                    "Attribute '$attribute' in element '$element' not supported $support",
-                                    E_USER_WARNING
-                                );
-                            }
-                            break;
+                case 2:
+                    if ($bits[0] !== '*') {
+                        $element = htmlspecialchars($bits[0]);
+                        $attribute = htmlspecialchars($bits[1]);
+                        if (!isset($this->info[$element])) {
+                            trigger_error(
+                                "Cannot allow attribute '$attribute' if element " .
+                                "'$element' is not allowed/supported $support"
+                            );
+                        } else {
+                            trigger_error(
+                                "Attribute '$attribute' in element '$element' not supported $support",
+                                E_USER_WARNING
+                            );
                         }
-                        // otherwise fall through
-                    case 1:
-                        $attribute = htmlspecialchars($bits[0]);
-                        trigger_error(
-                            "Global attribute '$attribute' is not ".
-                            "supported in any elements $support",
-                            E_USER_WARNING
-                        );
                         break;
+                    }
+                    // otherwise fall through
+                case 1:
+                    $attribute = htmlspecialchars($bits[0]);
+                    trigger_error(
+                        "Global attribute '$attribute' is not ".
+                        "supported in any elements $support",
+                        E_USER_WARNING
+                    );
+                    break;
                 }
             }
         }

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

Switch Indentation +31 added lines, -31 removed lines

@@ -23,9 +23,9 @@ 
 function htmlpurifier_help($path, $arg) {
   $output = NULL;
   switch ($path) {
-    case 'admin/modules#htmlpurifier':
-      $output = t('Filter that removes malicious HTML and ensures standards compliant output.');
-      break;
+  case 'admin/modules#htmlpurifier':
+    $output = t('Filter that removes malicious HTML and ensures standards compliant output.');
+    break;
   }
   return $output;
 }
@@ -66,38 +66,38 @@ 
  */
 function htmlpurifier_filter($op, $delta = 0, $format = -1, $text = '') {
   switch ($op) {
-    case 'list':
-      return array(0 => t('HTML Purifier'), 1 => t('HTML Purifier (advanced)'));
-
-    case 'no cache':
-      // Since HTML Purifier implements its own caching layer, having filter
-      // cache it again is wasteful. Returns FALSE if double caching is permitted.
-      return !variable_get("htmlpurifier_doublecache", FALSE);
-
-    case 'description':
-      $common = t(
-        'Removes malicious HTML code and ensures that the output '.
-        'is standards compliant. <strong>Warning:</strong> For performance '.
-        'reasons, please ensure that there are no highly dynamic filters before HTML Purifier. '
-      );
-      switch ($delta) {
-        case 0:
-          return $common;
-        case 1:
-          return $common . t('<em>This version has advanced configuration options, do not enable both at the same time.</em>');
-      }
+  case 'list':
+    return array(0 => t('HTML Purifier'), 1 => t('HTML Purifier (advanced)'));
+
+  case 'no cache':
+    // Since HTML Purifier implements its own caching layer, having filter
+    // cache it again is wasteful. Returns FALSE if double caching is permitted.
+    return !variable_get("htmlpurifier_doublecache", FALSE);
+
+  case 'description':
+    $common = t(
+      'Removes malicious HTML code and ensures that the output '.
+      'is standards compliant. <strong>Warning:</strong> For performance '.
+      'reasons, please ensure that there are no highly dynamic filters before HTML Purifier. '
+    );
+    switch ($delta) {
+    case 0:
+    return $common;
+    case 1:
+    return $common . t('<em>This version has advanced configuration options, do not enable both at the same time.</em>');
+    }
 
-    case 'prepare':
-      return $text;
+  case 'prepare':
+    return $text;
 
-    case 'process':
-      return _htmlpurifier_process($text, $format);
+  case 'process':
+    return _htmlpurifier_process($text, $format);
 
-    case 'settings':
-      return _htmlpurifier_settings($delta, $format);
+  case 'settings':
+    return _htmlpurifier_settings($delta, $format);
 
-    default:
-      return NULL;
+  default:
+    return NULL;
   }
 }
 

drupal/sites/default/boinc/themes/boinc/templates/views-view-field--boinc-host-tasks-all--id.tpl.php

Switch Indentation +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
- /**
+/**
   * This template is used to print a single field in a view. It is not
   * actually used in default Views, as this is registered as a theme
   * function which has better performance. For single overrides, the

drupal/sites/default/boinc/themes/boinc/templates/views-view-field--boinc-workunit-tasks-all--id.tpl.php

Switch Indentation +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
- /**
+/**
   * This template is used to print a single field in a view. It is not
   * actually used in default Views, as this is registered as a theme
   * function which has better performance. For single overrides, the

drupal/sites/default/boinc/themes/boinc/templates/views-view-field--boinc-friends--page-2--uid.tpl.php

Switch Indentation +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
- /**
+/**
   * This template is used to print a single field in a view. It is not
   * actually used in default Views, as this is registered as a theme
   * function which has better performance. For single overrides, the

drupal/sites/default/boinc/themes/boinc/templates/user-profile.tpl.php

Switch Indentation +37 added lines, -37 removed lines

@@ -59,44 +59,44 @@
 $is_own_profile = ($user->uid == $account->uid);
 
 if ($user->uid AND ($user->uid != $account->uid)) {
-  if (module_exists('private_messages')) {
-  // if (function_exists('privatemsg_get_link')) {
-    $user_links[] = array(
-      'title' => bts('Send message'),
-      'href' => privatemsg_get_link(array($account))
-    );
-  }
+if (module_exists('private_messages')) {
+// if (function_exists('privatemsg_get_link')) {
+  $user_links[] = array(
+    'title' => bts('Send message'),
+    'href' => privatemsg_get_link(array($account))
+  );
+}
   
-  if (module_exists('friends')) {
-    $flag = flag_get_flag('friend');
-    $friend_status = flag_friend_determine_friend_status($flag, $account->uid, $user->uid);
-    switch ($friend_status) {
-    case FLAG_FRIEND_BOTH:
-    case FLAG_FRIEND_FLAGGED:
-      $user_links[] = array(
-        'title' => bts('Remove friend'),
-        'href' => "flag/confirm/unfriend/friend/{$account->uid}"
-      );
-      break;
-    case FLAG_FRIEND_PENDING:
-      $user_links[] = array(
-        'title' => bts('Cancel friend request'),
-        'href' => "flag/confirm/unflag/friend/{$account->uid}"
-      );
-      break;
-    case FLAG_FRIEND_APPROVAL:
-       $user_links[] = array(
-        'title' => bts('Approve friend request'),
-        'href' => "flag/confirm/flag/friend/{$account->uid}"
-      );
-      break;
-    case FLAG_FRIEND_UNFLAGGED:
-    default:
-      $user_links[] = array(
-        'title' => bts('Add as friend'),
-        'href' => "flag/confirm/flag/friend/{$account->uid}"
-      );
-    }
+if (module_exists('friends')) {
+  $flag = flag_get_flag('friend');
+  $friend_status = flag_friend_determine_friend_status($flag, $account->uid, $user->uid);
+  switch ($friend_status) {
+  case FLAG_FRIEND_BOTH:
+  case FLAG_FRIEND_FLAGGED:
+  $user_links[] = array(
+  'title' => bts('Remove friend'),
+  'href' => "flag/confirm/unfriend/friend/{$account->uid}"
+  );
+  break;
+  case FLAG_FRIEND_PENDING:
+  $user_links[] = array(
+  'title' => bts('Cancel friend request'),
+  'href' => "flag/confirm/unflag/friend/{$account->uid}"
+  );
+  break;
+  case FLAG_FRIEND_APPROVAL:
+  $user_links[] = array(
+  'title' => bts('Approve friend request'),
+  'href' => "flag/confirm/flag/friend/{$account->uid}"
+  );
+  break;
+  case FLAG_FRIEND_UNFLAGGED:
+  default:
+  $user_links[] = array(
+  'title' => bts('Add as friend'),
+  'href' => "flag/confirm/flag/friend/{$account->uid}"
+  );
+  }
   }
   
   if (user_access('assign community member role')

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

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 (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;
 
-      // 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']);
+  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;
   }
 }
 

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

Switch Indentation +123 added lines, -123 removed lines

@@ -97,89 +97,89 @@ 
   $form['#prefix'] = t('This form will process a content type and one or more fields from that type and export the settings. The export created by this process can be copied and pasted as an import into the current or any other database. The import will add the fields to an existing content type or create a new content type that includes the selected fields.');
 
   switch ($step) {
-    case 1: // Select a content type.
-      $types  = content_copy_types();
-      $form['type_name'] = array(
-        '#title' => t('Types'),
-        '#type' => 'radios',
-        '#options' => $types,
-        '#description' => t('Select the content type to export.'),
-      );
-      break;
-
-    case 2: // Select groups and fields.
-      $form['type_name'] = array(
-        '#type' => 'hidden',
-        '#value' => $type_name,
-      );
-
-      $form += array(
-        '#fields' => $exportable_fields,
-        '#groups' => array_keys($groups),
-      );
-
-      $fields_options = $groups_options = array();
-
-      // Fields.
-      foreach ($exportable_fields as $field_name) {
-        $field = content_fields($field_name, $type_name);
-        $fields_options[$field_name] = '';
-        $weight = $field['widget']['weight'];
-        $form[$field_name] = array(
-          'human_name' => array('#value' => check_plain($field['widget']['label'])),
-          'field_name' => array('#value' => $field['field_name']),
-          'type' => array('#value' => $field['type']),
-          'weight' => array('#type' => 'value', '#value' => $weight),
-          'parent' => array('#type' => 'value', '#value' => ''),
-          '#row_type' => 'field',
-        );
-      }
-      $form['fields'] = array(
-        '#type' => 'checkboxes',
-        '#options' => $fields_options,
-        '#default_value' => array_keys($fields_options),
-      );
-
-      // Groups.
-      foreach ($groups as $name => $group) {
-        $groups_options[$name] = '';
-        $weight = $group['weight'];
-        $form[$name] = array(
-          'human_name' => array('#value' => check_plain($group['label'])),
-          'group_name' => array('#value' => $group['group_name']),
-          'weight' => array('#type' => 'value', '#value' => $weight),
-          '#row_type' => 'group',
-        );
-        foreach ($group['fields'] as $field_name => $field) {
-          // Do nothing for non-exportable (inactive) fields.
-          if (isset($form[$field_name])) {
-            $form[$field_name]['parent']['#value'] = $name;
-          }
-        }
-      }
-      if ($groups) {
-        $form['groups'] = array(
-          '#type' => 'checkboxes',
-          '#options' => $groups_options,
-          '#default_value' => array_keys($groups_options),
-        );
-      }
-      break;
-
-    case 3: // Display the export macro.
-      $GLOBALS['content_copy']['count'] = 0;
-      $form['export'] = array(
-        '#title' => t('Export data'),
-        '#type' => 'textarea',
-        '#cols' => 60,
-        '#value' => content_copy_export($form_values),
-        '#rows' => max(40, $GLOBALS['content_copy']['count']),
-        '#description' => t('Copy the export text and paste it into another content type using the import function.'),
-      );
-      // The calls to drupal_execute('content_field_edit_form') in
-      // content_copy_export() affect the page title,
-      drupal_set_title(t('Content types'));
-      break;
+  case 1: // Select a content type.
+  $types  = content_copy_types();
+  $form['type_name'] = array(
+  '#title' => t('Types'),
+  '#type' => 'radios',
+  '#options' => $types,
+  '#description' => t('Select the content type to export.'),
+  );
+  break;
+
+  case 2: // Select groups and fields.
+  $form['type_name'] = array(
+  '#type' => 'hidden',
+  '#value' => $type_name,
+  );
+
+  $form += array(
+  '#fields' => $exportable_fields,
+  '#groups' => array_keys($groups),
+  );
+
+  $fields_options = $groups_options = array();
+
+  // Fields.
+  foreach ($exportable_fields as $field_name) {
+  $field = content_fields($field_name, $type_name);
+  $fields_options[$field_name] = '';
+  $weight = $field['widget']['weight'];
+  $form[$field_name] = array(
+    'human_name' => array('#value' => check_plain($field['widget']['label'])),
+    'field_name' => array('#value' => $field['field_name']),
+    'type' => array('#value' => $field['type']),
+    'weight' => array('#type' => 'value', '#value' => $weight),
+    'parent' => array('#type' => 'value', '#value' => ''),
+    '#row_type' => 'field',
+  );
+  }
+  $form['fields'] = array(
+  '#type' => 'checkboxes',
+  '#options' => $fields_options,
+  '#default_value' => array_keys($fields_options),
+  );
+
+  // Groups.
+  foreach ($groups as $name => $group) {
+  $groups_options[$name] = '';
+  $weight = $group['weight'];
+  $form[$name] = array(
+    'human_name' => array('#value' => check_plain($group['label'])),
+    'group_name' => array('#value' => $group['group_name']),
+    'weight' => array('#type' => 'value', '#value' => $weight),
+    '#row_type' => 'group',
+  );
+  foreach ($group['fields'] as $field_name => $field) {
+    // Do nothing for non-exportable (inactive) fields.
+    if (isset($form[$field_name])) {
+      $form[$field_name]['parent']['#value'] = $name;
+    }
+  }
+  }
+  if ($groups) {
+  $form['groups'] = array(
+    '#type' => 'checkboxes',
+    '#options' => $groups_options,
+    '#default_value' => array_keys($groups_options),
+  );
+  }
+  break;
+
+  case 3: // Display the export macro.
+  $GLOBALS['content_copy']['count'] = 0;
+  $form['export'] = array(
+  '#title' => t('Export data'),
+  '#type' => 'textarea',
+  '#cols' => 60,
+  '#value' => content_copy_export($form_values),
+  '#rows' => max(40, $GLOBALS['content_copy']['count']),
+  '#description' => t('Copy the export text and paste it into another content type using the import function.'),
+  );
+  // The calls to drupal_execute('content_field_edit_form') in
+  // content_copy_export() affect the page title,
+  drupal_set_title(t('Content types'));
+  break;
   }
 
   if ($step < 3) {  // Omit submit button on the textarea block to display the export data.
@@ -559,48 +559,48 @@ 
     unset($edit['type_name'], $edit['submit'], $edit['delete'], $edit['form_id'], $edit['previous_field']);
   }
   switch ($form_id) {
-    case 'node_type_form':
-      $subs['type'] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
-
-    case 'fieldgroup_group_edit_form':
-      $subs['groups'][] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
-
-    default:
-      if (isset($edit['field_widget_type'])) {
-        $tmp = explode('-', $edit['field_widget_type']);
-        $field_name = $tmp[0];
-      }
-      else {
-        $field_name = isset($edit['field_name']) ? $edit['field_name'] : '';
-      }
+  case 'node_type_form':
+    $subs['type'] = $edit;
+    $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+    break;
+
+  case 'fieldgroup_group_edit_form':
+    $subs['groups'][] = $edit;
+    $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+    break;
+
+  default:
+    if (isset($edit['field_widget_type'])) {
+      $tmp = explode('-', $edit['field_widget_type']);
+      $field_name = $tmp[0];
+    }
+    else {
+      $field_name = isset($edit['field_name']) ? $edit['field_name'] : '';
+    }
 
-      // The display settings are being fetched directly from the DB. During import,
-      // we'll re-insert the data directly as well.
-      //
-      $query = 'SELECT display_settings FROM {'. content_instance_tablename() .'} WHERE field_name = \'%s\'';
-      $row_info = db_fetch_array(db_query($query, $field_name));
-
-      // If an error occurs, notify the user.
-      if ($db_err = db_error()) {
-        drupal_set_message(t("An error occurred when exporting the 'display settings' data for the field %field_name.<br/>The db error is: '%db_err'.", array(
-             '%field_name' => $field_name,
-             '%db_err' => $db_err
-        )));
-      }
-      else {
-        // The db fetch occurred successfully, unserialize the data blob and
-        // insert it into a new "display_settings" field of the data.
-        if ($display_settings = unserialize($row_info['display_settings'])) {
-          $edit['display_settings'] = $display_settings;
-        }
+    // The display settings are being fetched directly from the DB. During import,
+    // we'll re-insert the data directly as well.
+    //
+    $query = 'SELECT display_settings FROM {'. content_instance_tablename() .'} WHERE field_name = \'%s\'';
+    $row_info = db_fetch_array(db_query($query, $field_name));
+
+    // If an error occurs, notify the user.
+    if ($db_err = db_error()) {
+      drupal_set_message(t("An error occurred when exporting the 'display settings' data for the field %field_name.<br/>The db error is: '%db_err'.", array(
+           '%field_name' => $field_name,
+           '%db_err' => $db_err
+      )));
+    }
+    else {
+      // The db fetch occurred successfully, unserialize the data blob and
+      // insert it into a new "display_settings" field of the data.
+      if ($display_settings = unserialize($row_info['display_settings'])) {
+        $edit['display_settings'] = $display_settings;
       }
-      $subs['fields'][] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
+    }
+    $subs['fields'][] = $edit;
+    $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+    break;
   }
 
   $GLOBALS['content_copy']['submissions'] = $subs;