BOINC / boinc

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

Indentation +68 added lines, -68 removed lines

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

Spacing +1 added lines, -1 removed lines

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

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

Indentation +366 added lines, -366 removed lines

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

Switch Indentation +28 added lines, -28 removed lines

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

Spacing +45 added lines, -45 removed lines

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

Braces +13 added lines, -26 removed lines

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

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

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

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

Indentation +15 added lines, -15 removed lines

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

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

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

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

Indentation +22 added lines, -22 removed lines

@@ -10,7 +10,7 @@ 
  * Implementation of hook_ctools_relationships().
  */
 function nodereference_node_from_noderef_ctools_relationships() {
-  return array(
+    return array(
     'title' => t('Node from reference'),
     'keyword' => 'nodereference',
     'description' => t('Adds a node from a node reference in a node context; if multiple nodes are referenced, this will get the first referenced node only.'),
@@ -18,59 +18,59 @@ 
     'context' => 'nodereference_node_from_noderef_context',
     'settings form' => 'nodereference_node_from_noderef_settings_form',
     'settings form validate' => 'nodereference_node_from_noderef_settings_form_validate',
-  );
+    );
 }
 
 /**
  * Return a new ctools context based on an existing context.
  */
 function nodereference_node_from_noderef_context($context, $conf) {
-  $field = content_fields($conf['field_name']);
+    $field = content_fields($conf['field_name']);
 
-  // If unset it wants a generic, unfilled context, which is just NULL.
-  if (empty($context->data)) {
+    // If unset it wants a generic, unfilled context, which is just NULL.
+    if (empty($context->data)) {
     $new_context = ctools_context_create_empty('node', NULL);
-  }
-  else if (isset($context->data->{$conf['field_name']}[0]['nid']) && ($nid = $context->data->{$conf['field_name']}[0]['nid'])) {
+    }
+    else if (isset($context->data->{$conf['field_name']}[0]['nid']) && ($nid = $context->data->{$conf['field_name']}[0]['nid'])) {
     if ($node = node_load($nid)) {
-      $new_context = ctools_context_create('node', $node);
+        $new_context = ctools_context_create('node', $node);
+    }
     }
-  }
 
-  if (!empty($new_context)) {
+    if (!empty($new_context)) {
     // Have nodereference relationships limit CCK field availability as well.
     $restrictions = array_keys(array_filter($field['referenceable_types']));
     if ($restrictions) {
-      if (isset($new_context->restrictions['type'])) {
+        if (isset($new_context->restrictions['type'])) {
         $new_context->restrictions['type'] = array_unique(array_merge($new_context->restrictions['type'], $restrictions));
-      }
-      else {
+        }
+        else {
         $new_context->restrictions['type'] = $restrictions;
-      }
+        }
     }
 
     return $new_context;
-  }
+    }
 }
 
 /**
  * Settings form for the ctools relationship.
  */
 function nodereference_node_from_noderef_settings_form($conf) {
-  $options = array();
-  foreach (content_fields() as $field) {
+    $options = array();
+    foreach (content_fields() as $field) {
     if ($field['type'] == 'nodereference') {
-      $options[$field['field_name']] = t($field['widget']['label']);
+        $options[$field['field_name']] = t($field['widget']['label']);
+    }
     }
-  }
-  $form['field_name'] = array(
+    $form['field_name'] = array(
     '#title' => t('Node reference field'),
     '#type' => 'select',
     '#options' => $options,
     '#default_value' => isset($conf['field_name']) ? $conf['field_name'] : '',
     '#prefix' => '<div class="clear-block">',
     '#suffix' => '</div>',
-  );
+    );
 
-  return $form;
+    return $form;
 }

Braces +2 added lines, -4 removed lines

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

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

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

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

Indentation +204 added lines, -204 removed lines

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

Switch Indentation +195 added lines, -195 removed lines

@@ -54,142 +54,142 @@ 
  */
 function number_field_settings($op, $field) {
   switch ($op) {
-    case 'form':
-      $form = array();
-      $form['min'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Minimum'),
-        '#element_validate' => array('_element_validate_number'),
-        '#default_value' => is_numeric($field['min']) ? $field['min'] : '',
+  case 'form':
+    $form = array();
+    $form['min'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Minimum'),
+      '#element_validate' => array('_element_validate_number'),
+      '#default_value' => is_numeric($field['min']) ? $field['min'] : '',
+    );
+    $form['max'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Maximum'),
+      '#element_validate' => array('_element_validate_number'),
+      '#default_value' => is_numeric($field['max']) ? $field['max'] : '',
+    );
+    if ($field['type'] == 'number_decimal') {
+      $form['precision'] = array(
+        '#type' => 'select',
+        '#options' => drupal_map_assoc(range(10, 32)),
+        '#title' => t('Precision'),
+        '#description' => t('The total number of digits to store in the database, including those to the right of the decimal.'),
+        '#default_value' => is_numeric($field['precision']) ? $field['precision'] : 10,
       );
-      $form['max'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Maximum'),
-        '#element_validate' => array('_element_validate_number'),
-        '#default_value' => is_numeric($field['max']) ? $field['max'] : '',
+      $form['scale'] = array(
+        '#type' => 'select',
+        '#options' => drupal_map_assoc(range(0, 10)),
+        '#title' => t('Scale'),
+        '#description' => t('The number of digits to the right of the decimal.'),
+        '#default_value' => is_numeric($field['scale']) ? $field['scale'] : 2,
       );
-      if ($field['type'] == 'number_decimal') {
-        $form['precision'] = array(
-          '#type' => 'select',
-          '#options' => drupal_map_assoc(range(10, 32)),
-          '#title' => t('Precision'),
-          '#description' => t('The total number of digits to store in the database, including those to the right of the decimal.'),
-          '#default_value' => is_numeric($field['precision']) ? $field['precision'] : 10,
-        );
-        $form['scale'] = array(
-          '#type' => 'select',
-          '#options' => drupal_map_assoc(range(0, 10)),
-          '#title' => t('Scale'),
-          '#description' => t('The number of digits to the right of the decimal.'),
-          '#default_value' => is_numeric($field['scale']) ? $field['scale'] : 2,
-        );
-        $form['decimal'] = array(
-          '#type' => 'select',
-          '#options' => array('.' => 'decimal point', ',' => 'comma', ' ' => 'space'),
-          '#title' => t('Decimal marker'),
-          '#description' => t('The character users will input to mark the decimal point in forms.'),
-          '#default_value' => !empty($field['decimal']) ? $field['decimal'] : '.',
-        );
-      }
-      $form['append']['prefix'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Prefix'),
-        '#size' => 60,
-        '#default_value' => !empty($field['prefix']) ? $field['prefix'] : '',
-        '#description' => t('Define a string that should be prefixed to the value, like $ or €. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).'),
-      );
-      $form['append']['suffix'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Suffix'),
-        '#size' => 60,
-        '#default_value' => !empty($field['suffix']) ? $field['suffix'] : '',
-        '#description' => t('Define a string that should suffixed to the value, like m², m/s², kb/s. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).'),
+      $form['decimal'] = array(
+        '#type' => 'select',
+        '#options' => array('.' => 'decimal point', ',' => 'comma', ' ' => 'space'),
+        '#title' => t('Decimal marker'),
+        '#description' => t('The character users will input to mark the decimal point in forms.'),
+        '#default_value' => !empty($field['decimal']) ? $field['decimal'] : '.',
       );
-      $form['allowed_values_fieldset'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Allowed values'),
-        '#collapsible' => TRUE,
-        '#collapsed' => TRUE,
-      );
-      $form['allowed_values_fieldset']['allowed_values'] = array(
+    }
+    $form['append']['prefix'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Prefix'),
+      '#size' => 60,
+      '#default_value' => !empty($field['prefix']) ? $field['prefix'] : '',
+      '#description' => t('Define a string that should be prefixed to the value, like $ or €. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).'),
+    );
+    $form['append']['suffix'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Suffix'),
+      '#size' => 60,
+      '#default_value' => !empty($field['suffix']) ? $field['suffix'] : '',
+      '#description' => t('Define a string that should suffixed to the value, like m², m/s², kb/s. Leave blank for none. Separate singular and plural values with a pipe (pound|pounds).'),
+    );
+    $form['allowed_values_fieldset'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Allowed values'),
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+    );
+    $form['allowed_values_fieldset']['allowed_values'] = array(
+      '#type' => 'textarea',
+      '#title' => t('Allowed values list'),
+      '#default_value' => !empty($field['allowed_values']) ? $field['allowed_values'] : '',
+      '#required' => FALSE,
+      '#rows' => 10,
+      '#description' => t('The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database, and it must match the field storage type (%type). The label is optional, and the key will be used as the label if no label is specified.<br />Allowed HTML tags: @tags', array('%type' => $field['type'], '@tags' => _content_filter_xss_display_allowed_tags())),
+    );
+    $form['allowed_values_fieldset']['advanced_options'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('PHP code'),
+      '#collapsible' => TRUE,
+      '#collapsed' => empty($field['allowed_values_php']),
+    );
+    if (user_access('Use PHP input for field settings (dangerous - grant with care)')) {
+      $form['allowed_values_fieldset']['advanced_options']['allowed_values_php'] = array(
         '#type' => 'textarea',
-        '#title' => t('Allowed values list'),
-        '#default_value' => !empty($field['allowed_values']) ? $field['allowed_values'] : '',
-        '#required' => FALSE,
-        '#rows' => 10,
-        '#description' => t('The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database, and it must match the field storage type (%type). The label is optional, and the key will be used as the label if no label is specified.<br />Allowed HTML tags: @tags', array('%type' => $field['type'], '@tags' => _content_filter_xss_display_allowed_tags())),
+        '#title' => t('Code'),
+        '#default_value' => !empty($field['allowed_values_php']) ? $field['allowed_values_php'] : '',
+        '#rows' => 6,
+        '#description' => t('Advanced usage only: PHP code that returns a keyed array of allowed values. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the array returned by this code will override the allowed values list above.'),
       );
-      $form['allowed_values_fieldset']['advanced_options'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('PHP code'),
-        '#collapsible' => TRUE,
-        '#collapsed' => empty($field['allowed_values_php']),
+    }
+    else {
+      $form['allowed_values_fieldset']['advanced_options']['markup_allowed_values_php'] = array(
+        '#type' => 'item',
+        '#title' => t('Code'),
+        '#value' => !empty($field['allowed_values_php']) ? '<code>'. check_plain($field['allowed_values_php']) .'</code>' : t('&lt;none&gt;'),
+        '#description' => empty($field['allowed_values_php']) ? t("You're not allowed to input PHP code.") : t('This PHP code was set by an administrator and will override the allowed values list above.'),
       );
-      if (user_access('Use PHP input for field settings (dangerous - grant with care)')) {
-        $form['allowed_values_fieldset']['advanced_options']['allowed_values_php'] = array(
-          '#type' => 'textarea',
-          '#title' => t('Code'),
-          '#default_value' => !empty($field['allowed_values_php']) ? $field['allowed_values_php'] : '',
-          '#rows' => 6,
-          '#description' => t('Advanced usage only: PHP code that returns a keyed array of allowed values. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the array returned by this code will override the allowed values list above.'),
-        );
-      }
-      else {
-        $form['allowed_values_fieldset']['advanced_options']['markup_allowed_values_php'] = array(
-          '#type' => 'item',
-          '#title' => t('Code'),
-          '#value' => !empty($field['allowed_values_php']) ? '<code>'. check_plain($field['allowed_values_php']) .'</code>' : t('&lt;none&gt;'),
-          '#description' => empty($field['allowed_values_php']) ? t("You're not allowed to input PHP code.") : t('This PHP code was set by an administrator and will override the allowed values list above.'),
-        );
-      }
-      return $form;
+    }
+    return $form;
 
-    case 'save':
-      $values = array('prefix', 'suffix', 'min', 'max', 'allowed_values', 'allowed_values_php');
-      if ($field['type'] == 'number_decimal') {
-        $values = array_merge($values, array('precision', 'scale', 'decimal'));
-      }
-      return $values;
+  case 'save':
+    $values = array('prefix', 'suffix', 'min', 'max', 'allowed_values', 'allowed_values_php');
+    if ($field['type'] == 'number_decimal') {
+      $values = array_merge($values, array('precision', 'scale', 'decimal'));
+    }
+    return $values;
 
-    case 'database columns':
-      if ($field['type'] == 'number_integer') {
-        return array(
-          'value' => array('type' => 'int', 'not null' => FALSE, 'sortable' => TRUE),
-        );
-      }
-      if ($field['type'] == 'number_float') {
-        return array(
-          'value' => array('type' => 'float', 'not null' => FALSE, 'sortable' => TRUE),
-        );
-      }
-      if ($field['type'] == 'number_decimal') {
-        $precision = isset($field['precision']) ? $field['precision'] : 10;
-        $scale = isset($field['scale']) ? $field['scale'] : 2;
-        return array(
-          'value' => array('type' => 'numeric', 'precision' => $precision, 'scale' => $scale, 'not null' => FALSE, 'sortable' => TRUE),
-        );
-      }
+  case 'database columns':
+    if ($field['type'] == 'number_integer') {
+      return array(
+        'value' => array('type' => 'int', 'not null' => FALSE, 'sortable' => TRUE),
+      );
+    }
+    if ($field['type'] == 'number_float') {
+      return array(
+        'value' => array('type' => 'float', 'not null' => FALSE, 'sortable' => TRUE),
+      );
+    }
+    if ($field['type'] == 'number_decimal') {
+      $precision = isset($field['precision']) ? $field['precision'] : 10;
+      $scale = isset($field['scale']) ? $field['scale'] : 2;
+      return array(
+        'value' => array('type' => 'numeric', 'precision' => $precision, 'scale' => $scale, 'not null' => FALSE, 'sortable' => TRUE),
+      );
+    }
 
-    case 'views data':
-      $allowed_values = content_allowed_values($field);
-      if (count($allowed_values)) {
-        $data = content_views_field_views_data($field);
-        $db_info = content_database_info($field);
-        $table_alias = content_views_tablename($field);
-
-        // Filter: Add a 'many to one' filter.
-        $copy = $data[$table_alias][$field['field_name'] .'_value'];
-        $copy['title'] = t('@label (!name) - Allowed values', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
-        $copy['filter']['handler'] = 'content_handler_filter_many_to_one';
-        $copy['filter']['numeric'] = TRUE;
-        unset($copy['field'], $copy['argument'], $copy['sort']);
-        $data[$table_alias][$field['field_name'] .'_value_many_to_one'] = $copy;
-        // Argument: swap the handler to the 'many to one' operator
-        $data[$table_alias][$field['field_name'] .'_value']['argument']['handler'] = 'content_handler_argument_many_to_one';
-        $data[$table_alias][$field['field_name'] .'_value']['argument']['numeric'] = TRUE;
-        return $data;
-      }
-      break;
+  case 'views data':
+    $allowed_values = content_allowed_values($field);
+    if (count($allowed_values)) {
+      $data = content_views_field_views_data($field);
+      $db_info = content_database_info($field);
+      $table_alias = content_views_tablename($field);
+
+      // Filter: Add a 'many to one' filter.
+      $copy = $data[$table_alias][$field['field_name'] .'_value'];
+      $copy['title'] = t('@label (!name) - Allowed values', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
+      $copy['filter']['handler'] = 'content_handler_filter_many_to_one';
+      $copy['filter']['numeric'] = TRUE;
+      unset($copy['field'], $copy['argument'], $copy['sort']);
+      $data[$table_alias][$field['field_name'] .'_value_many_to_one'] = $copy;
+      // Argument: swap the handler to the 'many to one' operator
+      $data[$table_alias][$field['field_name'] .'_value']['argument']['handler'] = 'content_handler_argument_many_to_one';
+      $data[$table_alias][$field['field_name'] .'_value']['argument']['numeric'] = TRUE;
+      return $data;
+    }
+    break;
   }
 }
 
@@ -212,37 +212,37 @@ 
  */
 function number_field($op, &$node, $field, &$items, $teaser, $page) {
   switch ($op) {
-    case 'validate':
-      $allowed_values = content_allowed_values($field);
-      if (is_array($items)) {
-        foreach ($items as $delta => $item) {
-          $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
-          if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
-          if ($item['value'] != '') {
-            if (is_numeric($field['min']) && $item['value'] < $field['min']) {
-              form_set_error($error_element, t('%name: the value may be no smaller than %min.', array('%name' => t($field['widget']['label']), '%min' => $field['min'])));
-            }
-            if (is_numeric($field['max']) && $item['value'] > $field['max']) {
-              form_set_error($error_element, t('%name: the value may be no larger than %max.', array('%name' => t($field['widget']['label']), '%max' => $field['max'])));
-            }
-            if (count($allowed_values)) {
-              // We cannot use array_key_exists() because allowed values are
-              // stored as strings, and we need to compare numeric equality.
-              $valid = FALSE;
-              foreach ($allowed_values as $kay => $value) {
-                if ((float) $item['value'] == (float) $kay) {
-                  $valid = TRUE;
-                  break;
-                }
-              }
-              if (!$valid) {
-                form_set_error($error_element, t('%name: illegal value.', array('%name' => t($field['widget']['label']))));
+  case 'validate':
+    $allowed_values = content_allowed_values($field);
+    if (is_array($items)) {
+      foreach ($items as $delta => $item) {
+        $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
+        if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
+        if ($item['value'] != '') {
+          if (is_numeric($field['min']) && $item['value'] < $field['min']) {
+            form_set_error($error_element, t('%name: the value may be no smaller than %min.', array('%name' => t($field['widget']['label']), '%min' => $field['min'])));
+          }
+          if (is_numeric($field['max']) && $item['value'] > $field['max']) {
+            form_set_error($error_element, t('%name: the value may be no larger than %max.', array('%name' => t($field['widget']['label']), '%max' => $field['max'])));
+          }
+          if (count($allowed_values)) {
+            // We cannot use array_key_exists() because allowed values are
+            // stored as strings, and we need to compare numeric equality.
+            $valid = FALSE;
+            foreach ($allowed_values as $kay => $value) {
+              if ((float) $item['value'] == (float) $kay) {
+                $valid = TRUE;
+                break;
               }
             }
+            if (!$valid) {
+              form_set_error($error_element, t('%name: illegal value.', array('%name' => t($field['widget']['label']))));
+            }
           }
         }
       }
-      return $items;
+    }
+    return $items;
   }
 }
 
@@ -300,36 +300,36 @@ 
   }
 
   switch ($element['#formatter']) {
-    case 'us_0':
-      $output = number_format($value, 0, '.', ',');
-      break;
-    case 'us_1':
-      $output = number_format($value, 1, '.', ',');
-      break;
-    case 'us_2':
-      $output = number_format($value, 2, '.', ',');
-      break;
-    case 'be_0':
-      $output = number_format($value, 0, ',', '.');
-      break;
-    case 'be_1':
-      $output = number_format($value, 1, ',', '.');
-      break;
-    case 'be_2':
-      $output = number_format($value, 2, ',', '.');
-      break;
-    case 'fr_0':
-      $output = number_format($value, 0, ', ', ' ');
-      break;
-    case 'fr_1':
-      $output = number_format($value, 1, ', ', ' ');
-      break;
-    case 'fr_2':
-      $output = number_format($value, 2, ', ', ' ');
-      break;
-    default:
-      $output = $value;
-      break;
+  case 'us_0':
+    $output = number_format($value, 0, '.', ',');
+    break;
+  case 'us_1':
+    $output = number_format($value, 1, '.', ',');
+    break;
+  case 'us_2':
+    $output = number_format($value, 2, '.', ',');
+    break;
+  case 'be_0':
+    $output = number_format($value, 0, ',', '.');
+    break;
+  case 'be_1':
+    $output = number_format($value, 1, ',', '.');
+    break;
+  case 'be_2':
+    $output = number_format($value, 2, ',', '.');
+    break;
+  case 'fr_0':
+    $output = number_format($value, 0, ', ', ' ');
+    break;
+  case 'fr_1':
+    $output = number_format($value, 1, ', ', ' ');
+    break;
+  case 'fr_2':
+    $output = number_format($value, 2, ', ', ' ');
+    break;
+  default:
+    $output = $value;
+    break;
   }
 
   $prefixes = isset($field['prefix']) ? array_map('content_filter_xss', explode('|', $field['prefix'])) : array('');
@@ -475,18 +475,18 @@ 
     $element[$field_key]['#field_suffix'] = content_filter_xss(array_pop($suffixes));
   }
   switch ($field['type']) {
-    case 'number_float':
-      $element['#element_validate'][] = 'number_float_validate';
-      break;
-    case 'number_integer':
-      $element['#element_validate'][] = 'number_integer_validate';
-      break;
-    case 'number_decimal':
-      $element['#element_validate'][] = 'number_decimal_validate';
-      $element['#decimal'] = isset($field['decimal']) ? $field['decimal'] : '.';
-      $element['#precision'] = isset($field['precision']) ? $field['precision'] : 10;
-      $element['#scale'] = isset($field['scale']) ? $field['scale'] : 2;
-      break;
+  case 'number_float':
+    $element['#element_validate'][] = 'number_float_validate';
+    break;
+  case 'number_integer':
+    $element['#element_validate'][] = 'number_integer_validate';
+    break;
+  case 'number_decimal':
+    $element['#element_validate'][] = 'number_decimal_validate';
+    $element['#decimal'] = isset($field['decimal']) ? $field['decimal'] : '.';
+    $element['#precision'] = isset($field['precision']) ? $field['precision'] : 10;
+    $element['#scale'] = isset($field['scale']) ? $field['scale'] : 2;
+    break;
   }
 
   // Used so that hook_field('validate') knows where to flag an error.

Spacing +21 added lines, -21 removed lines

@@ -138,7 +138,7 @@ 
         $form['allowed_values_fieldset']['advanced_options']['markup_allowed_values_php'] = array(
           '#type' => 'item',
           '#title' => t('Code'),
-          '#value' => !empty($field['allowed_values_php']) ? '<code>'. check_plain($field['allowed_values_php']) .'</code>' : t('&lt;none&gt;'),
+          '#value' => !empty($field['allowed_values_php']) ? '<code>'.check_plain($field['allowed_values_php']).'</code>' : t('&lt;none&gt;'),
           '#description' => empty($field['allowed_values_php']) ? t("You're not allowed to input PHP code.") : t('This PHP code was set by an administrator and will override the allowed values list above.'),
         );
       }
@@ -178,15 +178,15 @@ 
         $table_alias = content_views_tablename($field);
 
         // Filter: Add a 'many to one' filter.
-        $copy = $data[$table_alias][$field['field_name'] .'_value'];
+        $copy = $data[$table_alias][$field['field_name'].'_value'];
         $copy['title'] = t('@label (!name) - Allowed values', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
         $copy['filter']['handler'] = 'content_handler_filter_many_to_one';
         $copy['filter']['numeric'] = TRUE;
         unset($copy['field'], $copy['argument'], $copy['sort']);
-        $data[$table_alias][$field['field_name'] .'_value_many_to_one'] = $copy;
+        $data[$table_alias][$field['field_name'].'_value_many_to_one'] = $copy;
         // Argument: swap the handler to the 'many to one' operator
-        $data[$table_alias][$field['field_name'] .'_value']['argument']['handler'] = 'content_handler_argument_many_to_one';
-        $data[$table_alias][$field['field_name'] .'_value']['argument']['numeric'] = TRUE;
+        $data[$table_alias][$field['field_name'].'_value']['argument']['handler'] = 'content_handler_argument_many_to_one';
+        $data[$table_alias][$field['field_name'].'_value']['argument']['numeric'] = TRUE;
         return $data;
       }
       break;
@@ -230,7 +230,7 @@ 
               // stored as strings, and we need to compare numeric equality.
               $valid = FALSE;
               foreach ($allowed_values as $kay => $value) {
-                if ((float) $item['value'] == (float) $kay) {
+                if ((float)$item['value'] == (float)$kay) {
                   $valid = TRUE;
                   break;
                 }
@@ -261,16 +261,16 @@ 
  */
 function number_field_formatter_info() {
   return array(
-    'default' => array('label' => '9999',            'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
-    'us_0'    => array('label' => '9,999',           'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
-    'us_1'    => array('label' => '9,999.9',         'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
-    'us_2'    => array('label' => '9,999.99',        'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
-    'be_0'    => array('label' => '9.999',           'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
-    'be_1'    => array('label' => '9.999,9',         'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
-    'be_2'    => array('label' => '9.999,99',        'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
-    'fr_0'    => array('label' => '9 999',           'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
-    'fr_1'    => array('label' => '9 999, 9',        'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
-    'fr_2'    => array('label' => '9 999, 99',       'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
+    'default' => array('label' => '9999', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
+    'us_0'    => array('label' => '9,999', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
+    'us_1'    => array('label' => '9,999.9', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
+    'us_2'    => array('label' => '9,999.99', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
+    'be_0'    => array('label' => '9.999', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
+    'be_1'    => array('label' => '9.999,9', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
+    'be_2'    => array('label' => '9.999,99', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
+    'fr_0'    => array('label' => '9 999', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
+    'fr_1'    => array('label' => '9 999, 9', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
+    'fr_2'    => array('label' => '9 999, 99', 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_decimal', 'number_float')),
     'unformatted' => array('label' => t('unformatted'), 'multiple values' => CONTENT_HANDLE_CORE, 'field types' => array('number_integer', 'number_decimal', 'number_float')),
   );
 }
@@ -337,7 +337,7 @@ 
   $prefix = (count($prefixes) > 1) ? format_plural($value, $prefixes[0], $prefixes[1]) : $prefixes[0];
   $suffix = (count($suffixes) > 1) ? format_plural($value, $suffixes[0], $suffixes[1]) : $suffixes[0];
 
-  return $prefix . $output . $suffix;
+  return $prefix.$output.$suffix;
 }
 
 /**
@@ -512,7 +512,7 @@ 
     $start = $value;
     $value = preg_replace('@[^-0-9\.]@', '', $value);
     if ($start != $value) {
-      $error_field = implode('][', $element['#parents']) .']['. $field_key;
+      $error_field = implode('][', $element['#parents']).']['.$field_key;
       form_set_error($error_field, t('Only numbers and decimals are allowed in %field.', array('%field' => t($field['widget']['label']))));
     }
     else {
@@ -535,7 +535,7 @@ 
     $start = $value;
     $value = preg_replace('@[^-0-9]@', '', $value);
     if ($start != $value) {
-      $error_field = implode('][', $element['#parents']) .']['. $field_key;
+      $error_field = implode('][', $element['#parents']).']['.$field_key;
       form_set_error($error_field, t('Only numbers are allowed in %field.', array('%field' => t($field['widget']['label']))));
     }
     else {
@@ -557,9 +557,9 @@ 
   if (($element[$field_key]['#required'] || !empty($value))) {
     $decimal = $element['#decimal'] ? $element['#decimal'] : '.';
     $start = $value;
-    $value = preg_replace('@[^-0-9\\'. $decimal .']@', '', $value);
+    $value = preg_replace('@[^-0-9\\'.$decimal.']@', '', $value);
     if ($start != $value) {
-      $error_field = implode('][', $element['#parents']) .']['. $field_key;
+      $error_field = implode('][', $element['#parents']).']['.$field_key;
       form_set_error($error_field, t('Only numbers and the decimal character (%decimal) are allowed in %field.', array('%decimal' => $element['#decimal'], '%field' => t($field['widget']['label']))));
     }
     else {

Braces +4 added lines, -8 removed lines

@@ -133,8 +133,7 @@ 
           '#rows' => 6,
           '#description' => t('Advanced usage only: PHP code that returns a keyed array of allowed values. Should not include <?php ?> delimiters. If this field is filled out, the array returned by this code will override the allowed values list above.'),
         );
-      }
-      else {
+      } else {
         $form['allowed_values_fieldset']['advanced_options']['markup_allowed_values_php'] = array(
           '#type' => 'item',
           '#title' => t('Code'),
@@ -514,8 +513,7 @@ 
     if ($start != $value) {
       $error_field = implode('][', $element['#parents']) .']['. $field_key;
       form_set_error($error_field, t('Only numbers and decimals are allowed in %field.', array('%field' => t($field['widget']['label']))));
-    }
-    else {
+    } else {
       form_set_value($element[$field_key], $value, $form_state);
     }
   }
@@ -537,8 +535,7 @@ 
     if ($start != $value) {
       $error_field = implode('][', $element['#parents']) .']['. $field_key;
       form_set_error($error_field, t('Only numbers are allowed in %field.', array('%field' => t($field['widget']['label']))));
-    }
-    else {
+    } else {
       form_set_value($element[$field_key], $value, $form_state);
     }
   }
@@ -561,8 +558,7 @@ 
     if ($start != $value) {
       $error_field = implode('][', $element['#parents']) .']['. $field_key;
       form_set_error($error_field, t('Only numbers and the decimal character (%decimal) are allowed in %field.', array('%decimal' => $element['#decimal'], '%field' => t($field['widget']['label']))));
-    }
-    else {
+    } else {
       $value = str_replace($element['#decimal'], '.', $value);
       $value = round($value, $element['#scale']);
       form_set_value($element[$field_key], $value, $form_state);

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

@@ -11,18 +11,18 @@ 
  */
 function number_theme() {
   return array(
-    'number' => array('arguments' => array('element' => NULL)),
-    'number_formatter_default' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_us_0' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_us_1' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_us_2' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_be_0' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_be_1' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_be_2' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_fr_0' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_fr_1' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_fr_2' => array('arguments' => array('element' => NULL), 'function' => 'theme_number_formatter_generic'),
-    'number_formatter_unformatted' => array('arguments' => array('element' => NULL)),
+    'number' => array('arguments' => array('element' => null)),
+    'number_formatter_default' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_us_0' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_us_1' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_us_2' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_be_0' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_be_1' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_be_2' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_fr_0' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_fr_1' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_fr_2' => array('arguments' => array('element' => null), 'function' => 'theme_number_formatter_generic'),
+    'number_formatter_unformatted' => array('arguments' => array('element' => null)),
   );
 }
 
@@ -108,21 +108,21 @@ 
       $form['allowed_values_fieldset'] = array(
         '#type' => 'fieldset',
         '#title' => t('Allowed values'),
-        '#collapsible' => TRUE,
-        '#collapsed' => TRUE,
+        '#collapsible' => true,
+        '#collapsed' => true,
       );
       $form['allowed_values_fieldset']['allowed_values'] = array(
         '#type' => 'textarea',
         '#title' => t('Allowed values list'),
         '#default_value' => !empty($field['allowed_values']) ? $field['allowed_values'] : '',
-        '#required' => FALSE,
+        '#required' => false,
         '#rows' => 10,
         '#description' => t('The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database, and it must match the field storage type (%type). The label is optional, and the key will be used as the label if no label is specified.<br />Allowed HTML tags: @tags', array('%type' => $field['type'], '@tags' => _content_filter_xss_display_allowed_tags())),
       );
       $form['allowed_values_fieldset']['advanced_options'] = array(
         '#type' => 'fieldset',
         '#title' => t('PHP code'),
-        '#collapsible' => TRUE,
+        '#collapsible' => true,
         '#collapsed' => empty($field['allowed_values_php']),
       );
       if (user_access('Use PHP input for field settings (dangerous - grant with care)')) {
@@ -154,19 +154,19 @@ 
     case 'database columns':
       if ($field['type'] == 'number_integer') {
         return array(
-          'value' => array('type' => 'int', 'not null' => FALSE, 'sortable' => TRUE),
+          'value' => array('type' => 'int', 'not null' => false, 'sortable' => true),
         );
       }
       if ($field['type'] == 'number_float') {
         return array(
-          'value' => array('type' => 'float', 'not null' => FALSE, 'sortable' => TRUE),
+          'value' => array('type' => 'float', 'not null' => false, 'sortable' => true),
         );
       }
       if ($field['type'] == 'number_decimal') {
         $precision = isset($field['precision']) ? $field['precision'] : 10;
         $scale = isset($field['scale']) ? $field['scale'] : 2;
         return array(
-          'value' => array('type' => 'numeric', 'precision' => $precision, 'scale' => $scale, 'not null' => FALSE, 'sortable' => TRUE),
+          'value' => array('type' => 'numeric', 'precision' => $precision, 'scale' => $scale, 'not null' => false, 'sortable' => true),
         );
       }
 
@@ -181,12 +181,12 @@ 
         $copy = $data[$table_alias][$field['field_name'] .'_value'];
         $copy['title'] = t('@label (!name) - Allowed values', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
         $copy['filter']['handler'] = 'content_handler_filter_many_to_one';
-        $copy['filter']['numeric'] = TRUE;
+        $copy['filter']['numeric'] = true;
         unset($copy['field'], $copy['argument'], $copy['sort']);
         $data[$table_alias][$field['field_name'] .'_value_many_to_one'] = $copy;
         // Argument: swap the handler to the 'many to one' operator
         $data[$table_alias][$field['field_name'] .'_value']['argument']['handler'] = 'content_handler_argument_many_to_one';
-        $data[$table_alias][$field['field_name'] .'_value']['argument']['numeric'] = TRUE;
+        $data[$table_alias][$field['field_name'] .'_value']['argument']['numeric'] = true;
         return $data;
       }
       break;
@@ -228,10 +228,10 @@ 
             if (count($allowed_values)) {
               // We cannot use array_key_exists() because allowed values are
               // stored as strings, and we need to compare numeric equality.
-              $valid = FALSE;
+              $valid = false;
               foreach ($allowed_values as $kay => $value) {
                 if ((float) $item['value'] == (float) $kay) {
-                  $valid = TRUE;
+                  $valid = true;
                   break;
                 }
               }
@@ -251,9 +251,9 @@ 
  */
 function number_content_is_empty($item, $field) {
   if (empty($item['value']) && (string)$item['value'] !== '0') {
-    return TRUE;
+    return true;
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -379,7 +379,7 @@ 
 function number_elements() {
   return array(
     'number' => array(
-      '#input' => TRUE,
+      '#input' => true,
       '#columns' => array('value'), '#delta' => 0,
       '#process' => array('number_process'),
     ),
@@ -420,7 +420,7 @@ 
 function number_widget(&$form, &$form_state, $field, $items, $delta = 0) {
   $element = array(
     '#type' => $field['widget']['type'],
-    '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
+    '#default_value' => isset($items[$delta]) ? $items[$delta] : null,
   );
   return $element;
 }

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

Indentation +168 added lines, -168 removed lines

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

Switch Indentation +10 added lines, -10 removed lines

@@ -419,16 +419,16 @@
  */
 function theme_optionwidgets_none($field) {
   switch ($field['widget']['type']) {
-    case 'optionwidgets_buttons':
-    case 'nodereference_buttons':
-    case 'userreference_buttons':
-      return t('N/A');
-    case 'optionwidgets_select':
-    case 'nodereference_select':
-    case 'userreference_select':
-      return t('- None -');
-    default :
-      return '';
+  case 'optionwidgets_buttons':
+  case 'nodereference_buttons':
+  case 'userreference_buttons':
+    return t('N/A');
+  case 'optionwidgets_select':
+  case 'nodereference_select':
+  case 'userreference_select':
+    return t('- None -');
+  default :
+    return '';
   }
 }
 

Spacing +7 added lines, -7 removed lines

@@ -16,13 +16,13 @@ 
     $field_type = $form['#field']['type'];
     $label = $form['#field']['widget']['label'];
 
-    $output = '<p>'. t('Create a list of options as a list in <strong>Allowed values list</strong> or as an array in PHP code. These values will be the same for %field in all content types.', array('%field' => $label)) .'</p>';
+    $output = '<p>'.t('Create a list of options as a list in <strong>Allowed values list</strong> or as an array in PHP code. These values will be the same for %field in all content types.', array('%field' => $label)).'</p>';
 
     if ($widget_type == 'optionwidgets_onoff') {
-      $output .= '<p>'. t("For a 'single on/off checkbox' widget, define the 'off' value first, then the 'on' value in the <strong>Allowed values</strong> section. Note that the checkbox will be labeled with the label of the 'on' value.") .'</p>';
+      $output .= '<p>'.t("For a 'single on/off checkbox' widget, define the 'off' value first, then the 'on' value in the <strong>Allowed values</strong> section. Note that the checkbox will be labeled with the label of the 'on' value.").'</p>';
     }
     elseif ($widget_type == 'optionwidgets_buttons') {
-      $output .= '<p>'. t("The 'checkboxes/radio buttons' widget will display checkboxes if the multiple values option is selected for this field, otherwise radios will be displayed.") .'</p>';
+      $output .= '<p>'.t("The 'checkboxes/radio buttons' widget will display checkboxes if the multiple values option is selected for this field, otherwise radios will be displayed.").'</p>';
     }
 
     if (in_array($field_type, array('text', 'number_integer', 'number_float', 'number_decimal'))
@@ -329,7 +329,7 @@ 
       unset($items[0]);
     }
     if (count($items) > $field['multiple']) {
-      $field_key  = $element['#columns'][0];
+      $field_key = $element['#columns'][0];
       form_error($element[$field_key], t('%name: this field cannot hold more than @count values.', array('%name' => t($field['widget']['label']), '@count' => $field['multiple'])));
     }
   }
@@ -368,7 +368,7 @@ 
  */
 function optionwidgets_form2data($element, $field) {
   $field_key = $element['#columns'][0];
-  $items = (array) $element[$field_key]['#value'];
+  $items = (array)$element[$field_key]['#value'];
   $options = optionwidgets_options($field);
 
   $values = array_values($items);
@@ -399,8 +399,8 @@ 
  *   when allowed values list is generated using PHP code.
  */
 function optionwidgets_options($field, $flatten = TRUE) {
-  $function = $field['module'] .'_allowed_values';
-  $options = function_exists($function) ? $function($field) : (array) content_allowed_values($field, $flatten);
+  $function = $field['module'].'_allowed_values';
+  $options = function_exists($function) ? $function($field) : (array)content_allowed_values($field, $flatten);
   // Add an empty choice for :
   // - non required radios
   // - non required selects

Braces +2 added lines, -4 removed lines

@@ -20,8 +20,7 @@ 
 
     if ($widget_type == 'optionwidgets_onoff') {
       $output .= '<p>'. t("For a 'single on/off checkbox' widget, define the 'off' value first, then the 'on' value in the <strong>Allowed values</strong> section. Note that the checkbox will be labeled with the label of the 'on' value.") .'</p>';
-    }
-    elseif ($widget_type == 'optionwidgets_buttons') {
+    } elseif ($widget_type == 'optionwidgets_buttons') {
       $output .= '<p>'. t("The 'checkboxes/radio buttons' widget will display checkboxes if the multiple values option is selected for this field, otherwise radios will be displayed.") .'</p>';
     }
 
@@ -355,8 +354,7 @@ 
   }
   if ($field['multiple'] || $element['#type'] == 'optionwidgets_onoff') {
     return array($field_key => $keys);
-  }
-  else {
+  } else {
     return !empty($keys) ? array($field_key => $value) : array();
   }
 }

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

@@ -27,7 +27,7 @@ 
 
     if (in_array($field_type, array('text', 'number_integer', 'number_float', 'number_decimal'))
     && in_array($widget_type, array('optionwidgets_onoff', 'optionwidgets_buttons', 'optionwidgets_select'))) {
-      $form['field']['allowed_values_fieldset']['#collapsed'] = FALSE;
+      $form['field']['allowed_values_fieldset']['#collapsed'] = false;
       $form['field']['allowed_values_fieldset']['#description'] = $output;
 
       // If no 'allowed values' were set yet, add a remainder in the messages area.
@@ -46,16 +46,16 @@ 
 function optionwidgets_theme() {
   return array(
     'optionwidgets_select' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
     'optionwidgets_buttons' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
     'optionwidgets_onoff' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
     'optionwidgets_none' => array(
-      'arguments' => array('widget_type' => NULL, 'field_name' => NULL, 'node_type' => NULL),
+      'arguments' => array('widget_type' => null, 'field_name' => null, 'node_type' => null),
       ),
   );
 }
@@ -115,17 +115,17 @@ 
 function optionwidgets_elements() {
   return array(
     'optionwidgets_select' => array(
-      '#input' => TRUE,
+      '#input' => true,
       '#columns' => array('value'), '#delta' => 0,
       '#process' => array('optionwidgets_select_process'),
       ),
     'optionwidgets_buttons' => array(
-      '#input' => TRUE,
+      '#input' => true,
       '#columns' => array('value'), '#delta' => 0,
       '#process' => array('optionwidgets_buttons_process'),
       ),
     'optionwidgets_onoff' => array(
-      '#input' => TRUE,
+      '#input' => true,
       '#columns' => array('value'), '#delta' => 0,
       '#process' => array('optionwidgets_onoff_process'),
       ),
@@ -163,7 +163,7 @@ 
  * @return
  *   the form item for a single element for this field
  */
-function optionwidgets_widget(&$form, &$form_state, $field, $items, $delta = NULL) {
+function optionwidgets_widget(&$form, &$form_state, $field, $items, $delta = null) {
   $element = array(
     '#type' => $field['widget']['type'],
     '#default_value' => !empty($items) ? $items : array(),
@@ -197,7 +197,7 @@ 
     '#required' => isset($element['#required']) ? $element['#required'] : $field['required'],
     '#multiple' => isset($element['#multiple']) ? $element['#multiple'] : $field['multiple'],
     '#options' => $options,
-    '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : NULL,
+    '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : null,
   );
 
   // Set #element_validate in a way that it will not wipe out other
@@ -232,7 +232,7 @@ 
     $element['#value'] = optionwidgets_data2form($element, $element['#default_value'], $field);
   }
 
-  $options = optionwidgets_options($field, FALSE);
+  $options = optionwidgets_options($field, false);
 
   // For this specific widget, HTML should be filtered out and entities left unencoded.
   // See content_allowed_values / content_filter_xss / filter_xss.
@@ -245,7 +245,7 @@ 
     '#required' => isset($element['#required']) ? $element['#required'] : $field['required'],
     '#multiple' => isset($element['#multiple']) ? $element['#multiple'] : $field['multiple'],
     '#options' => $options,
-    '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : NULL,
+    '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : null,
   );
 
   // Set #element_validate in a way that it will not wipe out other
@@ -286,13 +286,13 @@ 
   }
   $options = optionwidgets_options($field);
   $keys = array_keys($options);
-  $on_value = (!empty($keys) && isset($keys[1])) ? $keys[1] : NULL;
+  $on_value = (!empty($keys) && isset($keys[1])) ? $keys[1] : null;
   $element[$field_key] = array(
     '#type' => 'checkbox',
     '#title' => isset($options[$on_value]) ? $options[$on_value] : '',
     '#description' => $element['#description'],
     '#required' => isset($element['#required']) ? $element['#required'] : $field['required'],
-    '#default_value' => isset($element['#value'][$field_key][0]) ? $element['#value'][$field_key][0] == $on_value : FALSE,
+    '#default_value' => isset($element['#value'][$field_key][0]) ? $element['#value'][$field_key][0] == $on_value : false,
     '#return_value' => $on_value,
   );
 
@@ -375,11 +375,11 @@ 
 
   if ($element['#type'] == 'optionwidgets_onoff' && ($values[0] === 0)) {
     $keys = array_keys($options);
-    $values = array(array_key_exists(0, $keys) ? $keys[0] : NULL);
+    $values = array(array_key_exists(0, $keys) ? $keys[0] : null);
   }
 
   if (empty($values)) {
-    $values[] = NULL;
+    $values[] = null;
   }
   $result = content_transpose_array_rows_cols(array($field_key => $values));
   return $result;
@@ -398,7 +398,7 @@ 
  *   FALSE can be used to support optgroups for select widgets
  *   when allowed values list is generated using PHP code.
  */
-function optionwidgets_options($field, $flatten = TRUE) {
+function optionwidgets_options($field, $flatten = true) {
   $function = $field['module'] .'_allowed_values';
   $options = function_exists($function) ? $function($field) : (array) content_allowed_values($field, $flatten);
   // Add an empty choice for :

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

Indentation +7 added lines, -7 removed lines

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

Switch Indentation +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
  */
 function content_permissions_field_access($op, $field, $account, $node = NULL) {
   switch ($op) {
-    case 'view':
-    case 'edit':
-      return user_access($op .' '. $field['field_name'], $account);
+  case 'view':
+  case 'edit':
+    return user_access($op .' '. $field['field_name'], $account);
   }
   return TRUE;
 }

Spacing +3 added lines, -3 removed lines

@@ -7,8 +7,8 @@ 
 function content_permissions_perm() {
   $perms = array();
   foreach (content_fields() as $field) {
-    $perms[] = 'edit '. $field['field_name'];
-    $perms[] = 'view '. $field['field_name'];
+    $perms[] = 'edit '.$field['field_name'];
+    $perms[] = 'view '.$field['field_name'];
   }
   return $perms;
 }
@@ -22,7 +22,7 @@ 
   switch ($op) {
     case 'view':
     case 'edit':
-      return user_access($op .' '. $field['field_name'], $account);
+      return user_access($op.' '.$field['field_name'], $account);
   }
   return TRUE;
 }

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

@@ -18,11 +18,11 @@
  *
  * @see content_access().
  */
-function content_permissions_field_access($op, $field, $account, $node = NULL) {
+function content_permissions_field_access($op, $field, $account, $node = null) {
   switch ($op) {
     case 'view':
     case 'edit':
       return user_access($op .' '. $field['field_name'], $account);
   }
-  return TRUE;
+  return true;
 }

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

Indentation +150 added lines, -150 removed lines

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

Switch Indentation +135 added lines, -135 removed lines

@@ -50,94 +50,94 @@ 
  */
 function text_field_settings($op, $field) {
   switch ($op) {
-    case 'form':
-      $form = array();
-      $options = array(0 => t('Plain text'), 1 => t('Filtered text (user selects input format)'));
-      $form['text_processing'] = array(
-        '#type' => 'radios',
-        '#title' => t('Text processing'),
-        '#default_value' => is_numeric($field['text_processing']) ? $field['text_processing'] : 0,
-        '#options' => $options,
-      );
-      $form['max_length'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Maximum length'),
-        '#default_value' => is_numeric($field['max_length']) ? $field['max_length'] : '',
-        '#required' => FALSE,
-        '#element_validate' => array('_element_validate_integer_positive'),
-        '#description' => t('The maximum length of the field in characters. Leave blank for an unlimited size.'),
-      );
-      $form['allowed_values_fieldset'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Allowed values'),
-        '#collapsible' => TRUE,
-        '#collapsed' => TRUE,
-      );
-      $form['allowed_values_fieldset']['allowed_values'] = array(
+  case 'form':
+    $form = array();
+    $options = array(0 => t('Plain text'), 1 => t('Filtered text (user selects input format)'));
+    $form['text_processing'] = array(
+      '#type' => 'radios',
+      '#title' => t('Text processing'),
+      '#default_value' => is_numeric($field['text_processing']) ? $field['text_processing'] : 0,
+      '#options' => $options,
+    );
+    $form['max_length'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Maximum length'),
+      '#default_value' => is_numeric($field['max_length']) ? $field['max_length'] : '',
+      '#required' => FALSE,
+      '#element_validate' => array('_element_validate_integer_positive'),
+      '#description' => t('The maximum length of the field in characters. Leave blank for an unlimited size.'),
+    );
+    $form['allowed_values_fieldset'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Allowed values'),
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+    );
+    $form['allowed_values_fieldset']['allowed_values'] = array(
+      '#type' => 'textarea',
+      '#title' => t('Allowed values list'),
+      '#default_value' => !empty($field['allowed_values']) ? $field['allowed_values'] : '',
+      '#required' => FALSE,
+      '#rows' => 10,
+      '#description' => t('The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database, and it must match the field storage type (%type). The label is optional, and the key will be used as the label if no label is specified.<br />Allowed HTML tags: @tags', array('%type' => $field['type'], '@tags' => _content_filter_xss_display_allowed_tags())),
+    );
+    $form['allowed_values_fieldset']['advanced_options'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('PHP code'),
+      '#collapsible' => TRUE,
+      '#collapsed' => empty($field['allowed_values_php']),
+    );
+    if (user_access('Use PHP input for field settings (dangerous - grant with care)')) {
+      $form['allowed_values_fieldset']['advanced_options']['allowed_values_php'] = array(
         '#type' => 'textarea',
-        '#title' => t('Allowed values list'),
-        '#default_value' => !empty($field['allowed_values']) ? $field['allowed_values'] : '',
-        '#required' => FALSE,
-        '#rows' => 10,
-        '#description' => t('The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database, and it must match the field storage type (%type). The label is optional, and the key will be used as the label if no label is specified.<br />Allowed HTML tags: @tags', array('%type' => $field['type'], '@tags' => _content_filter_xss_display_allowed_tags())),
+        '#title' => t('Code'),
+        '#default_value' => !empty($field['allowed_values_php']) ? $field['allowed_values_php'] : '',
+        '#rows' => 6,
+        '#description' => t('Advanced usage only: PHP code that returns a keyed array of allowed values. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the array returned by this code will override the allowed values list above.'),
       );
-      $form['allowed_values_fieldset']['advanced_options'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('PHP code'),
-        '#collapsible' => TRUE,
-        '#collapsed' => empty($field['allowed_values_php']),
+    }
+    else {
+      $form['allowed_values_fieldset']['advanced_options']['markup_allowed_values_php'] = array(
+        '#type' => 'item',
+        '#title' => t('Code'),
+        '#value' => !empty($field['allowed_values_php']) ? '<code>'. check_plain($field['allowed_values_php']) .'</code>' : t('&lt;none&gt;'),
+        '#description' => empty($field['allowed_values_php']) ? t("You're not allowed to input PHP code.") : t('This PHP code was set by an administrator and will override the allowed values list above.'),
       );
-      if (user_access('Use PHP input for field settings (dangerous - grant with care)')) {
-        $form['allowed_values_fieldset']['advanced_options']['allowed_values_php'] = array(
-          '#type' => 'textarea',
-          '#title' => t('Code'),
-          '#default_value' => !empty($field['allowed_values_php']) ? $field['allowed_values_php'] : '',
-          '#rows' => 6,
-          '#description' => t('Advanced usage only: PHP code that returns a keyed array of allowed values. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the array returned by this code will override the allowed values list above.'),
-        );
-      }
-      else {
-        $form['allowed_values_fieldset']['advanced_options']['markup_allowed_values_php'] = array(
-          '#type' => 'item',
-          '#title' => t('Code'),
-          '#value' => !empty($field['allowed_values_php']) ? '<code>'. check_plain($field['allowed_values_php']) .'</code>' : t('&lt;none&gt;'),
-          '#description' => empty($field['allowed_values_php']) ? t("You're not allowed to input PHP code.") : t('This PHP code was set by an administrator and will override the allowed values list above.'),
-        );
-      }
-      return $form;
-
-    case 'save':
-      return array('text_processing', 'max_length', 'allowed_values', 'allowed_values_php');
-
-    case 'database columns':
-      if (empty($field['max_length']) || $field['max_length'] > 255) {
-        $columns['value'] = array('type' => 'text', 'size' => 'big', 'not null' => FALSE, 'sortable' => TRUE, 'views' => TRUE);
-      }
-      else {
-        $columns['value'] = array('type' => 'varchar', 'length' => $field['max_length'], 'not null' => FALSE, 'sortable' => TRUE, 'views' => TRUE);
-      }
-      if (!empty($field['text_processing'])) {
-        $columns['format'] = array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'views' => FALSE);
-      }
-      return $columns;
-
-    case 'views data':
-      $allowed_values = content_allowed_values($field);
-      if (count($allowed_values)) {
-        $data = content_views_field_views_data($field);
-        $db_info = content_database_info($field);
-        $table_alias = content_views_tablename($field);
-
-        // Filter: Add a 'many to one' filter.
-        $copy = $data[$table_alias][$field['field_name'] .'_value'];
-        $copy['title'] = t('@label (!name) - Allowed values', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
-        $copy['filter']['handler'] = 'content_handler_filter_many_to_one';
-        unset($copy['field'], $copy['argument'], $copy['sort']);
-        $data[$table_alias][$field['field_name'] .'_value_many_to_one'] = $copy;
-        // Argument : swap the handler to the 'many to one' operator.
-        $data[$table_alias][$field['field_name'] .'_value']['argument']['handler'] = 'content_handler_argument_many_to_one';
-        return $data;
-      }
+    }
+    return $form;
+
+  case 'save':
+    return array('text_processing', 'max_length', 'allowed_values', 'allowed_values_php');
+
+  case 'database columns':
+    if (empty($field['max_length']) || $field['max_length'] > 255) {
+      $columns['value'] = array('type' => 'text', 'size' => 'big', 'not null' => FALSE, 'sortable' => TRUE, 'views' => TRUE);
+    }
+    else {
+      $columns['value'] = array('type' => 'varchar', 'length' => $field['max_length'], 'not null' => FALSE, 'sortable' => TRUE, 'views' => TRUE);
+    }
+    if (!empty($field['text_processing'])) {
+      $columns['format'] = array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'views' => FALSE);
+    }
+    return $columns;
+
+  case 'views data':
+    $allowed_values = content_allowed_values($field);
+    if (count($allowed_values)) {
+      $data = content_views_field_views_data($field);
+      $db_info = content_database_info($field);
+      $table_alias = content_views_tablename($field);
+
+      // Filter: Add a 'many to one' filter.
+      $copy = $data[$table_alias][$field['field_name'] .'_value'];
+      $copy['title'] = t('@label (!name) - Allowed values', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
+      $copy['filter']['handler'] = 'content_handler_filter_many_to_one';
+      unset($copy['field'], $copy['argument'], $copy['sort']);
+      $data[$table_alias][$field['field_name'] .'_value_many_to_one'] = $copy;
+      // Argument : swap the handler to the 'many to one' operator.
+      $data[$table_alias][$field['field_name'] .'_value']['argument']['handler'] = 'content_handler_argument_many_to_one';
+      return $data;
+    }
   }
 }
 
@@ -146,34 +146,34 @@ 
  */
 function text_field($op, &$node, $field, &$items, $teaser, $page) {
   switch ($op) {
-    case 'validate':
-      $allowed_values = content_allowed_values($field);
-      if (is_array($items)) {
-        foreach ($items as $delta => $item) {
-          $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
-          if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
-          if (!empty($item['value'])) {
-            if (count($allowed_values) && !array_key_exists($item['value'], $allowed_values)) {
-              form_set_error($error_element, t('%name: illegal value.', array('%name' => t($field['widget']['label']))));
-            }
-            if (!empty($field['max_length']) && drupal_strlen($item['value']) > $field['max_length']) {
-              form_set_error($error_element, t('%name: the value may not be longer than %max characters.', array('%name' => $field['widget']['label'], '%max' => $field['max_length'])));
-            }
+  case 'validate':
+    $allowed_values = content_allowed_values($field);
+    if (is_array($items)) {
+      foreach ($items as $delta => $item) {
+        $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
+        if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
+        if (!empty($item['value'])) {
+          if (count($allowed_values) && !array_key_exists($item['value'], $allowed_values)) {
+            form_set_error($error_element, t('%name: illegal value.', array('%name' => t($field['widget']['label']))));
+          }
+          if (!empty($field['max_length']) && drupal_strlen($item['value']) > $field['max_length']) {
+            form_set_error($error_element, t('%name: the value may not be longer than %max characters.', array('%name' => $field['widget']['label'], '%max' => $field['max_length'])));
           }
         }
       }
-      return $items;
+    }
+    return $items;
 
-    case 'sanitize':
-      foreach ($items as $delta => $item) {
-        if (!empty($field['text_processing'])) {
-          $text = isset($item['value']) ? check_markup($item['value'], $item['format'], FALSE) : '';
-        }
-        else {
-          $text = isset($item['value']) ? check_plain($item['value']) : '';
-        }
-        $items[$delta]['safe'] = $text;
+  case 'sanitize':
+    foreach ($items as $delta => $item) {
+      if (!empty($field['text_processing'])) {
+        $text = isset($item['value']) ? check_markup($item['value'], $item['format'], FALSE) : '';
+      }
+      else {
+        $text = isset($item['value']) ? check_plain($item['value']) : '';
       }
+      $items[$delta]['safe'] = $text;
+    }
   }
 }
 
@@ -305,34 +305,34 @@ 
  */
 function text_widget_settings($op, $widget) {
   switch ($op) {
-    case 'form':
-      $form = array();
-      $rows = (isset($widget['rows']) && is_numeric($widget['rows'])) ? $widget['rows'] : 5;
-      $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
-      if ($widget['type'] == 'text_textfield') {
-        $form['rows'] = array('#type' => 'hidden', '#value' => $rows);
-        $form['size'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Size of textfield'),
-          '#default_value' => $size,
-          '#element_validate' => array('_element_validate_integer_positive'),
-          '#required' => TRUE,
-        );
-      }
-      else {
-        $form['rows'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Rows'),
-          '#default_value' => $rows,
-          '#element_validate' => array('_element_validate_integer_positive'),
-          '#required' => TRUE,
-        );
-        $form['size'] = array('#type' => 'hidden', '#value' => $size);
-      }
-      return $form;
+  case 'form':
+    $form = array();
+    $rows = (isset($widget['rows']) && is_numeric($widget['rows'])) ? $widget['rows'] : 5;
+    $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
+    if ($widget['type'] == 'text_textfield') {
+      $form['rows'] = array('#type' => 'hidden', '#value' => $rows);
+      $form['size'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Size of textfield'),
+        '#default_value' => $size,
+        '#element_validate' => array('_element_validate_integer_positive'),
+        '#required' => TRUE,
+      );
+    }
+    else {
+      $form['rows'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Rows'),
+        '#default_value' => $rows,
+        '#element_validate' => array('_element_validate_integer_positive'),
+        '#required' => TRUE,
+      );
+      $form['size'] = array('#type' => 'hidden', '#value' => $size);
+    }
+    return $form;
 
-    case 'save':
-      return array('rows', 'size');
+  case 'save':
+    return array('rows', 'size');
   }
 }
 

Spacing +11 added lines, -11 removed lines

@@ -100,7 +100,7 @@ 
         $form['allowed_values_fieldset']['advanced_options']['markup_allowed_values_php'] = array(
           '#type' => 'item',
           '#title' => t('Code'),
-          '#value' => !empty($field['allowed_values_php']) ? '<code>'. check_plain($field['allowed_values_php']) .'</code>' : t('&lt;none&gt;'),
+          '#value' => !empty($field['allowed_values_php']) ? '<code>'.check_plain($field['allowed_values_php']).'</code>' : t('&lt;none&gt;'),
           '#description' => empty($field['allowed_values_php']) ? t("You're not allowed to input PHP code.") : t('This PHP code was set by an administrator and will override the allowed values list above.'),
         );
       }
@@ -129,13 +129,13 @@ 
         $table_alias = content_views_tablename($field);
 
         // Filter: Add a 'many to one' filter.
-        $copy = $data[$table_alias][$field['field_name'] .'_value'];
+        $copy = $data[$table_alias][$field['field_name'].'_value'];
         $copy['title'] = t('@label (!name) - Allowed values', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
         $copy['filter']['handler'] = 'content_handler_filter_many_to_one';
         unset($copy['field'], $copy['argument'], $copy['sort']);
-        $data[$table_alias][$field['field_name'] .'_value_many_to_one'] = $copy;
+        $data[$table_alias][$field['field_name'].'_value_many_to_one'] = $copy;
         // Argument : swap the handler to the 'many to one' operator.
-        $data[$table_alias][$field['field_name'] .'_value']['argument']['handler'] = 'content_handler_argument_many_to_one';
+        $data[$table_alias][$field['field_name'].'_value']['argument']['handler'] = 'content_handler_argument_many_to_one';
         return $data;
       }
   }
@@ -214,14 +214,14 @@ 
  * Theme function for 'default' text field formatter.
  */
 function theme_text_formatter_default($element) {
-  return ($allowed =_text_allowed_values($element)) ? $allowed : $element['#item']['safe'];
+  return ($allowed = _text_allowed_values($element)) ? $allowed : $element['#item']['safe'];
 }
 
 /**
  * Theme function for 'plain' text field formatter.
  */
 function theme_text_formatter_plain($element) {
-  return ($allowed =_text_allowed_values($element)) ? $allowed : strip_tags($element['#item']['safe']);
+  return ($allowed = _text_allowed_values($element)) ? $allowed : strip_tags($element['#item']['safe']);
 }
 
 /**
@@ -229,7 +229,7 @@ 
  */
 function theme_text_formatter_trimmed($element) {
   $field = content_fields($element['#field_name'], $element['#type_name']);
-  return ($allowed =_text_allowed_values($element)) ? $allowed : node_teaser($element['#item']['safe'], $field['text_processing'] ? $element['#item']['format'] : NULL);
+  return ($allowed = _text_allowed_values($element)) ? $allowed : node_teaser($element['#item']['safe'], $field['text_processing'] ? $element['#item']['format'] : NULL);
 }
 
 function _text_allowed_values($element) {
@@ -409,7 +409,7 @@ 
   if (!empty($field['text_processing'])) {
     $filter_key = $element['#columns'][1];
     $format = isset($element['#value'][$filter_key]) ? $element['#value'][$filter_key] : FILTER_FORMAT_DEFAULT;
-    $parents = array_merge($element['#parents'] , array($filter_key));
+    $parents = array_merge($element['#parents'], array($filter_key));
     $element[$filter_key] = filter_form($format, 1, $parents);
   }
 
@@ -432,7 +432,7 @@ 
  */
 function text_textarea_process($element, $edit, $form_state, $form) {
   $field = $form['#field_info'][$element['#field_name']];
-  $field_key   = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
   $element[$field_key] = array(
     '#type' => 'textarea',
     '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : NULL,
@@ -450,9 +450,9 @@ 
   );
 
   if (!empty($field['text_processing'])) {
-    $filter_key  = (count($element['#columns']) == 2) ? $element['#columns'][1] : 'format';
+    $filter_key = (count($element['#columns']) == 2) ? $element['#columns'][1] : 'format';
     $format = isset($element['#value'][$filter_key]) ? $element['#value'][$filter_key] : FILTER_FORMAT_DEFAULT;
-    $parents = array_merge($element['#parents'] , array($filter_key));
+    $parents = array_merge($element['#parents'], array($filter_key));
     $element[$filter_key] = filter_form($format, 1, $parents);
   }
 

Braces +4 added lines, -8 removed lines

@@ -95,8 +95,7 @@ 
           '#rows' => 6,
           '#description' => t('Advanced usage only: PHP code that returns a keyed array of allowed values. Should not include <?php ?> delimiters. If this field is filled out, the array returned by this code will override the allowed values list above.'),
         );
-      }
-      else {
+      } else {
         $form['allowed_values_fieldset']['advanced_options']['markup_allowed_values_php'] = array(
           '#type' => 'item',
           '#title' => t('Code'),
@@ -112,8 +111,7 @@ 
     case 'database columns':
       if (empty($field['max_length']) || $field['max_length'] > 255) {
         $columns['value'] = array('type' => 'text', 'size' => 'big', 'not null' => FALSE, 'sortable' => TRUE, 'views' => TRUE);
-      }
-      else {
+      } else {
         $columns['value'] = array('type' => 'varchar', 'length' => $field['max_length'], 'not null' => FALSE, 'sortable' => TRUE, 'views' => TRUE);
       }
       if (!empty($field['text_processing'])) {
@@ -168,8 +166,7 @@ 
       foreach ($items as $delta => $item) {
         if (!empty($field['text_processing'])) {
           $text = isset($item['value']) ? check_markup($item['value'], $item['format'], FALSE) : '';
-        }
-        else {
+        } else {
           $text = isset($item['value']) ? check_plain($item['value']) : '';
         }
         $items[$delta]['safe'] = $text;
@@ -318,8 +315,7 @@ 
           '#element_validate' => array('_element_validate_integer_positive'),
           '#required' => TRUE,
         );
-      }
-      else {
+      } else {
         $form['rows'] = array(
           '#type' => 'textfield',
           '#title' => t('Rows'),

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

@@ -12,22 +12,22 @@ 
 function text_theme() {
   return array(
     'text_textarea' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
     'text_textfield' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
     'text_formatter_default' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
     'text_formatter_plain' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
     'text_formatter_trimmed' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
     'text_formatter_foo' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
   );
 }
@@ -63,28 +63,28 @@ 
         '#type' => 'textfield',
         '#title' => t('Maximum length'),
         '#default_value' => is_numeric($field['max_length']) ? $field['max_length'] : '',
-        '#required' => FALSE,
+        '#required' => false,
         '#element_validate' => array('_element_validate_integer_positive'),
         '#description' => t('The maximum length of the field in characters. Leave blank for an unlimited size.'),
       );
       $form['allowed_values_fieldset'] = array(
         '#type' => 'fieldset',
         '#title' => t('Allowed values'),
-        '#collapsible' => TRUE,
-        '#collapsed' => TRUE,
+        '#collapsible' => true,
+        '#collapsed' => true,
       );
       $form['allowed_values_fieldset']['allowed_values'] = array(
         '#type' => 'textarea',
         '#title' => t('Allowed values list'),
         '#default_value' => !empty($field['allowed_values']) ? $field['allowed_values'] : '',
-        '#required' => FALSE,
+        '#required' => false,
         '#rows' => 10,
         '#description' => t('The possible values this field can contain. Enter one value per line, in the format key|label. The key is the value that will be stored in the database, and it must match the field storage type (%type). The label is optional, and the key will be used as the label if no label is specified.<br />Allowed HTML tags: @tags', array('%type' => $field['type'], '@tags' => _content_filter_xss_display_allowed_tags())),
       );
       $form['allowed_values_fieldset']['advanced_options'] = array(
         '#type' => 'fieldset',
         '#title' => t('PHP code'),
-        '#collapsible' => TRUE,
+        '#collapsible' => true,
         '#collapsed' => empty($field['allowed_values_php']),
       );
       if (user_access('Use PHP input for field settings (dangerous - grant with care)')) {
@@ -111,13 +111,13 @@ 
 
     case 'database columns':
       if (empty($field['max_length']) || $field['max_length'] > 255) {
-        $columns['value'] = array('type' => 'text', 'size' => 'big', 'not null' => FALSE, 'sortable' => TRUE, 'views' => TRUE);
+        $columns['value'] = array('type' => 'text', 'size' => 'big', 'not null' => false, 'sortable' => true, 'views' => true);
       }
       else {
-        $columns['value'] = array('type' => 'varchar', 'length' => $field['max_length'], 'not null' => FALSE, 'sortable' => TRUE, 'views' => TRUE);
+        $columns['value'] = array('type' => 'varchar', 'length' => $field['max_length'], 'not null' => false, 'sortable' => true, 'views' => true);
       }
       if (!empty($field['text_processing'])) {
-        $columns['format'] = array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'views' => FALSE);
+        $columns['format'] = array('type' => 'int', 'unsigned' => true, 'not null' => false, 'views' => false);
       }
       return $columns;
 
@@ -167,7 +167,7 @@ 
     case 'sanitize':
       foreach ($items as $delta => $item) {
         if (!empty($field['text_processing'])) {
-          $text = isset($item['value']) ? check_markup($item['value'], $item['format'], FALSE) : '';
+          $text = isset($item['value']) ? check_markup($item['value'], $item['format'], false) : '';
         }
         else {
           $text = isset($item['value']) ? check_plain($item['value']) : '';
@@ -182,9 +182,9 @@ 
  */
 function text_content_is_empty($item, $field) {
   if (empty($item['value']) && (string)$item['value'] !== '0') {
-    return TRUE;
+    return true;
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -229,7 +229,7 @@ 
  */
 function theme_text_formatter_trimmed($element) {
   $field = content_fields($element['#field_name'], $element['#type_name']);
-  return ($allowed =_text_allowed_values($element)) ? $allowed : node_teaser($element['#item']['safe'], $field['text_processing'] ? $element['#item']['format'] : NULL);
+  return ($allowed =_text_allowed_values($element)) ? $allowed : node_teaser($element['#item']['safe'], $field['text_processing'] ? $element['#item']['format'] : null);
 }
 
 function _text_allowed_values($element) {
@@ -286,13 +286,13 @@ 
 function text_elements() {
   return array(
     'text_textfield' => array(
-      '#input' => TRUE,
+      '#input' => true,
       '#columns' => array('value'), '#delta' => 0,
       '#process' => array('text_textfield_process'),
-      '#autocomplete_path' => FALSE,
+      '#autocomplete_path' => false,
     ),
     'text_textarea' => array(
-      '#input' => TRUE,
+      '#input' => true,
       '#columns' => array('value', 'format'), '#delta' => 0,
       '#process' => array('text_textarea_process'),
       '#filter_value' => FILTER_FORMAT_DEFAULT,
@@ -316,7 +316,7 @@ 
           '#title' => t('Size of textfield'),
           '#default_value' => $size,
           '#element_validate' => array('_element_validate_integer_positive'),
-          '#required' => TRUE,
+          '#required' => true,
         );
       }
       else {
@@ -325,7 +325,7 @@ 
           '#title' => t('Rows'),
           '#default_value' => $rows,
           '#element_validate' => array('_element_validate_integer_positive'),
-          '#required' => TRUE,
+          '#required' => true,
         );
         $form['size'] = array('#type' => 'hidden', '#value' => $size);
       }
@@ -389,7 +389,7 @@ 
   $delta = $element['#delta'];
   $element[$field_key] = array(
     '#type' => 'textfield',
-    '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : NULL,
+    '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : null,
     '#autocomplete_path' => $element['#autocomplete_path'],
     '#size' => !empty($field['widget']['size']) ? $field['widget']['size'] : 60,
     '#attributes' => array('class' => 'text'),
@@ -404,7 +404,7 @@ 
     '#columns' => $element['#columns'],
   );
 
-  $element[$field_key]['#maxlength'] = !empty($field['max_length']) ? $field['max_length'] : NULL;
+  $element[$field_key]['#maxlength'] = !empty($field['max_length']) ? $field['max_length'] : null;
 
   if (!empty($field['text_processing'])) {
     $filter_key = $element['#columns'][1];
@@ -435,7 +435,7 @@ 
   $field_key   = $element['#columns'][0];
   $element[$field_key] = array(
     '#type' => 'textarea',
-    '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : NULL,
+    '#default_value' => isset($element['#value'][$field_key]) ? $element['#value'][$field_key] : null,
     '#rows' => !empty($field['widget']['rows']) ? $field['widget']['rows'] : 10,
     '#weight' => 0,
     // The following values were set by the content module and need

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

Indentation +18 added lines, -18 removed lines

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

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

@@ -27,12 +27,12 @@
 function userreference_user_from_userref_context($context, $conf) {
   // If unset it wants a generic, unfilled context, which is just NULL.
   if (empty($context->data)) {
-    return ctools_context_create_empty('user', NULL);
+    return ctools_context_create_empty('user', null);
   }
 
   // Prevent whitescreens on stale data.
   if (empty($conf)) {
-    return ctools_context_create_empty('user', NULL);
+    return ctools_context_create_empty('user', null);
   }
 
   if (isset($context->data->{$conf['field_name']}[0]['uid']) && ($uid = $context->data->{$conf['field_name']}[0]['uid'])) {