BOINC / boinc

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_copy/content_copy.module

Indentation +273 added lines, -273 removed lines

@@ -32,174 +32,174 @@ 
  * Implementation of hook_menu().
  */
 function content_copy_menu() {
-  $items = array();
+    $items = array();
 
-  $items['admin/content/types/export'] = array(
+    $items['admin/content/types/export'] = array(
     'title' => 'Export',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('content_copy_export_form'),
     'access arguments' => array('administer content types'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 3,
-  );
-  $items['admin/content/types/import'] = array(
+    );
+    $items['admin/content/types/import'] = array(
     'title' => 'Import',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('content_copy_import_form'),
     'access arguments' => array('administer content types'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 4,
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function content_copy_theme() {
-  return array(
+    return array(
     'content_copy_export_form' => array(
-      'template' => 'content_copy_export_form',
-      'arguments' => array('form' => NULL),
+        'template' => 'content_copy_export_form',
+        'arguments' => array('form' => NULL),
     ),
-  );
+    );
 }
 
 /**
  *  A form to export field definitions.
  */
 function content_copy_export_form(&$form_state) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
-  include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
+    include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+    include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
 
-  $form_values = isset($form_state['values']) ? $form_state['values'] : array();
-  $step = isset($form_state['storage']['step']) ? $form_state['storage']['step'] + 1 : 1;
+    $form_values = isset($form_state['values']) ? $form_state['values'] : array();
+    $step = isset($form_state['storage']['step']) ? $form_state['storage']['step'] + 1 : 1;
 
-  $exportable_fields = array();
-  $groups = array();
+    $exportable_fields = array();
+    $groups = array();
 
-  $type_name = isset($form_values['type_name']) ? $form_values['type_name'] : '';
-  if ($type_name) {
+    $type_name = isset($form_values['type_name']) ? $form_values['type_name'] : '';
+    if ($type_name) {
     $type = content_types($type_name);
     $exportable_fields = content_copy_fields($type_name);
     if (module_exists('fieldgroup')) {
-      $groups = fieldgroup_groups($type_name);
+        $groups = fieldgroup_groups($type_name);
+    }
     }
-  }
 
-  // If a content type has been selected and there are no fields or groups to select,
-  // jump straight to export.
-  if ($step == 2 && !($groups) && !($exportable_fields)) {
+    // If a content type has been selected and there are no fields or groups to select,
+    // jump straight to export.
+    if ($step == 2 && !($groups) && !($exportable_fields)) {
     $step = 3;
-  }
+    }
 
-  $form['#step'] = $step;
-  $form['#prefix'] = t('This form will process a content type and one or more fields from that type and export the settings. The export created by this process can be copied and pasted as an import into the current or any other database. The import will add the fields to an existing content type or create a new content type that includes the selected fields.');
+    $form['#step'] = $step;
+    $form['#prefix'] = t('This form will process a content type and one or more fields from that type and export the settings. The export created by this process can be copied and pasted as an import into the current or any other database. The import will add the fields to an existing content type or create a new content type that includes the selected fields.');
 
-  switch ($step) {
+    switch ($step) {
     case 1: // Select a content type.
       $types  = content_copy_types();
-      $form['type_name'] = array(
+        $form['type_name'] = array(
         '#title' => t('Types'),
         '#type' => 'radios',
         '#options' => $types,
         '#description' => t('Select the content type to export.'),
-      );
-      break;
+        );
+        break;
 
     case 2: // Select groups and fields.
       $form['type_name'] = array(
         '#type' => 'hidden',
         '#value' => $type_name,
-      );
+        );
 
-      $form += array(
+        $form += array(
         '#fields' => $exportable_fields,
         '#groups' => array_keys($groups),
-      );
+        );
 
-      $fields_options = $groups_options = array();
+        $fields_options = $groups_options = array();
 
-      // Fields.
-      foreach ($exportable_fields as $field_name) {
+        // Fields.
+        foreach ($exportable_fields as $field_name) {
         $field = content_fields($field_name, $type_name);
         $fields_options[$field_name] = '';
         $weight = $field['widget']['weight'];
         $form[$field_name] = array(
-          'human_name' => array('#value' => check_plain($field['widget']['label'])),
-          'field_name' => array('#value' => $field['field_name']),
-          'type' => array('#value' => $field['type']),
-          'weight' => array('#type' => 'value', '#value' => $weight),
-          'parent' => array('#type' => 'value', '#value' => ''),
-          '#row_type' => 'field',
+            'human_name' => array('#value' => check_plain($field['widget']['label'])),
+            'field_name' => array('#value' => $field['field_name']),
+            'type' => array('#value' => $field['type']),
+            'weight' => array('#type' => 'value', '#value' => $weight),
+            'parent' => array('#type' => 'value', '#value' => ''),
+            '#row_type' => 'field',
         );
-      }
-      $form['fields'] = array(
+        }
+        $form['fields'] = array(
         '#type' => 'checkboxes',
         '#options' => $fields_options,
         '#default_value' => array_keys($fields_options),
-      );
+        );
 
-      // Groups.
-      foreach ($groups as $name => $group) {
+        // Groups.
+        foreach ($groups as $name => $group) {
         $groups_options[$name] = '';
         $weight = $group['weight'];
         $form[$name] = array(
-          'human_name' => array('#value' => check_plain($group['label'])),
-          'group_name' => array('#value' => $group['group_name']),
-          'weight' => array('#type' => 'value', '#value' => $weight),
-          '#row_type' => 'group',
+            'human_name' => array('#value' => check_plain($group['label'])),
+            'group_name' => array('#value' => $group['group_name']),
+            'weight' => array('#type' => 'value', '#value' => $weight),
+            '#row_type' => 'group',
         );
         foreach ($group['fields'] as $field_name => $field) {
-          // Do nothing for non-exportable (inactive) fields.
-          if (isset($form[$field_name])) {
+            // Do nothing for non-exportable (inactive) fields.
+            if (isset($form[$field_name])) {
             $form[$field_name]['parent']['#value'] = $name;
-          }
+            }
+        }
         }
-      }
-      if ($groups) {
+        if ($groups) {
         $form['groups'] = array(
-          '#type' => 'checkboxes',
-          '#options' => $groups_options,
-          '#default_value' => array_keys($groups_options),
+            '#type' => 'checkboxes',
+            '#options' => $groups_options,
+            '#default_value' => array_keys($groups_options),
         );
-      }
-      break;
+        }
+        break;
 
     case 3: // Display the export macro.
       $GLOBALS['content_copy']['count'] = 0;
-      $form['export'] = array(
+        $form['export'] = array(
         '#title' => t('Export data'),
         '#type' => 'textarea',
         '#cols' => 60,
         '#value' => content_copy_export($form_values),
         '#rows' => max(40, $GLOBALS['content_copy']['count']),
         '#description' => t('Copy the export text and paste it into another content type using the import function.'),
-      );
-      // The calls to drupal_execute('content_field_edit_form') in
-      // content_copy_export() affect the page title,
-      drupal_set_title(t('Content types'));
-      break;
-  }
-
-  if ($step < 3) {  // Omit submit button on the textarea block to display the export data.
+        );
+        // The calls to drupal_execute('content_field_edit_form') in
+        // content_copy_export() affect the page title,
+        drupal_set_title(t('Content types'));
+        break;
+    }
+
+    if ($step < 3) {  // Omit submit button on the textarea block to display the export data.
     $form['submit'] = array(
-      '#type' => 'submit',
-      '#value' => t('Export'),
+        '#type' => 'submit',
+        '#value' => t('Export'),
     );
-  }
+    }
 
-  $form['step'] = array(
+    $form['step'] = array(
     '#type' => 'value',
     '#value' => $step,
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 function content_copy_export_form_submit($form, &$form_state) {
-  $form_state['rebuild'] = TRUE;
-  $form_state['storage']['step'] = $form_state['values']['step'];
+    $form_state['rebuild'] = TRUE;
+    $form_state['storage']['step'] = $form_state['values']['step'];
 }
 
 
@@ -208,66 +208,66 @@ 
  *   and save the form values as formatted text.
  */
 function content_copy_export($form_values) {
-  // Set a global variable to tell when to intervene with form_alter().
-  $GLOBALS['content_copy']['status'] = 'export';
+    // Set a global variable to tell when to intervene with form_alter().
+    $GLOBALS['content_copy']['status'] = 'export';
 
-  // Get the content type info by submitting the content type form.
-  $node_state = array('values' => array('type_name' => $form_values['type_name']));
-  module_load_include('inc', 'node', 'content_types');
-  drupal_execute('node_type_form', $node_state, node_get_types('type', $form_values['type_name']));
+    // Get the content type info by submitting the content type form.
+    $node_state = array('values' => array('type_name' => $form_values['type_name']));
+    module_load_include('inc', 'node', 'content_types');
+    drupal_execute('node_type_form', $node_state, node_get_types('type', $form_values['type_name']));
 
-  module_load_include('inc', 'content', 'includes/content.admin');
-  module_load_include('inc', 'content', 'includes/content.crud');
+    module_load_include('inc', 'content', 'includes/content.admin');
+    module_load_include('inc', 'content', 'includes/content.crud');
 
-  // Get an array of groups to export.
-  // Record a macro for each group by submitting the group edit form.
-  $groups = array();
-  if (!empty($form_values['groups']) && module_exists('fieldgroup')) {
+    // Get an array of groups to export.
+    // Record a macro for each group by submitting the group edit form.
+    $groups = array();
+    if (!empty($form_values['groups']) && module_exists('fieldgroup')) {
     $groups = array_filter($form_values['groups']);
     foreach ($groups as $group) {
-      $group_state = array('values' => array('group_name' => $group));
-      drupal_execute('fieldgroup_group_edit_form', $group_state, $form_values['type_name'], $group, 'edit');
+        $group_state = array('values' => array('group_name' => $group));
+        drupal_execute('fieldgroup_group_edit_form', $group_state, $form_values['type_name'], $group, 'edit');
+    }
     }
-  }
 
-  // Get an array of fields to export
-  // Record a macro for each field by submitting the field settings form.
-  // Omit fields from the export if their module is not currently installed
-  // otherwise the system will generate errors when the macro tries to execute their forms.
-  if (!empty($form_values['fields'])) {
+    // Get an array of fields to export
+    // Record a macro for each field by submitting the field settings form.
+    // Omit fields from the export if their module is not currently installed
+    // otherwise the system will generate errors when the macro tries to execute their forms.
+    if (!empty($form_values['fields'])) {
     $type = content_types($form_values['type_name']);
     $fields = array_filter($form_values['fields']);
     foreach ($fields as $field_name) {
-      $field = $type['fields'][$field_name];
-      $field_types = _content_field_types();
-      $field_module = $field_types[$field['type']]['module'];
-      $widget_types = _content_widget_types();
-      $widget_module = $widget_types[$field['widget']['type']]['module'];
-      if (!empty($field_module) && module_exists($field_module) && !empty($widget_module) && module_exists($widget_module)) {
+        $field = $type['fields'][$field_name];
+        $field_types = _content_field_types();
+        $field_module = $field_types[$field['type']]['module'];
+        $widget_types = _content_widget_types();
+        $widget_module = $widget_types[$field['widget']['type']]['module'];
+        if (!empty($field_module) && module_exists($field_module) && !empty($widget_module) && module_exists($widget_module)) {
         $field_state = array('values' => content_field_instance_collapse($field));
         $field_state['values']['op'] = t('Save field settings');
         if (module_exists('fieldgroup')) {
-          // Avoid undefined index error by always creating this.
-          $field_state['values']['group'] = '';
-          $group_name = fieldgroup_get_group($form_values['type_name'], $field_name);
-          if (in_array($group_name, $groups)) {
+            // Avoid undefined index error by always creating this.
+            $field_state['values']['group'] = '';
+            $group_name = fieldgroup_get_group($form_values['type_name'], $field_name);
+            if (in_array($group_name, $groups)) {
             $field_state['values']['group'] = $group_name;
-          }
+            }
         }
         drupal_execute('content_field_edit_form', $field_state, $form_values['type_name'], $field_name);
-      }
+        }
+    }
     }
-  }
 
-  // Convert the macro array into formatted text.
-  $output = content_copy_get_macro();
+    // Convert the macro array into formatted text.
+    $output = content_copy_get_macro();
 
-  // Add weights of non-CCK fields.
-  if ($extra = variable_get('content_extra_weights_'. $form_values['type_name'], array())) {
+    // Add weights of non-CCK fields.
+    if ($extra = variable_get('content_extra_weights_'. $form_values['type_name'], array())) {
     $output .= "\$content['extra']  = ". var_export((array) $extra, TRUE) .";\n";
-  }
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
@@ -294,37 +294,37 @@ 
  * }
  */
 function content_copy_import_form(&$form_state, $type_name = '') {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
-  include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
+    include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+    include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
 
-  $form['#prefix'] = t('This form will import field definitions exported from another content type or another database.<br/>Note that fields cannot be duplicated within the same content type, so imported fields will be added only if they do not already exist in the selected type.');
-  $form['type_name'] = array(
+    $form['#prefix'] = t('This form will import field definitions exported from another content type or another database.<br/>Note that fields cannot be duplicated within the same content type, so imported fields will be added only if they do not already exist in the selected type.');
+    $form['type_name'] = array(
     '#type' => 'select',
     '#options' => array('<create>' => t('<Create>')) + content_copy_types(),
     '#default_value' => $type_name,
     '#title' => t('Content type'),
     '#description' => t('Select the content type to import these fields into.<br/>Select &lt;Create&gt; to create a new content type to contain the fields.'),
-  );
-  $form['macro'] = array(
+    );
+    $form['macro'] = array(
     '#type' => 'textarea',
     '#rows' => 40,
     '#title' => t('Import data'),
     '#required' => TRUE,
     '#description' => t('Paste the text created by a content export into this field.'),
-  );
-  $form['submit'] = array(
+    );
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Import'),
-  );
-  // Read in a file if there is one and set it as the default macro value.
-  if (isset($_REQUEST['macro_file']) && $file = file_get_contents($_REQUEST['macro_file'])) {
+    );
+    // Read in a file if there is one and set it as the default macro value.
+    if (isset($_REQUEST['macro_file']) && $file = file_get_contents($_REQUEST['macro_file'])) {
     $form['macro']['#default_value'] = $file;
     if (isset($_REQUEST['type_name'])) {
-      $form['type_name']['#default_value'] = $_REQUEST['type_name'];
+        $form['type_name']['#default_value'] = $_REQUEST['type_name'];
     }
     $form['#prefix'] .= '<p class="error">'. t('A file has been pre-loaded for import.') .'</p>';
-  }
-  return $form;
+    }
+    return $form;
 }
 
 /**
@@ -334,90 +334,90 @@ 
  *     2) execute the imported field macro to update the settings to the imported values
  */
 function content_copy_import_form_submit($form, &$form_state) {
-  $form_values = $form_state['values'];
+    $form_values = $form_state['values'];
 
-  // Get the content type we are importing into.
-  $type_name = $form_values['type_name'];
-  $type_label = node_get_types('name', $type_name);
+    // Get the content type we are importing into.
+    $type_name = $form_values['type_name'];
+    $type_label = node_get_types('name', $type_name);
 
-  $content = NULL;
-  // Convert the import formatted text back into a $content array.
-  // Return if errors generated or not an array.
-  // Use '@' to suppress errors about undefined constants in the macro.
-  @eval($form_values['macro']);
+    $content = NULL;
+    // Convert the import formatted text back into a $content array.
+    // Return if errors generated or not an array.
+    // Use '@' to suppress errors about undefined constants in the macro.
+    @eval($form_values['macro']);
 
-  // Preliminary error trapping, must have valid arrays to work with.
-  if (!isset($content) || !isset($content['type']) || !is_array($content) || !is_array($content['type'])) {
+    // Preliminary error trapping, must have valid arrays to work with.
+    if (!isset($content) || !isset($content['type']) || !is_array($content) || !is_array($content['type'])) {
     form_set_error('macro', t('The import data is not valid import text.'));
     return;
-  }
+    }
 
-  module_load_include('inc', 'content', 'includes/content.crud');
+    module_load_include('inc', 'content', 'includes/content.crud');
 
-  // Get all type and field info for this database.
-  $content_info = _content_type_info();
+    // Get all type and field info for this database.
+    $content_info = _content_type_info();
 
-  $imported_type = $content['type'];
-  $imported_type_name = $imported_type['type'];
-  $imported_type_label = $imported_type['name'];
+    $imported_type = $content['type'];
+    $imported_type_name = $imported_type['type'];
+    $imported_type_label = $imported_type['name'];
 
-  // It is allowed to import a type with no fields,
-  // so the fields array could be empty and must be cast as an array.
-  $imported_fields = isset($content['fields']) ? $content['fields'] : array();
+    // It is allowed to import a type with no fields,
+    // so the fields array could be empty and must be cast as an array.
+    $imported_fields = isset($content['fields']) ? $content['fields'] : array();
 
-  // Perform more pre-import error trapping.
-  // If there are potential problems, exit without doing the import.
-  $not_enabled = array();
+    // Perform more pre-import error trapping.
+    // If there are potential problems, exit without doing the import.
+    $not_enabled = array();
 
-  // The groups array could be empty and still valid, make sure to cast it as an array.
-  // If there are groups in the import, make sure the fieldgroup module is enabled.
-  $imported_groups = array();
-  if (isset($content['groups']) && module_exists('fieldgroup')) {
+    // The groups array could be empty and still valid, make sure to cast it as an array.
+    // If there are groups in the import, make sure the fieldgroup module is enabled.
+    $imported_groups = array();
+    if (isset($content['groups']) && module_exists('fieldgroup')) {
     $imported_groups = (array) $content['groups'];
-  }
-  elseif (isset($content['groups']) && is_array($content['groups'])) {
+    }
+    elseif (isset($content['groups']) && is_array($content['groups'])) {
     $not_enabled[] = 'fieldgroup';
-  }
+    }
 
-  // Make sure that all the field and widget modules in the import are enabled in this database.
-  foreach ($imported_fields as $import) {
+    // Make sure that all the field and widget modules in the import are enabled in this database.
+    foreach ($imported_fields as $import) {
     $field = content_field_instance_collapse($import);
     if (empty($field['module']) || empty($field['widget_module'])) {
-      $not_enabled[] = $field['field_name'];
+        $not_enabled[] = $field['field_name'];
     }
     else {
-      if (!module_exists($field['module'])) {
+        if (!module_exists($field['module'])) {
         $not_enabled[] = $field['module'];
-      }
-      if (!module_exists($field['widget_module'])) {
+        }
+        if (!module_exists($field['widget_module'])) {
         $not_enabled[] = $field['widget_module'];
-      }
+        }
+    }
     }
-  }
 
-  // If any required module is not enabled, set an error message and exit.
-  if ($not_enabled) {
+    // If any required module is not enabled, set an error message and exit.
+    if ($not_enabled) {
     form_set_error('macro', t('The following modules must be enabled for this import to work: %modules.', array(
         '%modules' => implode(', ', array_unique($not_enabled))
         )));
-  }
+    }
 
-  // Make sure the imported content type doesn't already exist in the database.
-  if ($form_values['type_name'] == '<create>') {
+    // Make sure the imported content type doesn't already exist in the database.
+    if ($form_values['type_name'] == '<create>') {
     if (in_array($imported_type_name, array_keys($content_info['content types']))) {
-      form_set_error('macro', t('The content type %type already exists in this database.', array(
+        form_set_error('macro', t('The content type %type already exists in this database.', array(
             '%type' => $imported_type_name
             )));
     }
-  }
+    }
 
-  if (form_get_errors()) {
+    if (form_get_errors()) {
     drupal_set_message(t('Exiting. No import performed.'), 'error');
     return;
-  }
+    }
 
-  // Create the content type, if requested.
-  if ($form_values['type_name'] == '<create>') {
+    // Create the content type, if requested.
+    if ($form_values['type_name'] == '<create>') {
 
     $type = (object) $imported_type;
     $values = $imported_type;
@@ -435,26 +435,26 @@ 
     $content_info = _content_type_info();
 
     if (form_get_errors() || !isset($content_info['content types']) || !is_array($content_info['content types'][$type_name])) {
-       drupal_set_message(t('An error has occurred adding the content type %type.<br/>Please check the errors displayed for more details.', array(
+        drupal_set_message(t('An error has occurred adding the content type %type.<br/>Please check the errors displayed for more details.', array(
             '%type' => $imported_type_name
             )));
-       return;
+        return;
+    }
     }
-  }
 
-  // Create the groups for this type, if they don't already exist.
-  if (module_exists('fieldgroup') && $imported_groups) {
+    // Create the groups for this type, if they don't already exist.
+    if (module_exists('fieldgroup') && $imported_groups) {
     foreach ($imported_groups as $group) {
-      $group_name = $group['group_name'];
-      fieldgroup_save_group($type_name, $group);
+        $group_name = $group['group_name'];
+        fieldgroup_save_group($type_name, $group);
     }
     // Reset the static variable in fieldgroup_groups() with new data.
     fieldgroup_groups('', FALSE, TRUE);
-  }
+    }
 
-  // Iterate through the field forms in the import and execute each.
-  $rebuild = FALSE;
-  foreach ($imported_fields as $field) {
+    // Iterate through the field forms in the import and execute each.
+    $rebuild = FALSE;
+    foreach ($imported_fields as $field) {
 
     // Make sure the field doesn't already exist in the type.
     // If so, do nothing, fields can't be duplicated within a content type.
@@ -464,13 +464,13 @@ 
     $field['type_name'] = $type_name;
 
     if (!empty($field['field_name']) && isset($content_info['content types'][$type_name]['fields'][$field_name])) {
-      drupal_set_message(t('The imported field %field_label (%field_name) was not added to %type because that field already exists in %type.', array(
+        drupal_set_message(t('The imported field %field_label (%field_name) was not added to %type because that field already exists in %type.', array(
         '%field_label' => $field['label'], '%field_name' => $field_name, '%type' => $type_label)));
     }
     else {
-      $field = content_field_instance_create($field, FALSE);
-      $rebuild = TRUE;
-      drupal_set_message(t('The field %field_label (%field_name) was added to the content type %type.', array(
+        $field = content_field_instance_create($field, FALSE);
+        $rebuild = TRUE;
+        drupal_set_message(t('The field %field_label (%field_name) was added to the content type %type.', array(
         '%field_label' => $field['widget']['label'], '%field_name' => $field_name, '%type' => $type_label)));
     }
 
@@ -480,20 +480,20 @@ 
     // restored. Hence, we need to update field group data for newly imported
     // field, but also for fields that already exist.
     if (module_exists('fieldgroup') && isset($imported_groups)) {
-      fieldgroup_update_fields($field);
+        fieldgroup_update_fields($field);
+    }
     }
-  }
 
-  // Clear caches and rebuild menu only if any field has been created.
-  if ($rebuild) {
+    // Clear caches and rebuild menu only if any field has been created.
+    if ($rebuild) {
     content_clear_type_cache(TRUE);
     menu_rebuild();
-  }
+    }
 
-  // Import weights of non-CCK fields.
-  if (isset($content['extra'])) {
+    // Import weights of non-CCK fields.
+    if (isset($content['extra'])) {
     variable_set('content_extra_weights_'. $type_name, $content['extra']);
-  }
+    }
 }
 
 /**
@@ -501,22 +501,22 @@ 
  * Intervene to run form through macro when doing export
  */
 function content_copy_form_alter(&$form, $form_state, $form_id) {
-  $alter_forms = array('node_type_form', 'content_field_edit_form', 'fieldgroup_group_edit_form');
-  if (isset($GLOBALS['content_copy']) && isset($GLOBALS['content_copy']['status']) && $GLOBALS['content_copy']['status'] == 'export' && in_array($form_id, $alter_forms)) {
+    $alter_forms = array('node_type_form', 'content_field_edit_form', 'fieldgroup_group_edit_form');
+    if (isset($GLOBALS['content_copy']) && isset($GLOBALS['content_copy']['status']) && $GLOBALS['content_copy']['status'] == 'export' && in_array($form_id, $alter_forms)) {
     $form['#submit'][] = 'content_copy_record_macro';
-  }
+    }
 }
 
 /**
  * Get all the *active* fields for a content type.
  */
 function content_copy_fields($type_name) {
-  $fields = array();
-  if (!$type_name) {
+    $fields = array();
+    if (!$type_name) {
     return $fields;
-  }
-  $content_info = _content_type_info();
-  foreach ($content_info['content types'][$type_name]['fields'] as $field_name => $field) {
+    }
+    $content_info = _content_type_info();
+    foreach ($content_info['content types'][$type_name]['fields'] as $field_name => $field) {
     // Omit fields from the export if their module is not currently installed
     // otherwise the system will generate errors when the macro tries to execute their forms.
     $field_types = _content_field_types();
@@ -525,125 +525,125 @@ 
     $widget_module = $widget_types[$field['widget']['type']]['module'];
 
     if (!$field['locked'] && !empty($field_module) && module_exists($field_module) && !empty($widget_module) && module_exists($widget_module)) {
-      $fields[] = $field_name;
+        $fields[] = $field_name;
     }
-  }
-  return $fields;
+    }
+    return $fields;
 }
 
 /**
  *  Get all content types.
  */
 function content_copy_types() {
-  $types = array();
-  $content_info = _content_type_info();
-  foreach ($content_info['content types'] as $type_name => $val) {
+    $types = array();
+    $content_info = _content_type_info();
+    foreach ($content_info['content types'] as $type_name => $val) {
     $types[$type_name] = check_plain($val['name']) .' ('. $type_name .')';
-  }
-  return $types;
+    }
+    return $types;
 }
 
 /**
  * A handler that stores the form submissions into a $GLOBALS array
  */
 function content_copy_record_macro($form, &$form_state) {
-  $edit = $form_state['values'];
-  $subs = isset($GLOBALS['content_copy']['submissions']) ? $GLOBALS['content_copy']['submissions'] : array();
+    $edit = $form_state['values'];
+    $subs = isset($GLOBALS['content_copy']['submissions']) ? $GLOBALS['content_copy']['submissions'] : array();
 
-  // Get the form values and store them in a $GLOBALS['content_copy']['submissions'] array.
-  // Update $GLOBALS['content_copy']['count'] with an approximation of the number of rows in this item.
-  // Count is used to approximate necessary size of textarea in form.
+    // Get the form values and store them in a $GLOBALS['content_copy']['submissions'] array.
+    // Update $GLOBALS['content_copy']['count'] with an approximation of the number of rows in this item.
+    // Count is used to approximate necessary size of textarea in form.
 
-  $form_id = $form_state['values']['form_id'];
-  if (isset($edit['type_name']) || isset($edit['submit']) || isset($edit['delete']) || isset($edit['form_id'])) {
+    $form_id = $form_state['values']['form_id'];
+    if (isset($edit['type_name']) || isset($edit['submit']) || isset($edit['delete']) || isset($edit['form_id'])) {
     unset($edit['type_name'], $edit['submit'], $edit['delete'], $edit['form_id'], $edit['previous_field']);
-  }
-  switch ($form_id) {
+    }
+    switch ($form_id) {
     case 'node_type_form':
       $subs['type'] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
+        $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+        break;
 
     case 'fieldgroup_group_edit_form':
       $subs['groups'][] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
+        $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+        break;
 
     default:
       if (isset($edit['field_widget_type'])) {
         $tmp = explode('-', $edit['field_widget_type']);
         $field_name = $tmp[0];
-      }
-      else {
+        }
+        else {
         $field_name = isset($edit['field_name']) ? $edit['field_name'] : '';
-      }
+        }
 
-      // The display settings are being fetched directly from the DB. During import,
-      // we'll re-insert the data directly as well.
-      //
-      $query = 'SELECT display_settings FROM {'. content_instance_tablename() .'} WHERE field_name = \'%s\'';
-      $row_info = db_fetch_array(db_query($query, $field_name));
+        // The display settings are being fetched directly from the DB. During import,
+        // we'll re-insert the data directly as well.
+        //
+        $query = 'SELECT display_settings FROM {'. content_instance_tablename() .'} WHERE field_name = \'%s\'';
+        $row_info = db_fetch_array(db_query($query, $field_name));
 
-      // If an error occurs, notify the user.
-      if ($db_err = db_error()) {
+        // If an error occurs, notify the user.
+        if ($db_err = db_error()) {
         drupal_set_message(t("An error occurred when exporting the 'display settings' data for the field %field_name.<br/>The db error is: '%db_err'.", array(
-             '%field_name' => $field_name,
-             '%db_err' => $db_err
+                '%field_name' => $field_name,
+                '%db_err' => $db_err
         )));
-      }
-      else {
+        }
+        else {
         // The db fetch occurred successfully, unserialize the data blob and
         // insert it into a new "display_settings" field of the data.
         if ($display_settings = unserialize($row_info['display_settings'])) {
-          $edit['display_settings'] = $display_settings;
+            $edit['display_settings'] = $display_settings;
         }
-      }
-      $subs['fields'][] = $edit;
-      $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
-      break;
-  }
+        }
+        $subs['fields'][] = $edit;
+        $GLOBALS['content_copy']['count'] += sizeof($edit) + 5;
+        break;
+    }
 
-  $GLOBALS['content_copy']['submissions'] = $subs;
+    $GLOBALS['content_copy']['submissions'] = $subs;
 }
 
 /**
  * @return a code representation of the recorded macro.
  */
 function content_copy_get_macro() {
-  // Define the indexes for the evaluated code.
-  $string = "";
-  if (array_key_exists('submissions', $GLOBALS['content_copy'])) {
+    // Define the indexes for the evaluated code.
+    $string = "";
+    if (array_key_exists('submissions', $GLOBALS['content_copy'])) {
     foreach ($GLOBALS['content_copy']['submissions'] as $form_type => $form) {
-      $string .= "\$content['$form_type']  = ". var_export((array) $form, TRUE) .";\n";
+        $string .= "\$content['$form_type']  = ". var_export((array) $form, TRUE) .";\n";
     }
     return $string;
-  }
+    }
 }
 
 function template_preprocess_content_copy_export_form($vars) {
-  $form = &$vars['form'];
+    $form = &$vars['form'];
 
-  if ($form['#step'] == 2) {
+    if ($form['#step'] == 2) {
     $order = _content_overview_order($form, $form['#fields'], $form['#groups']);
 
     $rows = array();
     foreach ($order as $key) {
-      $element = &$form[$key];
-      $row = new stdClass();
+        $element = &$form[$key];
+        $row = new stdClass();
 
-      $row->row_type = $element['#row_type'];
-      $checkbox_key = $element['#row_type'] == 'field' ? 'fields' : 'groups';
-      $row->checkbox = drupal_render($form[$checkbox_key][$key]);
-      foreach (element_children($element) as $child) {
+        $row->row_type = $element['#row_type'];
+        $checkbox_key = $element['#row_type'] == 'field' ? 'fields' : 'groups';
+        $row->checkbox = drupal_render($form[$checkbox_key][$key]);
+        foreach (element_children($element) as $child) {
         $row->{$child} = drupal_render($element[$child]);
-      }
-      $row->label_class = in_array($key, $form['#groups']) ? 'label-group' : 'label-field';
-      $row->indentation = theme('indentation', isset($element['#depth']) ? $element['#depth'] : 0);
+        }
+        $row->label_class = in_array($key, $form['#groups']) ? 'label-group' : 'label-field';
+        $row->indentation = theme('indentation', isset($element['#depth']) ? $element['#depth'] : 0);
 
-      $rows[] = $row;
+        $rows[] = $row;
     }
     $vars['rows'] = $rows;
-  }
+    }
 
-  $vars['submit'] = drupal_render($form);
+    $vars['submit'] = drupal_render($form);
 }
\ No newline at end of file

Switch Indentation +115 added lines, -115 removed lines

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

Spacing +15 added lines, -15 removed lines

@@ -69,8 +69,8 @@ 
  *  A form to export field definitions.
  */
 function content_copy_export_form(&$form_state) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
-  include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
+  include_once('./'.drupal_get_path('module', 'content').'/includes/content.admin.inc');
+  include_once('./'.drupal_get_path('module', 'node').'/content_types.inc');
 
   $form_values = isset($form_state['values']) ? $form_state['values'] : array();
   $step = isset($form_state['storage']['step']) ? $form_state['storage']['step'] + 1 : 1;
@@ -98,7 +98,7 @@ 
 
   switch ($step) {
     case 1: // Select a content type.
-      $types  = content_copy_types();
+      $types = content_copy_types();
       $form['type_name'] = array(
         '#title' => t('Types'),
         '#type' => 'radios',
@@ -263,8 +263,8 @@ 
   $output = content_copy_get_macro();
 
   // Add weights of non-CCK fields.
-  if ($extra = variable_get('content_extra_weights_'. $form_values['type_name'], array())) {
-    $output .= "\$content['extra']  = ". var_export((array) $extra, TRUE) .";\n";
+  if ($extra = variable_get('content_extra_weights_'.$form_values['type_name'], array())) {
+    $output .= "\$content['extra']  = ".var_export((array)$extra, TRUE).";\n";
   }
 
   return $output;
@@ -294,8 +294,8 @@ 
  * }
  */
 function content_copy_import_form(&$form_state, $type_name = '') {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
-  include_once('./'. drupal_get_path('module', 'node') .'/content_types.inc');
+  include_once('./'.drupal_get_path('module', 'content').'/includes/content.admin.inc');
+  include_once('./'.drupal_get_path('module', 'node').'/content_types.inc');
 
   $form['#prefix'] = t('This form will import field definitions exported from another content type or another database.<br/>Note that fields cannot be duplicated within the same content type, so imported fields will be added only if they do not already exist in the selected type.');
   $form['type_name'] = array(
@@ -322,7 +322,7 @@ 
     if (isset($_REQUEST['type_name'])) {
       $form['type_name']['#default_value'] = $_REQUEST['type_name'];
     }
-    $form['#prefix'] .= '<p class="error">'. t('A file has been pre-loaded for import.') .'</p>';
+    $form['#prefix'] .= '<p class="error">'.t('A file has been pre-loaded for import.').'</p>';
   }
   return $form;
 }
@@ -373,7 +373,7 @@ 
   // If there are groups in the import, make sure the fieldgroup module is enabled.
   $imported_groups = array();
   if (isset($content['groups']) && module_exists('fieldgroup')) {
-    $imported_groups = (array) $content['groups'];
+    $imported_groups = (array)$content['groups'];
   }
   elseif (isset($content['groups']) && is_array($content['groups'])) {
     $not_enabled[] = 'fieldgroup';
@@ -419,7 +419,7 @@ 
   // Create the content type, if requested.
   if ($form_values['type_name'] == '<create>') {
 
-    $type = (object) $imported_type;
+    $type = (object)$imported_type;
     $values = $imported_type;
     // Prevent a warning in node/content_types.inc
     $type->has_title = TRUE;
@@ -458,7 +458,7 @@ 
 
     // Make sure the field doesn't already exist in the type.
     // If so, do nothing, fields can't be duplicated within a content type.
-    $field_name   = $field['field_name'];
+    $field_name = $field['field_name'];
 
     // Might need to overwrite the content type name if a new type was created.
     $field['type_name'] = $type_name;
@@ -492,7 +492,7 @@ 
 
   // Import weights of non-CCK fields.
   if (isset($content['extra'])) {
-    variable_set('content_extra_weights_'. $type_name, $content['extra']);
+    variable_set('content_extra_weights_'.$type_name, $content['extra']);
   }
 }
 
@@ -538,7 +538,7 @@ 
   $types = array();
   $content_info = _content_type_info();
   foreach ($content_info['content types'] as $type_name => $val) {
-    $types[$type_name] = check_plain($val['name']) .' ('. $type_name .')';
+    $types[$type_name] = check_plain($val['name']).' ('.$type_name.')';
   }
   return $types;
 }
@@ -581,7 +581,7 @@ 
       // The display settings are being fetched directly from the DB. During import,
       // we'll re-insert the data directly as well.
       //
-      $query = 'SELECT display_settings FROM {'. content_instance_tablename() .'} WHERE field_name = \'%s\'';
+      $query = 'SELECT display_settings FROM {'.content_instance_tablename().'} WHERE field_name = \'%s\'';
       $row_info = db_fetch_array(db_query($query, $field_name));
 
       // If an error occurs, notify the user.
@@ -614,7 +614,7 @@ 
   $string = "";
   if (array_key_exists('submissions', $GLOBALS['content_copy'])) {
     foreach ($GLOBALS['content_copy']['submissions'] as $form_type => $form) {
-      $string .= "\$content['$form_type']  = ". var_export((array) $form, TRUE) .";\n";
+      $string .= "\$content['$form_type']  = ".var_export((array)$form, TRUE).";\n";
     }
     return $string;
   }

Braces +7 added lines, -11 removed lines

@@ -182,7 +182,8 @@ 
       break;
   }
 
-  if ($step < 3) {  // Omit submit button on the textarea block to display the export data.
+  if ($step < 3) {
+// Omit submit button on the textarea block to display the export data.
     $form['submit'] = array(
       '#type' => 'submit',
       '#value' => t('Export'),
@@ -374,8 +375,7 @@ 
   $imported_groups = array();
   if (isset($content['groups']) && module_exists('fieldgroup')) {
     $imported_groups = (array) $content['groups'];
-  }
-  elseif (isset($content['groups']) && is_array($content['groups'])) {
+  } elseif (isset($content['groups']) && is_array($content['groups'])) {
     $not_enabled[] = 'fieldgroup';
   }
 
@@ -384,8 +384,7 @@ 
     $field = content_field_instance_collapse($import);
     if (empty($field['module']) || empty($field['widget_module'])) {
       $not_enabled[] = $field['field_name'];
-    }
-    else {
+    } else {
       if (!module_exists($field['module'])) {
         $not_enabled[] = $field['module'];
       }
@@ -466,8 +465,7 @@ 
     if (!empty($field['field_name']) && isset($content_info['content types'][$type_name]['fields'][$field_name])) {
       drupal_set_message(t('The imported field %field_label (%field_name) was not added to %type because that field already exists in %type.', array(
         '%field_label' => $field['label'], '%field_name' => $field_name, '%type' => $type_label)));
-    }
-    else {
+    } else {
       $field = content_field_instance_create($field, FALSE);
       $rebuild = TRUE;
       drupal_set_message(t('The field %field_label (%field_name) was added to the content type %type.', array(
@@ -573,8 +571,7 @@ 
       if (isset($edit['field_widget_type'])) {
         $tmp = explode('-', $edit['field_widget_type']);
         $field_name = $tmp[0];
-      }
-      else {
+      } else {
         $field_name = isset($edit['field_name']) ? $edit['field_name'] : '';
       }
 
@@ -590,8 +587,7 @@ 
              '%field_name' => $field_name,
              '%db_err' => $db_err
         )));
-      }
-      else {
+      } else {
         // The db fetch occurred successfully, unserialize the data blob and
         // insert it into a new "display_settings" field of the data.
         if ($display_settings = unserialize($row_info['display_settings'])) {

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

@@ -60,7 +60,7 @@ 
   return array(
     'content_copy_export_form' => array(
       'template' => 'content_copy_export_form',
-      'arguments' => array('form' => NULL),
+      'arguments' => array('form' => null),
     ),
   );
 }
@@ -198,7 +198,7 @@ 
 }
 
 function content_copy_export_form_submit($form, &$form_state) {
-  $form_state['rebuild'] = TRUE;
+  $form_state['rebuild'] = true;
   $form_state['storage']['step'] = $form_state['values']['step'];
 }
 
@@ -264,7 +264,7 @@ 
 
   // Add weights of non-CCK fields.
   if ($extra = variable_get('content_extra_weights_'. $form_values['type_name'], array())) {
-    $output .= "\$content['extra']  = ". var_export((array) $extra, TRUE) .";\n";
+    $output .= "\$content['extra']  = ". var_export((array) $extra, true) .";\n";
   }
 
   return $output;
@@ -309,7 +309,7 @@ 
     '#type' => 'textarea',
     '#rows' => 40,
     '#title' => t('Import data'),
-    '#required' => TRUE,
+    '#required' => true,
     '#description' => t('Paste the text created by a content export into this field.'),
   );
   $form['submit'] = array(
@@ -340,7 +340,7 @@ 
   $type_name = $form_values['type_name'];
   $type_label = node_get_types('name', $type_name);
 
-  $content = NULL;
+  $content = null;
   // Convert the import formatted text back into a $content array.
   // Return if errors generated or not an array.
   // Use '@' to suppress errors about undefined constants in the macro.
@@ -422,7 +422,7 @@ 
     $type = (object) $imported_type;
     $values = $imported_type;
     // Prevent a warning in node/content_types.inc
-    $type->has_title = TRUE;
+    $type->has_title = true;
     $type_form_state = array('values' => $values);
 
     // There's no API for creating node types, we still have to use drupal_execute().
@@ -449,11 +449,11 @@ 
       fieldgroup_save_group($type_name, $group);
     }
     // Reset the static variable in fieldgroup_groups() with new data.
-    fieldgroup_groups('', FALSE, TRUE);
+    fieldgroup_groups('', false, true);
   }
 
   // Iterate through the field forms in the import and execute each.
-  $rebuild = FALSE;
+  $rebuild = false;
   foreach ($imported_fields as $field) {
 
     // Make sure the field doesn't already exist in the type.
@@ -468,8 +468,8 @@ 
         '%field_label' => $field['label'], '%field_name' => $field_name, '%type' => $type_label)));
     }
     else {
-      $field = content_field_instance_create($field, FALSE);
-      $rebuild = TRUE;
+      $field = content_field_instance_create($field, false);
+      $rebuild = true;
       drupal_set_message(t('The field %field_label (%field_name) was added to the content type %type.', array(
         '%field_label' => $field['widget']['label'], '%field_name' => $field_name, '%type' => $type_label)));
     }
@@ -486,7 +486,7 @@ 
 
   // Clear caches and rebuild menu only if any field has been created.
   if ($rebuild) {
-    content_clear_type_cache(TRUE);
+    content_clear_type_cache(true);
     menu_rebuild();
   }
 
@@ -614,7 +614,7 @@ 
   $string = "";
   if (array_key_exists('submissions', $GLOBALS['content_copy'])) {
     foreach ($GLOBALS['content_copy']['submissions'] as $form_type => $form) {
-      $string .= "\$content['$form_type']  = ". var_export((array) $form, TRUE) .";\n";
+      $string .= "\$content['$form_type']  = ". var_export((array) $form, true) .";\n";
     }
     return $string;
   }

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

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

Indentation +16 added lines, -16 removed lines

@@ -10,39 +10,39 @@ 
  * Implementation of hook_rules_action_info()
  */
 function userreference_rules_action_info() {
-  $info = array();
-  $info['userreference_rules_action_load'] = array(
+    $info = array();
+    $info['userreference_rules_action_load'] = array(
     'label' => t('Load a referenced user'),
     'arguments' => array(
-      'node' => array(
+        'node' => array(
         'type' => 'node',
         'label' => t('Content containing the user reference field'),
-      ),
+        ),
     ),
     'new variables' => array(
-      'referenced_user' => array(
+        'referenced_user' => array(
         'type' => 'user',
         'label' => t('Referenced user'),
-      ),
+        ),
     ),
     'module' => 'CCK',
     'help' => t('Note that if the field has multiple values, only the first user will be loaded.'),
-  );
-  return $info;
+    );
+    return $info;
 }
 
 function userreference_rules_action_load($node, $settings) {
-  $uid = $node->{$settings['field']}[0]['uid'];
-  if (isset($uid)) {
+    $uid = $node->{$settings['field']}[0]['uid'];
+    if (isset($uid)) {
     $user = user_load(array('uid' => $uid));
     return array('referenced_user' => $user);
-  }
+    }
 }
 
 function userreference_rules_action_load_form($settings, &$form) {
-  $settings += array('field' => '');
-  $options = content_rules_get_field_names_by_type('userreference');
-  $form['settings']['field'] = array(
+    $settings += array('field' => '');
+    $options = content_rules_get_field_names_by_type('userreference');
+    $form['settings']['field'] = array(
     '#type' => 'select',
     '#title' => t('Field'),
     '#default_value' => $settings['field'],
@@ -50,7 +50,7 @@ 
     '#required' => TRUE,
     '#disabled' => empty($options),
     '#description' => empty($options) ? t('There are no userreference fields defined.') : '',
-  );
+    );
 }
 
 /**
@@ -58,5 +58,5 @@ 
  * "workflow_ng_action_load_referenced_user" to the equivalent rules action.
  */
 function workflow_ng_action_load_referenced_user_upgrade(&$element) {
-  $element['#name'] = 'userreference_rules_action_load';
+    $element['#name'] = 'userreference_rules_action_load';
 }

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

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

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

Indentation +320 added lines, -320 removed lines

@@ -10,258 +10,258 @@ 
  * Implementation of hook_menu().
  */
 function userreference_menu() {
-  $items = array();
-  $items['userreference/autocomplete'] = array(
+    $items = array();
+    $items['userreference/autocomplete'] = array(
     'title' => 'Userreference autocomplete',
     'page callback' => 'userreference_autocomplete',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function userreference_theme() {
-  return array(
+    return array(
     'userreference_select' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'userreference_buttons' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'userreference_autocomplete' => array(
-      'arguments' => array('element' => NULL),
+        'arguments' => array('element' => NULL),
     ),
     'userreference_formatter_default' => array(
-      'arguments' => array('element'),
+        'arguments' => array('element'),
     ),
     'userreference_formatter_plain' => array(
-      'arguments' => array('element'),
+        'arguments' => array('element'),
     ),
-  );
+    );
 }
 
 /**
  * Implementaion of hook_ctools_plugin_directory().
  */
 function userreference_ctools_plugin_directory($module, $plugin) {
-  if ($module == 'ctools' && $plugin == 'relationships') {
+    if ($module == 'ctools' && $plugin == 'relationships') {
     return 'panels/' . $plugin;
-  }
+    }
 }
 
 /**
  * Implementation of hook_field_info().
  */
 function userreference_field_info() {
-  return array(
+    return array(
     'userreference' => array(
-      'label' => t('User reference'),
-      'description' => t('Store the ID of a related user as an integer value.'),
+        'label' => t('User reference'),
+        'description' => t('Store the ID of a related user as an integer value.'),
 //      'content_icon' => 'icon_content_noderef.png',
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_field_settings().
  */
 function userreference_field_settings($op, $field) {
-  switch ($op) {
+    switch ($op) {
     case 'form':
       $form = array();
-      $form['referenceable_roles'] = array(
+        $form['referenceable_roles'] = array(
         '#type' => 'checkboxes',
         '#title' => t('User roles that can be referenced'),
         '#default_value' => isset($field['referenceable_roles']) && is_array($field['referenceable_roles']) ? array_filter($field['referenceable_roles']) : array(),
         '#options' => user_roles(1),
-      );
-      $form['referenceable_status'] = array(
+        );
+        $form['referenceable_status'] = array(
         '#type' => 'radios',
         '#title' => t('User status that can be referenced'),
         '#default_value' => isset($field['referenceable_status']) ? $field['referenceable_status'] : '',
         '#options' => array('' => t('All users'), 1 => t('Active users'), 0 => t('Blocked users')),
-      );
-      if (module_exists('views')) {
+        );
+        if (module_exists('views')) {
         $views = array('--' => '--');
         $all_views = views_get_all_views();
         foreach ($all_views as $view) {
-          // Only 'users' views that have fields will work for our purpose.
-          if ($view->base_table == 'users' && !empty($view->display['default']->display_options['fields'])) {
+            // Only 'users' views that have fields will work for our purpose.
+            if ($view->base_table == 'users' && !empty($view->display['default']->display_options['fields'])) {
             if ($view->type == 'Default') {
-              $views[t('Default Views')][$view->name] = $view->name;
+                $views[t('Default Views')][$view->name] = $view->name;
             }
             else {
-              $views[t('Existing Views')][$view->name] = $view->name;
+                $views[t('Existing Views')][$view->name] = $view->name;
+            }
             }
-          }
         }
 
         $form['advanced'] = array(
-           '#type' => 'fieldset',
-           '#title' => t('Advanced - Users that can be referenced (View)'),
-           '#collapsible' => TRUE,
-           '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
-         );
+            '#type' => 'fieldset',
+            '#title' => t('Advanced - Users that can be referenced (View)'),
+            '#collapsible' => TRUE,
+            '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
+            );
         if (count($views) > 1) {
-          $form['advanced']['advanced_view'] = array(
+            $form['advanced']['advanced_view'] = array(
             '#type' => 'select',
             '#title' => t('View used to select the users'),
             '#options' => $views,
             '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
             '#description' =>  t('<p>Choose the "Views module" view that selects the users that can be referenced.<br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
-          );
-          $form['advanced']['advanced_view_args'] = array(
+                t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
+            );
+            $form['advanced']['advanced_view_args'] = array(
             '#type' => 'textfield',
             '#title' => t('View arguments'),
             '#default_value' => isset($field['advanced_view_args']) ? $field['advanced_view_args'] : '',
             '#required' => FALSE,
             '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
-          );
+            );
         }
         else {
-          $form['advanced']['no_view_help'] = array(
+            $form['advanced']['no_view_help'] = array(
             '#value' => t('<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
-          );
+                t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
+            );
+        }
         }
-      }
-      return $form;
+        return $form;
 
     case 'save':
       $settings = array('referenceable_roles', 'referenceable_status');
-      if (module_exists('views')) {
+        if (module_exists('views')) {
         $settings[] = 'advanced_view';
         $settings[] = 'advanced_view_args';
-      }
-      return $settings;
+        }
+        return $settings;
 
     case 'database columns':
       $columns = array(
         'uid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'index' => TRUE),
-      );
-      return $columns;
+        );
+        return $columns;
 
     case 'views data':
       $data = content_views_field_views_data($field);
-      $db_info = content_database_info($field);
-      $table_alias = content_views_tablename($field);
-
-      // Filter : swap the handler to the 'in' operator.
-      $data[$table_alias][$field['field_name'] .'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
-      // Argument: get the user name for summaries.
-      // We need to join a new instance of the users table.
-      $data["users_$table_alias"]['table']['join']['node'] = array(
+        $db_info = content_database_info($field);
+        $table_alias = content_views_tablename($field);
+
+        // Filter : swap the handler to the 'in' operator.
+        $data[$table_alias][$field['field_name'] .'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
+        // Argument: get the user name for summaries.
+        // We need to join a new instance of the users table.
+        $data["users_$table_alias"]['table']['join']['node'] = array(
         'table' => 'users',
         'field' => 'uid',
         'left_table' => $table_alias,
         'left_field' => $field['field_name'] .'_uid',
-      );
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['handler'] = 'content_handler_argument_reference';
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name table'] = "users_$table_alias";
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name field'] = 'name';
-      // Relationship: Add a relationship for related user.
-      $data[$table_alias][$field['field_name'] .'_uid']['relationship'] = array(
+        );
+        $data[$table_alias][$field['field_name'] .'_uid']['argument']['handler'] = 'content_handler_argument_reference';
+        $data[$table_alias][$field['field_name'] .'_uid']['argument']['name table'] = "users_$table_alias";
+        $data[$table_alias][$field['field_name'] .'_uid']['argument']['name field'] = 'name';
+        // Relationship: Add a relationship for related user.
+        $data[$table_alias][$field['field_name'] .'_uid']['relationship'] = array(
         'base' => 'users',
         'field' => $db_info['columns']['uid']['column'],
         'handler' => 'content_handler_relationship',
         'label' => t($field['widget']['label']),
         'content_field_name' => $field['field_name'],
-      );
-      return $data;
+        );
+        return $data;
 
-  }
+    }
 }
 
 /**
  * Implementation of hook_field().
  */
 function userreference_field($op, &$node, $field, &$items, $teaser, $page) {
-  switch ($op) {
+    switch ($op) {
     case 'validate':
       // Extract uids to check.
       $ids = array();
-      foreach ($items as $delta => $item) {
+        foreach ($items as $delta => $item) {
         if (is_array($item) && !empty($item['uid'])) {
-          if (is_numeric($item['uid'])) {
+            if (is_numeric($item['uid'])) {
             $ids[] = $item['uid'];
-          }
-          else {
+            }
+            else {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
             if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
             form_set_error($error_element, t('%name: invalid input.', array('%name' => t($field['widget']['label']))));
-          }
+            }
+        }
         }
-      }
-      // Prevent performance hog if there are no ids to check.
-      if ($ids) {
+        // Prevent performance hog if there are no ids to check.
+        if ($ids) {
         $refs = _userreference_potential_references($field, '', NULL, $ids);
         foreach ($items as $delta => $item) {
-          if (is_array($item)) {
+            if (is_array($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['uid']) && !isset($refs[$item['uid']])) {
-              form_set_error($error_element, t('%name: invalid user.', array('%name' => t($field['widget']['label']))));
+                form_set_error($error_element, t('%name: invalid user.', array('%name' => t($field['widget']['label']))));
+            }
             }
-          }
         }
-      }
-      return $items;
-  }
+        }
+        return $items;
+    }
 }
 
 /**
  * Implementation of hook_content_is_empty().
  */
 function userreference_content_is_empty($item, $field) {
-  if (empty($item['uid'])) {
+    if (empty($item['uid'])) {
     return TRUE;
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /**
  * Implementation of hook_field_formatter_info().
  */
 function userreference_field_formatter_info() {
-  return array(
+    return array(
     'default' => array(
-      'label' => t('Default'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
+        'label' => t('Default'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
     ),
     'plain' => array(
-      'label' => t('Plain text'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
+        'label' => t('Plain text'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
     ),
-  );
+    );
 }
 
 /**
  * Theme function for 'default' userreference field formatter.
  */
 function theme_userreference_formatter_default($element) {
-  $output = '';
+    $output = '';
 
-  if (isset($element['#item']['uid']) && $account = user_load(array('uid' => $element['#item']['uid']))) {
+    if (isset($element['#item']['uid']) && $account = user_load(array('uid' => $element['#item']['uid']))) {
     $output = theme('username', $account);
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  * Theme function for 'plain' userreference field formatter.
  */
 function theme_userreference_formatter_plain($element) {
-  $output = '';
-  if (isset($element['#item']['uid']) && $account = user_load(array('uid' => $element['#item']['uid']))) {
+    $output = '';
+    if (isset($element['#item']['uid']) && $account = user_load(array('uid' => $element['#item']['uid']))) {
     $output = $account->name;
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
@@ -279,32 +279,32 @@ 
  * differently.
  */
 function userreference_widget_info() {
-  return array(
+    return array(
     'userreference_select' => array(
-      'label' => t('Select list'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_MODULE,
-      'callbacks' => array(
+        'label' => t('Select list'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_MODULE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
     'userreference_buttons' => array(
-      'label' => t('Check boxes/radio buttons'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_MODULE,
-      'callbacks' => array(
+        'label' => t('Check boxes/radio buttons'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_MODULE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
     'userreference_autocomplete' => array(
-      'label' => t('Autocomplete text field'),
-      'field types' => array('userreference'),
-      'multiple values' => CONTENT_HANDLE_CORE,
-      'callbacks' => array(
+        'label' => t('Autocomplete text field'),
+        'field types' => array('userreference'),
+        'multiple values' => CONTENT_HANDLE_CORE,
+        'callbacks' => array(
         'default value' => CONTENT_CALLBACK_DEFAULT,
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
@@ -320,23 +320,23 @@ 
  * (see nodereference and userreference).
  */
 function userreference_elements() {
-  return array(
+    return array(
     'userreference_select' => array(
-      '#input' => TRUE,
-      '#columns' => array('uid'), '#delta' => 0,
-      '#process' => array('userreference_select_process'),
+        '#input' => TRUE,
+        '#columns' => array('uid'), '#delta' => 0,
+        '#process' => array('userreference_select_process'),
     ),
     'userreference_buttons' => array(
-      '#input' => TRUE,
-      '#columns' => array('uid'), '#delta' => 0,
-      '#process' => array('userreference_buttons_process'),
+        '#input' => TRUE,
+        '#columns' => array('uid'), '#delta' => 0,
+        '#process' => array('userreference_buttons_process'),
     ),
     'userreference_autocomplete' => array(
-      '#input' => TRUE,
-      '#columns' => array('name'), '#delta' => 0,
-      '#process' => array('userreference_autocomplete_process'),
-      '#autocomplete_path' => FALSE,
-      ),
+        '#input' => TRUE,
+        '#columns' => array('name'), '#delta' => 0,
+        '#process' => array('userreference_autocomplete_process'),
+        '#autocomplete_path' => FALSE,
+        ),
     );
 }
 
@@ -344,45 +344,45 @@ 
  * Implementation of hook_widget_settings().
  */
 function userreference_widget_settings($op, $widget) {
-  switch ($op) {
+    switch ($op) {
     case 'form':
       $form = array();
-      $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
-      $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
-      if ($widget['type'] == 'userreference_autocomplete') {
+        $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
+        $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
+        if ($widget['type'] == 'userreference_autocomplete') {
         $form['autocomplete_match'] = array(
-          '#type' => 'select',
-          '#title' => t('Autocomplete matching'),
-          '#default_value' => $match,
-          '#options' => array(
+            '#type' => 'select',
+            '#title' => t('Autocomplete matching'),
+            '#default_value' => $match,
+            '#options' => array(
             'starts_with' => t('Starts with'),
             'contains' => t('Contains'),
-          ),
-          '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of users.'),
+            ),
+            '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of users.'),
         );
         $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['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
         $form['size'] = array('#type' => 'hidden', '#value' => $size);
-      }
-      $form['reverse_link'] = array(
+        }
+        $form['reverse_link'] = array(
         '#type' => 'checkbox',
         '#title' => t('Reverse link'),
         '#default_value' => isset($widget['reverse_link']) ? $widget['reverse_link'] : 0,
         '#description' => t('If selected, a reverse link back to the referencing node will displayed on the referenced user record.'),
-      );
-      return $form;
+        );
+        return $form;
 
     case 'save':
       return array('autocomplete_match', 'size', 'reverse_link');
-  }
+    }
 }
 
 /**
@@ -417,30 +417,30 @@ 
  *   the form item for a single element for this field
  */
 function userreference_widget(&$form, &$form_state, $field, $items, $delta = 0) {
-  switch ($field['widget']['type']) {
+    switch ($field['widget']['type']) {
     case 'userreference_select':
       $element = array(
         '#type' => 'userreference_select',
         '#default_value' => $items,
-      );
-      break;
+        );
+        break;
 
     case 'userreference_buttons':
       $element = array(
         '#type' => 'userreference_buttons',
         '#default_value' => $items,
-      );
-      break;
+        );
+        break;
 
     case 'userreference_autocomplete':
       $element = array(
         '#type' => 'userreference_autocomplete',
         '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
         '#value_callback' => 'userreference_autocomplete_value',
-      );
-      break;
-  }
-  return $element;
+        );
+        break;
+    }
+    return $element;
 }
 
 /**
@@ -449,12 +449,12 @@ 
  * Substitute in the user name for the uid.
  */
 function userreference_autocomplete_value($element, $edit = FALSE) {
-  $field_key  = $element['#columns'][0];
-  if (!empty($element['#default_value'][$field_key])) {
+    $field_key  = $element['#columns'][0];
+    if (!empty($element['#default_value'][$field_key])) {
     $value = db_result(db_query("SELECT name FROM {users} WHERE uid = '%d'", $element['#default_value'][$field_key]));
     return array($field_key => $value);
-  }
-  return array($field_key => NULL);
+    }
+    return array($field_key => NULL);
 }
 
 /**
@@ -466,11 +466,11 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function userreference_select_process($element, $edit, $form_state, $form) {
-  // The userreference_select widget doesn't need to create its own
-  // element, it can wrap around the optionwidgets_select element.
-  // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
-  $element[$field_key] = array(
+    // The userreference_select widget doesn't need to create its own
+    // element, it can wrap around the optionwidgets_select element.
+    // Add a validation step where the value can be unwrapped.
+    $field_key  = $element['#columns'][0];
+    $element[$field_key] = array(
     '#type' => 'optionwidgets_select',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
     // The following values were set by the content module and need
@@ -482,12 +482,12 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
-  if (empty($element[$field_key]['#element_validate'])) {
+    );
+    if (empty($element[$field_key]['#element_validate'])) {
     $element[$field_key]['#element_validate'] = array();
-  }
-  array_unshift($element[$field_key]['#element_validate'], 'userreference_optionwidgets_validate');
-  return $element;
+    }
+    array_unshift($element[$field_key]['#element_validate'], 'userreference_optionwidgets_validate');
+    return $element;
 }
 
 /**
@@ -499,11 +499,11 @@ 
  * The $fields array is in $form['#field_info'][$element['#field_name']].
  */
 function userreference_buttons_process($element, $edit, $form_state, $form) {
-  // The userreference_select widget doesn't need to create its own
-  // element, it can wrap around the optionwidgets_select element.
-  // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
-  $element[$field_key] = array(
+    // The userreference_select widget doesn't need to create its own
+    // element, it can wrap around the optionwidgets_select element.
+    // Add a validation step where the value can be unwrapped.
+    $field_key  = $element['#columns'][0];
+    $element[$field_key] = array(
     '#type' => 'optionwidgets_buttons',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
     // The following values were set by the content module and need
@@ -515,12 +515,12 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
-  if (empty($element[$field_key]['#element_validate'])) {
+    );
+    if (empty($element[$field_key]['#element_validate'])) {
     $element[$field_key]['#element_validate'] = array();
-  }
-  array_unshift($element[$field_key]['#element_validate'], 'userreference_optionwidgets_validate');
-  return $element;
+    }
+    array_unshift($element[$field_key]['#element_validate'], 'userreference_optionwidgets_validate');
+    return $element;
 }
 
 /**
@@ -531,13 +531,13 @@ 
  *
  */
 function userreference_autocomplete_process($element, $edit, $form_state, $form) {
-  // The userreference autocomplete widget doesn't need to create its own
-  // element, it can wrap around the text_textfield element and add an autocomplete
-  // path and some extra processing to it.
-  // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
+    // The userreference autocomplete widget doesn't need to create its own
+    // element, it can wrap around the text_textfield element and add an autocomplete
+    // path and some extra processing to it.
+    // Add a validation step where the value can be unwrapped.
+    $field_key  = $element['#columns'][0];
 
-  $element[$field_key] = array(
+    $element[$field_key] = array(
     '#type' => 'text_textfield',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
     '#autocomplete_path' => 'userreference/autocomplete/'. $element['#field_name'],
@@ -550,20 +550,20 @@ 
     '#type_name' => $element['#type_name'],
     '#delta' => $element['#delta'],
     '#columns' => $element['#columns'],
-  );
-  if (empty($element[$field_key]['#element_validate'])) {
+    );
+    if (empty($element[$field_key]['#element_validate'])) {
     $element[$field_key]['#element_validate'] = array();
-  }
-  array_unshift($element[$field_key]['#element_validate'], 'userreference_autocomplete_validate');
+    }
+    array_unshift($element[$field_key]['#element_validate'], 'userreference_autocomplete_validate');
 
-  // 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',
     // Wrapping the element around a text_textfield element creates a
     // nested element, so the final id will look like 'field-name-0-uid-uid'.
     '#value' => implode('][', array_merge($element['#parents'], array($field_key, $field_key))),
-  );
-  return $element;
+    );
+    return $element;
 }
 
 /**
@@ -578,20 +578,20 @@ 
  * like optionwidgets are using #element_validate to alter the value.
  */
 function userreference_optionwidgets_validate($element, &$form_state) {
-  $field_key  = $element['#columns'][0];
+    $field_key  = $element['#columns'][0];
 
-  $value = $form_state['values'];
-  $new_parents = array();
-  foreach ($element['#parents'] as $parent) {
+    $value = $form_state['values'];
+    $new_parents = array();
+    foreach ($element['#parents'] as $parent) {
     $value = $value[$parent];
     // Use === to be sure we get right results if parent is a zero (delta) value.
     if ($parent === $field_key) {
-      $element['#parents'] = $new_parents;
-      form_set_value($element, $value, $form_state);
-      break;
+        $element['#parents'] = $new_parents;
+        form_set_value($element, $value, $form_state);
+        break;
     }
     $new_parents[] = $parent;
-  }
+    }
 }
 
 /**
@@ -602,36 +602,36 @@ 
  * back to its original location, 'field-name-0-uid'.
  */
 function userreference_autocomplete_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];
-  $uid = NULL;
-  if (!empty($value)) {
+    $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];
+    $uid = NULL;
+    if (!empty($value)) {
     $reference = _userreference_potential_references($field, $value, 'equals', NULL, 1);
     if (empty($reference)) {
-      form_error($element[$field_key], t('%name: found no valid user with that name.', array('%name' => t($field['widget']['label']))));
+        form_error($element[$field_key], t('%name: found no valid user with that name.', array('%name' => t($field['widget']['label']))));
     }
     else {
-      $uid = key($reference);
+        $uid = key($reference);
+    }
     }
-  }
-  form_set_value($element, $uid, $form_state);
+    form_set_value($element, $uid, $form_state);
 }
 
 /**
  * Implementation of hook_allowed_values().
  */
 function userreference_allowed_values($field) {
-  $references = _userreference_potential_references($field);
+    $references = _userreference_potential_references($field);
 
-  $options = array();
-  foreach ($references as $key => $value) {
+    $options = array();
+    foreach ($references as $key => $value) {
     $options[$key] = $value['rendered'];
-  }
+    }
 
-  return $options;
+    return $options;
 }
 
 /**
@@ -667,26 +667,26 @@ 
  *   )
  */
 function _userreference_potential_references($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
-  static $results = array();
+    static $results = array();
 
-  // Create unique id for static cache.
-  $cid = $field['field_name'] .':'. $match .':'. ($string !== '' ? $string : implode('-', $ids)) .':'. $limit;
-  if (!isset($results[$cid])) {
+    // Create unique id for static cache.
+    $cid = $field['field_name'] .':'. $match .':'. ($string !== '' ? $string : implode('-', $ids)) .':'. $limit;
+    if (!isset($results[$cid])) {
     $references = FALSE;
     if (module_exists('views') && !empty($field['advanced_view']) && $field['advanced_view'] != '--') {
-      $references = _userreference_potential_references_views($field, $string, $match, $ids, $limit);
+        $references = _userreference_potential_references_views($field, $string, $match, $ids, $limit);
     }
     // If the view doesn't exist, we got FALSE, and fallback to the regular 'standard mode'.
 
     if ($references === FALSE) {
-      $references = _userreference_potential_references_standard($field, $string, $match, $ids, $limit);
+        $references = _userreference_potential_references_standard($field, $string, $match, $ids, $limit);
     }
 
     // Store the results.
     $results[$cid] = !empty($references) ? $references : array();
-  }
+    }
 
-  return $results[$cid];
+    return $results[$cid];
 }
 
 /**
@@ -694,9 +694,9 @@ 
  * case of Views-defined referenceable users.
  */
 function _userreference_potential_references_views($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
-  $view_name = $field['advanced_view'];
+    $view_name = $field['advanced_view'];
 
-  if ($view = views_get_view($view_name)) {
+    if ($view = views_get_view($view_name)) {
     // We add a display, and let it derive from the 'default' display.
     // TODO: We should let the user pick a display in the fields settings - sort of requires AHAH...
     $display = $view->add_display('content_references');
@@ -713,12 +713,12 @@ 
     // Additional options to let content_plugin_display_references::query()
     // narrow the results.
     $options = array(
-      'table' => 'users',
-      'field_string' => 'name',
-      'string' => $string,
-      'match' => $match,
-      'field_id' => 'uid',
-      'ids' => $ids,
+        'table' => 'users',
+        'field_string' => 'name',
+        'string' => $string,
+        'match' => $match,
+        'field_id' => 'uid',
+        'ids' => $ids,
     );
     $view->display_handler->set_option('content_options', $options);
 
@@ -731,26 +731,26 @@ 
 
     // Get arguments for the view.
     if (!empty($field['advanced_view_args'])) {
-      // TODO: Support Tokens using token.module ?
-      $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
+        // TODO: Support Tokens using token.module ?
+        $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
     }
     else {
-      $view_args = array();
+        $view_args = array();
     }
 
     // We do need name field, so add it if not present (unlikely, but...)
     $fields = $view->get_items('field', $display);
     if (!isset($fields['name'])) {
-      $view->add_item($display, 'field', 'users', 'name');
+        $view->add_item($display, 'field', 'users', 'name');
     }
 
     // If not set, make all fields inline and define a separator.
     $options = $view->display_handler->get_option('row_options');
     if (empty($options['inline'])) {
-      $options['inline'] = drupal_map_assoc(array_keys($view->get_items('field', $display)));
+        $options['inline'] = drupal_map_assoc(array_keys($view->get_items('field', $display)));
     }
     if (empty($options['separator'])) {
-      $options['separator'] = '-';
+        $options['separator'] = '-';
     }
     $view->display_handler->set_option('row_options', $options);
 
@@ -759,12 +759,12 @@ 
 
     // Get the results.
     $result = $view->execute_display($display, $view_args);
-  }
-  else {
+    }
+    else {
     $result = FALSE;
-  }
+    }
 
-  return $result;
+    return $result;
 }
 
 /**
@@ -772,112 +772,112 @@ 
  * referenceable users defined by user role and status
  */
 function _userreference_potential_references_standard($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
-  $where = array();
-  $args = array();
-  $join = array();
+    $where = array();
+    $args = array();
+    $join = array();
 
-  if ($string !== '') {
+    if ($string !== '') {
     $like = $GLOBALS["db_type"] == 'pgsql' ? "ILIKE" : "LIKE";
     $match_clauses = array(
-      'contains' => "$like '%%%s%%'",
-      'equals' => "= '%s'",
-      'starts_with' => "$like '%s%%'",
+        'contains' => "$like '%%%s%%'",
+        'equals' => "= '%s'",
+        'starts_with' => "$like '%s%%'",
     );
     $where[] = 'u.name '. (isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
     $args[] = $string;
-  }
-  elseif ($ids) {
+    }
+    elseif ($ids) {
     $where[] = 'u.uid IN (' . db_placeholders($ids) . ')';
     $args = array_merge($args, $ids);
-  }
-  else {
+    }
+    else {
     $where[] = "u.uid > 0";
-  }
+    }
 
-  $roles = array();
-  if (isset($field['referenceable_roles']) && is_array($field['referenceable_roles'])) {
+    $roles = array();
+    if (isset($field['referenceable_roles']) && is_array($field['referenceable_roles'])) {
     // keep only selected checkboxes
     $roles = array_filter($field['referenceable_roles']);
     // filter invalid values that seems to get through sometimes ??
     $roles = array_intersect(array_keys(user_roles(1)), $roles);
-  }
-  if (!empty($roles) && !in_array(DRUPAL_AUTHENTICATED_RID, $roles)) {
+    }
+    if (!empty($roles) && !in_array(DRUPAL_AUTHENTICATED_RID, $roles)) {
     $where[] = "r.rid IN (". implode($roles, ',') .")";
     $join[] = 'LEFT JOIN {users_roles} r ON u.uid = r.uid';
-  }
+    }
 
-  if (isset($field['referenceable_status']) && is_numeric($field['referenceable_status'])) {
+    if (isset($field['referenceable_status']) && is_numeric($field['referenceable_status'])) {
     $where[] = 'u.status = %d';
     $args[] = $field['referenceable_status'];
-  }
+    }
 
-  $users = array();
-  $where_clause = $where ? 'WHERE ('. implode(') AND (', $where) .')' : '';
-  $result = db_query('SELECT u.name, u.uid FROM {users} u '. implode(' ', $join) ." $where_clause ORDER BY u.name ASC", $args);
-  while ($user = db_fetch_object($result)) {
+    $users = array();
+    $where_clause = $where ? 'WHERE ('. implode(') AND (', $where) .')' : '';
+    $result = db_query('SELECT u.name, u.uid FROM {users} u '. implode(' ', $join) ." $where_clause ORDER BY u.name ASC", $args);
+    while ($user = db_fetch_object($result)) {
     $users[$user->uid] = array(
-      'title' => $user->name,
-      'rendered' => check_plain($user->name),
+        'title' => $user->name,
+        'rendered' => check_plain($user->name),
     );
-  }
-  return $users;
+    }
+    return $users;
 }
 
 /**
  * Menu callback; Retrieve a pipe delimited string of autocomplete suggestions for existing users
  */
 function userreference_autocomplete($field_name, $string = '') {
-  $fields = content_fields();
-  $field = $fields[$field_name];
-  $match = isset($field['widget']['autocomplete_match']) ? $field['widget']['autocomplete_match'] : 'contains';
-  $matches = array();
+    $fields = content_fields();
+    $field = $fields[$field_name];
+    $match = isset($field['widget']['autocomplete_match']) ? $field['widget']['autocomplete_match'] : 'contains';
+    $matches = array();
 
-  $references = _userreference_potential_references($field, $string, $match, array(), 10);
-  foreach ($references as $id => $row) {
+    $references = _userreference_potential_references($field, $string, $match, array(), 10);
+    foreach ($references as $id => $row) {
     // Add a class wrapper for a few required CSS overrides.
     $matches[$row['title']] = '<div class="reference-autocomplete">'. $row['rendered'] . '</div>';
-  }
-  drupal_json($matches);
+    }
+    drupal_json($matches);
 }
 
 /**
  * Implementation of hook_user().
  */
 function userreference_user($type, &$edit, &$account) {
-  switch ($type) {
+    switch ($type) {
     case 'load':
       // Only add links if we are on the user 'view' page.
       if (arg(0) != 'user' || arg(2)) {
         return;
-      }
-      // find CCK userreference field tables
-      // search through them for matching user ids and load those nodes
-      $additions = array();
-      $types = content_types();
-
-      // Find the table and columns to search through, if the same
-      // table comes up in more than one content type, we only need
-      // to search it once.
-      $search_tables = array();
-      foreach ($types as $type_name => $type) {
+        }
+        // find CCK userreference field tables
+        // search through them for matching user ids and load those nodes
+        $additions = array();
+        $types = content_types();
+
+        // Find the table and columns to search through, if the same
+        // table comes up in more than one content type, we only need
+        // to search it once.
+        $search_tables = array();
+        foreach ($types as $type_name => $type) {
         foreach ($type['fields'] as $field) {
-          // Only add tables when reverse link has been selected.
-          if ($field['type'] == 'userreference' && !empty($field['widget']['reverse_link'])) {
+            // Only add tables when reverse link has been selected.
+            if ($field['type'] == 'userreference' && !empty($field['widget']['reverse_link'])) {
             $db_info = content_database_info($field);
             $search_tables[$db_info['table']][] = $db_info['columns']['uid']['column'];
-          }
+            }
+        }
         }
-      }
-      foreach ($search_tables as $table => $columns) {
+        foreach ($search_tables as $table => $columns) {
         foreach ($columns as $column) {
-          $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {". $table ."} f ON n.vid = f.vid WHERE f.". $column ."=". $account->uid. " AND n.status = 1"));
-          while ($data = db_fetch_object($ids)) {
+            $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {". $table ."} f ON n.vid = f.vid WHERE f.". $column ."=". $account->uid. " AND n.status = 1"));
+            while ($data = db_fetch_object($ids)) {
             $additions[$data->type][$data->nid] = $data->title;
-          }
+            }
         }
-      }
-      $account->userreference = $additions;
-      break;
+        }
+        $account->userreference = $additions;
+        break;
 
     case 'view':
       if (!empty($account->userreference)) {
@@ -885,28 +885,28 @@ 
         $additions = array();
         $values = array();
         foreach ($account->userreference as $node_type => $nodes) {
-          foreach ($nodes as $nid => $title) {
+            foreach ($nodes as $nid => $title) {
             $values[$node_type][] = l($title, 'node/'. $nid);
-          }
-          if (isset($values[$node_type])) {
+            }
+            if (isset($values[$node_type])) {
             $additions[] = array(
-              '#type' => 'user_profile_item',
-              '#title' => check_plain($node_types[$node_type]['name']),
-              '#value' => theme('item_list', $values[$node_type]),
+                '#type' => 'user_profile_item',
+                '#title' => check_plain($node_types[$node_type]['name']),
+                '#value' => theme('item_list', $values[$node_type]),
             );
-          }
+            }
         }
         if ($additions) {
-          $account->content['userreference'] = $additions + array(
+            $account->content['userreference'] = $additions + array(
             '#type' => 'user_profile_category',
             '#attributes' => array('class' => 'user-member'),
             '#title' => t('Related content'),
             '#weight' => 10,
-          );
+            );
         }
-      }
-      break;
-  }
+        }
+        break;
+    }
 }
 
 /**
@@ -921,13 +921,13 @@ 
  * $element['#delta]  is the position of this element in the group
  */
 function theme_userreference_select($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
 
 function theme_userreference_buttons($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
 
 function theme_userreference_autocomplete($element) {
-  return $element['#children'];
+    return $element['#children'];
 }
\ No newline at end of file

Switch Indentation +226 added lines, -226 removed lines

@@ -70,108 +70,108 @@ 
  */
 function userreference_field_settings($op, $field) {
   switch ($op) {
-    case 'form':
-      $form = array();
-      $form['referenceable_roles'] = array(
-        '#type' => 'checkboxes',
-        '#title' => t('User roles that can be referenced'),
-        '#default_value' => isset($field['referenceable_roles']) && is_array($field['referenceable_roles']) ? array_filter($field['referenceable_roles']) : array(),
-        '#options' => user_roles(1),
-      );
-      $form['referenceable_status'] = array(
-        '#type' => 'radios',
-        '#title' => t('User status that can be referenced'),
-        '#default_value' => isset($field['referenceable_status']) ? $field['referenceable_status'] : '',
-        '#options' => array('' => t('All users'), 1 => t('Active users'), 0 => t('Blocked users')),
-      );
-      if (module_exists('views')) {
-        $views = array('--' => '--');
-        $all_views = views_get_all_views();
-        foreach ($all_views as $view) {
-          // Only 'users' views that have fields will work for our purpose.
-          if ($view->base_table == 'users' && !empty($view->display['default']->display_options['fields'])) {
-            if ($view->type == 'Default') {
-              $views[t('Default Views')][$view->name] = $view->name;
-            }
-            else {
-              $views[t('Existing Views')][$view->name] = $view->name;
-            }
+  case 'form':
+    $form = array();
+    $form['referenceable_roles'] = array(
+      '#type' => 'checkboxes',
+      '#title' => t('User roles that can be referenced'),
+      '#default_value' => isset($field['referenceable_roles']) && is_array($field['referenceable_roles']) ? array_filter($field['referenceable_roles']) : array(),
+      '#options' => user_roles(1),
+    );
+    $form['referenceable_status'] = array(
+      '#type' => 'radios',
+      '#title' => t('User status that can be referenced'),
+      '#default_value' => isset($field['referenceable_status']) ? $field['referenceable_status'] : '',
+      '#options' => array('' => t('All users'), 1 => t('Active users'), 0 => t('Blocked users')),
+    );
+    if (module_exists('views')) {
+      $views = array('--' => '--');
+      $all_views = views_get_all_views();
+      foreach ($all_views as $view) {
+        // Only 'users' views that have fields will work for our purpose.
+        if ($view->base_table == 'users' && !empty($view->display['default']->display_options['fields'])) {
+          if ($view->type == 'Default') {
+            $views[t('Default Views')][$view->name] = $view->name;
+          }
+          else {
+            $views[t('Existing Views')][$view->name] = $view->name;
           }
-        }
-
-        $form['advanced'] = array(
-           '#type' => 'fieldset',
-           '#title' => t('Advanced - Users that can be referenced (View)'),
-           '#collapsible' => TRUE,
-           '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
-         );
-        if (count($views) > 1) {
-          $form['advanced']['advanced_view'] = array(
-            '#type' => 'select',
-            '#title' => t('View used to select the users'),
-            '#options' => $views,
-            '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
-            '#description' =>  t('<p>Choose the "Views module" view that selects the users that can be referenced.<br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
-          );
-          $form['advanced']['advanced_view_args'] = array(
-            '#type' => 'textfield',
-            '#title' => t('View arguments'),
-            '#default_value' => isset($field['advanced_view_args']) ? $field['advanced_view_args'] : '',
-            '#required' => FALSE,
-            '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
-          );
-        }
-        else {
-          $form['advanced']['no_view_help'] = array(
-            '#value' => t('<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
-              t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
-          );
         }
       }
-      return $form;
 
-    case 'save':
-      $settings = array('referenceable_roles', 'referenceable_status');
-      if (module_exists('views')) {
-        $settings[] = 'advanced_view';
-        $settings[] = 'advanced_view_args';
+      $form['advanced'] = array(
+         '#type' => 'fieldset',
+         '#title' => t('Advanced - Users that can be referenced (View)'),
+         '#collapsible' => TRUE,
+         '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
+       );
+      if (count($views) > 1) {
+        $form['advanced']['advanced_view'] = array(
+          '#type' => 'select',
+          '#title' => t('View used to select the users'),
+          '#options' => $views,
+          '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
+          '#description' =>  t('<p>Choose the "Views module" view that selects the users that can be referenced.<br />Note:</p>') .
+            t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
+        );
+        $form['advanced']['advanced_view_args'] = array(
+          '#type' => 'textfield',
+          '#title' => t('View arguments'),
+          '#default_value' => isset($field['advanced_view_args']) ? $field['advanced_view_args'] : '',
+          '#required' => FALSE,
+          '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
+        );
+      }
+      else {
+        $form['advanced']['no_view_help'] = array(
+          '#value' => t('<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
+            t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
+        );
       }
-      return $settings;
+    }
+    return $form;
 
-    case 'database columns':
-      $columns = array(
-        'uid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'index' => TRUE),
-      );
-      return $columns;
-
-    case 'views data':
-      $data = content_views_field_views_data($field);
-      $db_info = content_database_info($field);
-      $table_alias = content_views_tablename($field);
-
-      // Filter : swap the handler to the 'in' operator.
-      $data[$table_alias][$field['field_name'] .'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
-      // Argument: get the user name for summaries.
-      // We need to join a new instance of the users table.
-      $data["users_$table_alias"]['table']['join']['node'] = array(
-        'table' => 'users',
-        'field' => 'uid',
-        'left_table' => $table_alias,
-        'left_field' => $field['field_name'] .'_uid',
-      );
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['handler'] = 'content_handler_argument_reference';
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name table'] = "users_$table_alias";
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name field'] = 'name';
-      // Relationship: Add a relationship for related user.
-      $data[$table_alias][$field['field_name'] .'_uid']['relationship'] = array(
-        'base' => 'users',
-        'field' => $db_info['columns']['uid']['column'],
-        'handler' => 'content_handler_relationship',
-        'label' => t($field['widget']['label']),
-        'content_field_name' => $field['field_name'],
-      );
-      return $data;
+  case 'save':
+    $settings = array('referenceable_roles', 'referenceable_status');
+    if (module_exists('views')) {
+      $settings[] = 'advanced_view';
+      $settings[] = 'advanced_view_args';
+    }
+    return $settings;
+
+  case 'database columns':
+    $columns = array(
+      'uid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'index' => TRUE),
+    );
+    return $columns;
+
+  case 'views data':
+    $data = content_views_field_views_data($field);
+    $db_info = content_database_info($field);
+    $table_alias = content_views_tablename($field);
+
+    // Filter : swap the handler to the 'in' operator.
+    $data[$table_alias][$field['field_name'] .'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
+    // Argument: get the user name for summaries.
+    // We need to join a new instance of the users table.
+    $data["users_$table_alias"]['table']['join']['node'] = array(
+      'table' => 'users',
+      'field' => 'uid',
+      'left_table' => $table_alias,
+      'left_field' => $field['field_name'] .'_uid',
+    );
+    $data[$table_alias][$field['field_name'] .'_uid']['argument']['handler'] = 'content_handler_argument_reference';
+    $data[$table_alias][$field['field_name'] .'_uid']['argument']['name table'] = "users_$table_alias";
+    $data[$table_alias][$field['field_name'] .'_uid']['argument']['name field'] = 'name';
+    // Relationship: Add a relationship for related user.
+    $data[$table_alias][$field['field_name'] .'_uid']['relationship'] = array(
+      'base' => 'users',
+      'field' => $db_info['columns']['uid']['column'],
+      'handler' => 'content_handler_relationship',
+      'label' => t($field['widget']['label']),
+      'content_field_name' => $field['field_name'],
+    );
+    return $data;
 
   }
 }
@@ -181,35 +181,35 @@ 
  */
 function userreference_field($op, &$node, $field, &$items, $teaser, $page) {
   switch ($op) {
-    case 'validate':
-      // Extract uids to check.
-      $ids = array();
-      foreach ($items as $delta => $item) {
-        if (is_array($item) && !empty($item['uid'])) {
-          if (is_numeric($item['uid'])) {
-            $ids[] = $item['uid'];
-          }
-          else {
-            $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
-            if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
-            form_set_error($error_element, t('%name: invalid input.', array('%name' => t($field['widget']['label']))));
-          }
+  case 'validate':
+    // Extract uids to check.
+    $ids = array();
+    foreach ($items as $delta => $item) {
+      if (is_array($item) && !empty($item['uid'])) {
+        if (is_numeric($item['uid'])) {
+          $ids[] = $item['uid'];
+        }
+        else {
+          $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
+          if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
+          form_set_error($error_element, t('%name: invalid input.', array('%name' => t($field['widget']['label']))));
         }
       }
-      // Prevent performance hog if there are no ids to check.
-      if ($ids) {
-        $refs = _userreference_potential_references($field, '', NULL, $ids);
-        foreach ($items as $delta => $item) {
-          if (is_array($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['uid']) && !isset($refs[$item['uid']])) {
-              form_set_error($error_element, t('%name: invalid user.', array('%name' => t($field['widget']['label']))));
-            }
+    }
+    // Prevent performance hog if there are no ids to check.
+    if ($ids) {
+      $refs = _userreference_potential_references($field, '', NULL, $ids);
+      foreach ($items as $delta => $item) {
+        if (is_array($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['uid']) && !isset($refs[$item['uid']])) {
+            form_set_error($error_element, t('%name: invalid user.', array('%name' => t($field['widget']['label']))));
           }
         }
       }
-      return $items;
+    }
+    return $items;
   }
 }
 
@@ -345,43 +345,43 @@ 
  */
 function userreference_widget_settings($op, $widget) {
   switch ($op) {
-    case 'form':
-      $form = array();
-      $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
-      $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
-      if ($widget['type'] == 'userreference_autocomplete') {
-        $form['autocomplete_match'] = array(
-          '#type' => 'select',
-          '#title' => t('Autocomplete matching'),
-          '#default_value' => $match,
-          '#options' => array(
-            'starts_with' => t('Starts with'),
-            'contains' => t('Contains'),
-          ),
-          '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of users.'),
-        );
-        $form['size'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Size of textfield'),
-          '#default_value' => $size,
-          '#element_validate' => array('_element_validate_integer_positive'),
-          '#required' => TRUE,
-        );
-      }
-      else {
-        $form['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
-        $form['size'] = array('#type' => 'hidden', '#value' => $size);
-      }
-      $form['reverse_link'] = array(
-        '#type' => 'checkbox',
-        '#title' => t('Reverse link'),
-        '#default_value' => isset($widget['reverse_link']) ? $widget['reverse_link'] : 0,
-        '#description' => t('If selected, a reverse link back to the referencing node will displayed on the referenced user record.'),
+  case 'form':
+    $form = array();
+    $match = isset($widget['autocomplete_match']) ? $widget['autocomplete_match'] : 'contains';
+    $size = (isset($widget['size']) && is_numeric($widget['size'])) ? $widget['size'] : 60;
+    if ($widget['type'] == 'userreference_autocomplete') {
+      $form['autocomplete_match'] = array(
+        '#type' => 'select',
+        '#title' => t('Autocomplete matching'),
+        '#default_value' => $match,
+        '#options' => array(
+          'starts_with' => t('Starts with'),
+          'contains' => t('Contains'),
+        ),
+        '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of users.'),
       );
-      return $form;
+      $form['size'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Size of textfield'),
+        '#default_value' => $size,
+        '#element_validate' => array('_element_validate_integer_positive'),
+        '#required' => TRUE,
+      );
+    }
+    else {
+      $form['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
+      $form['size'] = array('#type' => 'hidden', '#value' => $size);
+    }
+    $form['reverse_link'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Reverse link'),
+      '#default_value' => isset($widget['reverse_link']) ? $widget['reverse_link'] : 0,
+      '#description' => t('If selected, a reverse link back to the referencing node will displayed on the referenced user record.'),
+    );
+    return $form;
 
-    case 'save':
-      return array('autocomplete_match', 'size', 'reverse_link');
+  case 'save':
+    return array('autocomplete_match', 'size', 'reverse_link');
   }
 }
 
@@ -418,27 +418,27 @@ 
  */
 function userreference_widget(&$form, &$form_state, $field, $items, $delta = 0) {
   switch ($field['widget']['type']) {
-    case 'userreference_select':
-      $element = array(
-        '#type' => 'userreference_select',
-        '#default_value' => $items,
-      );
-      break;
+  case 'userreference_select':
+    $element = array(
+      '#type' => 'userreference_select',
+      '#default_value' => $items,
+    );
+    break;
 
-    case 'userreference_buttons':
-      $element = array(
-        '#type' => 'userreference_buttons',
-        '#default_value' => $items,
-      );
-      break;
+  case 'userreference_buttons':
+    $element = array(
+      '#type' => 'userreference_buttons',
+      '#default_value' => $items,
+    );
+    break;
 
-    case 'userreference_autocomplete':
-      $element = array(
-        '#type' => 'userreference_autocomplete',
-        '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
-        '#value_callback' => 'userreference_autocomplete_value',
-      );
-      break;
+  case 'userreference_autocomplete':
+    $element = array(
+      '#type' => 'userreference_autocomplete',
+      '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
+      '#value_callback' => 'userreference_autocomplete_value',
+    );
+    break;
   }
   return $element;
 }
@@ -845,67 +845,67 @@ 
  */
 function userreference_user($type, &$edit, &$account) {
   switch ($type) {
-    case 'load':
-      // Only add links if we are on the user 'view' page.
-      if (arg(0) != 'user' || arg(2)) {
-        return;
-      }
-      // find CCK userreference field tables
-      // search through them for matching user ids and load those nodes
-      $additions = array();
-      $types = content_types();
-
-      // Find the table and columns to search through, if the same
-      // table comes up in more than one content type, we only need
-      // to search it once.
-      $search_tables = array();
-      foreach ($types as $type_name => $type) {
-        foreach ($type['fields'] as $field) {
-          // Only add tables when reverse link has been selected.
-          if ($field['type'] == 'userreference' && !empty($field['widget']['reverse_link'])) {
-            $db_info = content_database_info($field);
-            $search_tables[$db_info['table']][] = $db_info['columns']['uid']['column'];
-          }
+  case 'load':
+    // Only add links if we are on the user 'view' page.
+    if (arg(0) != 'user' || arg(2)) {
+      return;
+    }
+    // find CCK userreference field tables
+    // search through them for matching user ids and load those nodes
+    $additions = array();
+    $types = content_types();
+
+    // Find the table and columns to search through, if the same
+    // table comes up in more than one content type, we only need
+    // to search it once.
+    $search_tables = array();
+    foreach ($types as $type_name => $type) {
+      foreach ($type['fields'] as $field) {
+        // Only add tables when reverse link has been selected.
+        if ($field['type'] == 'userreference' && !empty($field['widget']['reverse_link'])) {
+          $db_info = content_database_info($field);
+          $search_tables[$db_info['table']][] = $db_info['columns']['uid']['column'];
         }
       }
-      foreach ($search_tables as $table => $columns) {
-        foreach ($columns as $column) {
-          $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {". $table ."} f ON n.vid = f.vid WHERE f.". $column ."=". $account->uid. " AND n.status = 1"));
-          while ($data = db_fetch_object($ids)) {
-            $additions[$data->type][$data->nid] = $data->title;
-          }
+    }
+    foreach ($search_tables as $table => $columns) {
+      foreach ($columns as $column) {
+        $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {". $table ."} f ON n.vid = f.vid WHERE f.". $column ."=". $account->uid. " AND n.status = 1"));
+        while ($data = db_fetch_object($ids)) {
+          $additions[$data->type][$data->nid] = $data->title;
         }
       }
-      $account->userreference = $additions;
-      break;
+    }
+    $account->userreference = $additions;
+    break;
 
-    case 'view':
-      if (!empty($account->userreference)) {
-        $node_types = content_types();
-        $additions = array();
-        $values = array();
-        foreach ($account->userreference as $node_type => $nodes) {
-          foreach ($nodes as $nid => $title) {
-            $values[$node_type][] = l($title, 'node/'. $nid);
-          }
-          if (isset($values[$node_type])) {
-            $additions[] = array(
-              '#type' => 'user_profile_item',
-              '#title' => check_plain($node_types[$node_type]['name']),
-              '#value' => theme('item_list', $values[$node_type]),
-            );
-          }
+  case 'view':
+    if (!empty($account->userreference)) {
+      $node_types = content_types();
+      $additions = array();
+      $values = array();
+      foreach ($account->userreference as $node_type => $nodes) {
+        foreach ($nodes as $nid => $title) {
+          $values[$node_type][] = l($title, 'node/'. $nid);
         }
-        if ($additions) {
-          $account->content['userreference'] = $additions + array(
-            '#type' => 'user_profile_category',
-            '#attributes' => array('class' => 'user-member'),
-            '#title' => t('Related content'),
-            '#weight' => 10,
+        if (isset($values[$node_type])) {
+          $additions[] = array(
+            '#type' => 'user_profile_item',
+            '#title' => check_plain($node_types[$node_type]['name']),
+            '#value' => theme('item_list', $values[$node_type]),
           );
         }
       }
-      break;
+      if ($additions) {
+        $account->content['userreference'] = $additions + array(
+          '#type' => 'user_profile_category',
+          '#attributes' => array('class' => 'user-member'),
+          '#title' => t('Related content'),
+          '#weight' => 10,
+        );
+      }
+    }
+    break;
   }
 }
 

Spacing +24 added lines, -24 removed lines

@@ -48,7 +48,7 @@ 
  */
 function userreference_ctools_plugin_directory($module, $plugin) {
   if ($module == 'ctools' && $plugin == 'relationships') {
-    return 'panels/' . $plugin;
+    return 'panels/'.$plugin;
   }
 }
 
@@ -111,7 +111,7 @@ 
             '#title' => t('View used to select the users'),
             '#options' => $views,
             '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
-            '#description' =>  t('<p>Choose the "Views module" view that selects the users that can be referenced.<br />Note:</p>') .
+            '#description' =>  t('<p>Choose the "Views module" view that selects the users that can be referenced.<br />Note:</p>').
               t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
           );
           $form['advanced']['advanced_view_args'] = array(
@@ -124,7 +124,7 @@ 
         }
         else {
           $form['advanced']['no_view_help'] = array(
-            '#value' => t('<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
+            '#value' => t('<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>').
               t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
           );
         }
@@ -151,20 +151,20 @@ 
       $table_alias = content_views_tablename($field);
 
       // Filter : swap the handler to the 'in' operator.
-      $data[$table_alias][$field['field_name'] .'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
+      $data[$table_alias][$field['field_name'].'_uid']['filter']['handler'] = 'content_handler_filter_many_to_one';
       // Argument: get the user name for summaries.
       // We need to join a new instance of the users table.
       $data["users_$table_alias"]['table']['join']['node'] = array(
         'table' => 'users',
         'field' => 'uid',
         'left_table' => $table_alias,
-        'left_field' => $field['field_name'] .'_uid',
+        'left_field' => $field['field_name'].'_uid',
       );
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['handler'] = 'content_handler_argument_reference';
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name table'] = "users_$table_alias";
-      $data[$table_alias][$field['field_name'] .'_uid']['argument']['name field'] = 'name';
+      $data[$table_alias][$field['field_name'].'_uid']['argument']['handler'] = 'content_handler_argument_reference';
+      $data[$table_alias][$field['field_name'].'_uid']['argument']['name table'] = "users_$table_alias";
+      $data[$table_alias][$field['field_name'].'_uid']['argument']['name field'] = 'name';
       // Relationship: Add a relationship for related user.
-      $data[$table_alias][$field['field_name'] .'_uid']['relationship'] = array(
+      $data[$table_alias][$field['field_name'].'_uid']['relationship'] = array(
         'base' => 'users',
         'field' => $db_info['columns']['uid']['column'],
         'handler' => 'content_handler_relationship',
@@ -449,7 +449,7 @@ 
  * Substitute in the user name for the uid.
  */
 function userreference_autocomplete_value($element, $edit = FALSE) {
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
   if (!empty($element['#default_value'][$field_key])) {
     $value = db_result(db_query("SELECT name FROM {users} WHERE uid = '%d'", $element['#default_value'][$field_key]));
     return array($field_key => $value);
@@ -469,7 +469,7 @@ 
   // The userreference_select widget doesn't need to create its own
   // element, it can wrap around the optionwidgets_select element.
   // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
   $element[$field_key] = array(
     '#type' => 'optionwidgets_select',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
@@ -502,7 +502,7 @@ 
   // The userreference_select widget doesn't need to create its own
   // element, it can wrap around the optionwidgets_select element.
   // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
   $element[$field_key] = array(
     '#type' => 'optionwidgets_buttons',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
@@ -535,12 +535,12 @@ 
   // element, it can wrap around the text_textfield element and add an autocomplete
   // path and some extra processing to it.
   // Add a validation step where the value can be unwrapped.
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
 
   $element[$field_key] = array(
     '#type' => 'text_textfield',
     '#default_value' => isset($element['#value']) ? $element['#value'] : '',
-    '#autocomplete_path' => 'userreference/autocomplete/'. $element['#field_name'],
+    '#autocomplete_path' => 'userreference/autocomplete/'.$element['#field_name'],
     // The following values were set by the content module and need
     // to be passed down to the nested element.
     '#title' => $element['#title'],
@@ -578,7 +578,7 @@ 
  * like optionwidgets are using #element_validate to alter the value.
  */
 function userreference_optionwidgets_validate($element, &$form_state) {
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
 
   $value = $form_state['values'];
   $new_parents = array();
@@ -670,7 +670,7 @@ 
   static $results = array();
 
   // Create unique id for static cache.
-  $cid = $field['field_name'] .':'. $match .':'. ($string !== '' ? $string : implode('-', $ids)) .':'. $limit;
+  $cid = $field['field_name'].':'.$match.':'.($string !== '' ? $string : implode('-', $ids)).':'.$limit;
   if (!isset($results[$cid])) {
     $references = FALSE;
     if (module_exists('views') && !empty($field['advanced_view']) && $field['advanced_view'] != '--') {
@@ -783,11 +783,11 @@ 
       'equals' => "= '%s'",
       'starts_with' => "$like '%s%%'",
     );
-    $where[] = 'u.name '. (isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
+    $where[] = 'u.name '.(isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
     $args[] = $string;
   }
   elseif ($ids) {
-    $where[] = 'u.uid IN (' . db_placeholders($ids) . ')';
+    $where[] = 'u.uid IN ('.db_placeholders($ids).')';
     $args = array_merge($args, $ids);
   }
   else {
@@ -802,7 +802,7 @@ 
     $roles = array_intersect(array_keys(user_roles(1)), $roles);
   }
   if (!empty($roles) && !in_array(DRUPAL_AUTHENTICATED_RID, $roles)) {
-    $where[] = "r.rid IN (". implode($roles, ',') .")";
+    $where[] = "r.rid IN (".implode($roles, ',').")";
     $join[] = 'LEFT JOIN {users_roles} r ON u.uid = r.uid';
   }
 
@@ -812,8 +812,8 @@ 
   }
 
   $users = array();
-  $where_clause = $where ? 'WHERE ('. implode(') AND (', $where) .')' : '';
-  $result = db_query('SELECT u.name, u.uid FROM {users} u '. implode(' ', $join) ." $where_clause ORDER BY u.name ASC", $args);
+  $where_clause = $where ? 'WHERE ('.implode(') AND (', $where).')' : '';
+  $result = db_query('SELECT u.name, u.uid FROM {users} u '.implode(' ', $join)." $where_clause ORDER BY u.name ASC", $args);
   while ($user = db_fetch_object($result)) {
     $users[$user->uid] = array(
       'title' => $user->name,
@@ -835,7 +835,7 @@ 
   $references = _userreference_potential_references($field, $string, $match, array(), 10);
   foreach ($references as $id => $row) {
     // Add a class wrapper for a few required CSS overrides.
-    $matches[$row['title']] = '<div class="reference-autocomplete">'. $row['rendered'] . '</div>';
+    $matches[$row['title']] = '<div class="reference-autocomplete">'.$row['rendered'].'</div>';
   }
   drupal_json($matches);
 }
@@ -870,7 +870,7 @@ 
       }
       foreach ($search_tables as $table => $columns) {
         foreach ($columns as $column) {
-          $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {". $table ."} f ON n.vid = f.vid WHERE f.". $column ."=". $account->uid. " AND n.status = 1"));
+          $ids = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), n.title, n.type FROM {node} n LEFT JOIN {".$table."} f ON n.vid = f.vid WHERE f.".$column."=".$account->uid." AND n.status = 1"));
           while ($data = db_fetch_object($ids)) {
             $additions[$data->type][$data->nid] = $data->title;
           }
@@ -886,7 +886,7 @@ 
         $values = array();
         foreach ($account->userreference as $node_type => $nodes) {
           foreach ($nodes as $nid => $title) {
-            $values[$node_type][] = l($title, 'node/'. $nid);
+            $values[$node_type][] = l($title, 'node/'.$nid);
           }
           if (isset($values[$node_type])) {
             $additions[] = array(

Braces +9 added lines, -18 removed lines

@@ -92,8 +92,7 @@ 
           if ($view->base_table == 'users' && !empty($view->display['default']->display_options['fields'])) {
             if ($view->type == 'Default') {
               $views[t('Default Views')][$view->name] = $view->name;
-            }
-            else {
+            } else {
               $views[t('Existing Views')][$view->name] = $view->name;
             }
           }
@@ -121,8 +120,7 @@ 
             '#required' => FALSE,
             '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
           );
-        }
-        else {
+        } else {
           $form['advanced']['no_view_help'] = array(
             '#value' => t('<p>The list of user that can be referenced can be based on a "Views module" view but no appropriate views were found. <br />Note:</p>') .
               t('<ul><li>Only views that have fields will work for this purpose.</li><li>This will discard the "Referenceable Roles" and "Referenceable Status" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate users on user creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate users will be displayed.</li></ul>'),
@@ -188,8 +186,7 @@ 
         if (is_array($item) && !empty($item['uid'])) {
           if (is_numeric($item['uid'])) {
             $ids[] = $item['uid'];
-          }
-          else {
+          } else {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
             if (is_array($item) && isset($item['_error_element'])) unset($item['_error_element']);
             form_set_error($error_element, t('%name: invalid input.', array('%name' => t($field['widget']['label']))));
@@ -367,8 +364,7 @@ 
           '#element_validate' => array('_element_validate_integer_positive'),
           '#required' => TRUE,
         );
-      }
-      else {
+      } else {
         $form['autocomplete_match'] = array('#type' => 'hidden', '#value' => $match);
         $form['size'] = array('#type' => 'hidden', '#value' => $size);
       }
@@ -612,8 +608,7 @@ 
     $reference = _userreference_potential_references($field, $value, 'equals', NULL, 1);
     if (empty($reference)) {
       form_error($element[$field_key], t('%name: found no valid user with that name.', array('%name' => t($field['widget']['label']))));
-    }
-    else {
+    } else {
       $uid = key($reference);
     }
   }
@@ -733,8 +728,7 @@ 
     if (!empty($field['advanced_view_args'])) {
       // TODO: Support Tokens using token.module ?
       $view_args = array_map('trim', explode(',', $field['advanced_view_args']));
-    }
-    else {
+    } else {
       $view_args = array();
     }
 
@@ -759,8 +753,7 @@ 
 
     // Get the results.
     $result = $view->execute_display($display, $view_args);
-  }
-  else {
+  } else {
     $result = FALSE;
   }
 
@@ -785,12 +778,10 @@ 
     );
     $where[] = 'u.name '. (isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
     $args[] = $string;
-  }
-  elseif ($ids) {
+  } elseif ($ids) {
     $where[] = 'u.uid IN (' . db_placeholders($ids) . ')';
     $args = array_merge($args, $ids);
-  }
-  else {
+  } else {
     $where[] = "u.uid > 0";
   }
 

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

@@ -26,13 +26,13 @@ 
 function userreference_theme() {
   return array(
     'userreference_select' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
     'userreference_buttons' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
     'userreference_autocomplete' => array(
-      'arguments' => array('element' => NULL),
+      'arguments' => array('element' => null),
     ),
     'userreference_formatter_default' => array(
       'arguments' => array('element'),
@@ -102,7 +102,7 @@ 
         $form['advanced'] = array(
            '#type' => 'fieldset',
            '#title' => t('Advanced - Users that can be referenced (View)'),
-           '#collapsible' => TRUE,
+           '#collapsible' => true,
            '#collapsed' => !isset($field['advanced_view']) || $field['advanced_view'] == '--',
          );
         if (count($views) > 1) {
@@ -118,7 +118,7 @@ 
             '#type' => 'textfield',
             '#title' => t('View arguments'),
             '#default_value' => isset($field['advanced_view_args']) ? $field['advanced_view_args'] : '',
-            '#required' => FALSE,
+            '#required' => false,
             '#description' => t('Provide a comma separated list of arguments to pass to the view.'),
           );
         }
@@ -141,7 +141,7 @@ 
 
     case 'database columns':
       $columns = array(
-        'uid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE, 'index' => TRUE),
+        'uid' => array('type' => 'int', 'unsigned' => true, 'not null' => false, 'index' => true),
       );
       return $columns;
 
@@ -198,7 +198,7 @@ 
       }
       // Prevent performance hog if there are no ids to check.
       if ($ids) {
-        $refs = _userreference_potential_references($field, '', NULL, $ids);
+        $refs = _userreference_potential_references($field, '', null, $ids);
         foreach ($items as $delta => $item) {
           if (is_array($item)) {
             $error_element = isset($item['_error_element']) ? $item['_error_element'] : '';
@@ -218,9 +218,9 @@ 
  */
 function userreference_content_is_empty($item, $field) {
   if (empty($item['uid'])) {
-    return TRUE;
+    return true;
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -322,20 +322,20 @@ 
 function userreference_elements() {
   return array(
     'userreference_select' => array(
-      '#input' => TRUE,
+      '#input' => true,
       '#columns' => array('uid'), '#delta' => 0,
       '#process' => array('userreference_select_process'),
     ),
     'userreference_buttons' => array(
-      '#input' => TRUE,
+      '#input' => true,
       '#columns' => array('uid'), '#delta' => 0,
       '#process' => array('userreference_buttons_process'),
     ),
     'userreference_autocomplete' => array(
-      '#input' => TRUE,
+      '#input' => true,
       '#columns' => array('name'), '#delta' => 0,
       '#process' => array('userreference_autocomplete_process'),
-      '#autocomplete_path' => FALSE,
+      '#autocomplete_path' => false,
       ),
     );
 }
@@ -365,7 +365,7 @@ 
           '#title' => t('Size of textfield'),
           '#default_value' => $size,
           '#element_validate' => array('_element_validate_integer_positive'),
-          '#required' => TRUE,
+          '#required' => true,
         );
       }
       else {
@@ -435,7 +435,7 @@ 
     case 'userreference_autocomplete':
       $element = array(
         '#type' => 'userreference_autocomplete',
-        '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL,
+        '#default_value' => isset($items[$delta]) ? $items[$delta] : null,
         '#value_callback' => 'userreference_autocomplete_value',
       );
       break;
@@ -448,13 +448,13 @@ 
  *
  * Substitute in the user name for the uid.
  */
-function userreference_autocomplete_value($element, $edit = FALSE) {
+function userreference_autocomplete_value($element, $edit = false) {
   $field_key  = $element['#columns'][0];
   if (!empty($element['#default_value'][$field_key])) {
     $value = db_result(db_query("SELECT name FROM {users} WHERE uid = '%d'", $element['#default_value'][$field_key]));
     return array($field_key => $value);
   }
-  return array($field_key => NULL);
+  return array($field_key => null);
 }
 
 /**
@@ -607,9 +607,9 @@ 
   $field = content_fields($field_name, $type_name);
   $field_key = $element['#columns'][0];
   $value = $element['#value'][$field_key];
-  $uid = NULL;
+  $uid = null;
   if (!empty($value)) {
-    $reference = _userreference_potential_references($field, $value, 'equals', NULL, 1);
+    $reference = _userreference_potential_references($field, $value, 'equals', null, 1);
     if (empty($reference)) {
       form_error($element[$field_key], t('%name: found no valid user with that name.', array('%name' => t($field['widget']['label']))));
     }
@@ -666,19 +666,19 @@ 
  *     ...
  *   )
  */
-function _userreference_potential_references($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
+function _userreference_potential_references($field, $string = '', $match = 'contains', $ids = array(), $limit = null) {
   static $results = array();
 
   // Create unique id for static cache.
   $cid = $field['field_name'] .':'. $match .':'. ($string !== '' ? $string : implode('-', $ids)) .':'. $limit;
   if (!isset($results[$cid])) {
-    $references = FALSE;
+    $references = false;
     if (module_exists('views') && !empty($field['advanced_view']) && $field['advanced_view'] != '--') {
       $references = _userreference_potential_references_views($field, $string, $match, $ids, $limit);
     }
     // If the view doesn't exist, we got FALSE, and fallback to the regular 'standard mode'.
 
-    if ($references === FALSE) {
+    if ($references === false) {
       $references = _userreference_potential_references_standard($field, $string, $match, $ids, $limit);
     }
 
@@ -693,7 +693,7 @@ 
  * Helper function for _userreference_potential_references():
  * case of Views-defined referenceable users.
  */
-function _userreference_potential_references_views($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
+function _userreference_potential_references_views($field, $string = '', $match = 'contains', $ids = array(), $limit = null) {
   $view_name = $field['advanced_view'];
 
   if ($view = views_get_view($view_name)) {
@@ -755,13 +755,13 @@ 
     $view->display_handler->set_option('row_options', $options);
 
     // Make sure the query is not cached
-    $view->is_cacheable = FALSE;
+    $view->is_cacheable = false;
 
     // Get the results.
     $result = $view->execute_display($display, $view_args);
   }
   else {
-    $result = FALSE;
+    $result = false;
   }
 
   return $result;
@@ -771,7 +771,7 @@ 
  * Helper function for _userreference_potential_references():
  * referenceable users defined by user role and status
  */
-function _userreference_potential_references_standard($field, $string = '', $match = 'contains', $ids = array(), $limit = NULL) {
+function _userreference_potential_references_standard($field, $string = '', $match = 'contains', $ids = array(), $limit = null) {
   $where = array();
   $args = array();
   $join = array();

drupal/sites/default/boinc/modules/contrib/cck/theme/theme.inc

Indentation +56 added lines, -56 removed lines

@@ -6,43 +6,43 @@ 
  * Theme preprocess function for content-admin-field-overview-form.tpl.php.
  */
 function template_preprocess_content_field_overview_form(&$vars) {
-  $form = &$vars['form'];
+    $form = &$vars['form'];
 
-  $vars['help'] = theme('advanced_help_topic', 'content', 'manage-fields') . t('Add fields and groups to the content type, and arrange them on content display and input forms.');
-  if (module_exists('fieldgroup')) {
+    $vars['help'] = theme('advanced_help_topic', 'content', 'manage-fields') . t('Add fields and groups to the content type, and arrange them on content display and input forms.');
+    if (module_exists('fieldgroup')) {
     $vars['help'] .= '<br/>'. t('You can add a field to a group by dragging it below and to the right of the group.');
-  }
-  if (!module_exists('advanced_help')) {
+    }
+    if (!module_exists('advanced_help')) {
     $vars['help'] .= '<br/>' . t('Note: Installing the <a href="!adv_help">Advanced help</a> module will let you access more and better help.', array('!adv_help' => 'http://drupal.org/project/advanced_help'));
-  }
+    }
 
-  $order = _content_overview_order($form, $form['#field_rows'], $form['#group_rows']);
-  $rows = array();
+    $order = _content_overview_order($form, $form['#field_rows'], $form['#group_rows']);
+    $rows = array();
 
-  // Identify the 'new item' keys in the form, they look like
-  // _add_new_field, add_new_group.
-  $keys = array_keys($form);
-  $add_rows = array();
-  foreach ($keys as $key) {
+    // Identify the 'new item' keys in the form, they look like
+    // _add_new_field, add_new_group.
+    $keys = array_keys($form);
+    $add_rows = array();
+    foreach ($keys as $key) {
     if (substr($key, 0, 4) == '_add') {
-      $add_rows[] = $key;
+        $add_rows[] = $key;
+    }
     }
-  }
-  while ($order) {
+    while ($order) {
     $key = reset($order);
     $element = &$form[$key];
 
     // Only display the 'Add' separator if the 'add' rows are still
     // at the end of the table.
     if (!isset($added_separator)) {
-      $remaining_rows = array_diff($order, $add_rows);
-      if (empty($remaining_rows) && empty($element['#depth'])) {
+        $remaining_rows = array_diff($order, $add_rows);
+        if (empty($remaining_rows) && empty($element['#depth'])) {
         $row = new stdClass();
         $row->row_type = 'separator';
         $row->class = 'tabledrag-leaf region';
         $rows[] = $row;
         $added_separator = TRUE;
-      }
+        }
     }
 
     $row = new stdClass();
@@ -53,18 +53,18 @@ 
     $element['hidden_name']['#attributes']['class'] = 'field-name';
     // Add target classes for the update selects behavior.
     switch ($element['#row_type']) {
-      case 'add_new_field':
+        case 'add_new_field':
         $element['type']['#attributes']['class'] = 'content-field-type-select';
         $element['widget_type']['#attributes']['class'] = 'content-widget-type-select';
         break;
-      case 'add_existing_field':
+        case 'add_existing_field':
         $element['field_name']['#attributes']['class'] = 'content-field-select';
         $element['widget_type']['#attributes']['class'] = 'content-widget-type-select';
         $element['label']['#attributes']['class'] = 'content-label-textfield';
         break;
     }
     foreach (element_children($element) as $child) {
-      $row->{$child} = drupal_render($element[$child]);
+        $row->{$child} = drupal_render($element[$child]);
     }
     $row->label_class = 'label-'. strtr($element['#row_type'], '_', '-');
     $row->row_type = $element['#row_type'];
@@ -77,69 +77,69 @@ 
 
     $rows[] = $row;
     array_shift($order);
-  }
-  $vars['rows'] = $rows;
-  $vars['submit'] = drupal_render($form);
+    }
+    $vars['rows'] = $rows;
+    $vars['submit'] = drupal_render($form);
 
-  // Add tabledrag behavior.
+    // Add tabledrag behavior.
 //  drupal_add_tabledrag('content-field-overview', 'match', 'parent', 'group-parent', 'group-parent', 'field-name', FALSE, 1);
-  drupal_add_tabledrag('content-field-overview', 'match', 'parent', 'group-parent', 'group-parent', 'field-name', TRUE, 1);
+    drupal_add_tabledrag('content-field-overview', 'match', 'parent', 'group-parent', 'group-parent', 'field-name', TRUE, 1);
 //  drupal_add_tabledrag('content-field-overview', 'order', 'sibling', 'field-weight', NULL, NULL, FALSE);
-  drupal_add_tabledrag('content-field-overview', 'order', 'sibling', 'field-weight');
+    drupal_add_tabledrag('content-field-overview', 'order', 'sibling', 'field-weight');
 
-  // Add settings for the update selects behavior.
-  $js_fields = array();
-  foreach (array_keys(content_existing_field_options($form['#type_name'])) as $field_name) {
+    // Add settings for the update selects behavior.
+    $js_fields = array();
+    foreach (array_keys(content_existing_field_options($form['#type_name'])) as $field_name) {
     $field = content_fields($field_name);
     $js_fields[$field_name] = array('label' => $field['widget']['label'], 'type' => $field['type'], 'widget' => $field['widget']['type']);
-  }
-  drupal_add_js(array('contentWidgetTypes' => content_widget_type_options(), 'contentFields' => $js_fields), 'setting');
-  drupal_add_js(drupal_get_path('module', 'content') .'/content.js');
+    }
+    drupal_add_js(array('contentWidgetTypes' => content_widget_type_options(), 'contentFields' => $js_fields), 'setting');
+    drupal_add_js(drupal_get_path('module', 'content') .'/content.js');
 }
 
 /**
  * Theme preprocess function for content-admin-display-overview-form.tpl.php.
  */
 function template_preprocess_content_display_overview_form(&$vars) {
-  $form = &$vars['form'];
+    $form = &$vars['form'];
 
-  $contexts_selector = $form['#contexts'];
-  $vars['basic'] = $contexts_selector == 'basic';
-  $vars['contexts'] = content_build_modes($contexts_selector);
+    $contexts_selector = $form['#contexts'];
+    $vars['basic'] = $contexts_selector == 'basic';
+    $vars['contexts'] = content_build_modes($contexts_selector);
 
-  if ($contexts_selector == 'basic') {
+    if ($contexts_selector == 'basic') {
     $help = t("Configure how this content type's fields and field labels should be displayed when it's viewed in teaser and full-page mode.");
-  }
-  else {
+    }
+    else {
     $help = t("Configure how this content type's fields should be displayed when it's rendered in the following contexts.");
-  }
-  $help .= ' '. t("Use the 'Exclude' checkbox to exclude an item from the !content value passed to the node template.", array('!content' => '$content'));
-  $vars['help'] = $help;
+    }
+    $help .= ' '. t("Use the 'Exclude' checkbox to exclude an item from the !content value passed to the node template.", array('!content' => '$content'));
+    $vars['help'] = $help;
 
-  $order = _content_overview_order($form, $form['#fields'], $form['#groups']);
-  if (empty($order)) {
+    $order = _content_overview_order($form, $form['#fields'], $form['#groups']);
+    if (empty($order)) {
     $vars['rows'] = array();
     $vars['submit'] = '';
     return;
-  }
+    }
 
-  $rows = array();
-  foreach ($order as $key) {
+    $rows = array();
+    foreach ($order as $key) {
     $element = &$form[$key];
     $row = new stdClass();
     foreach (element_children($element) as $child) {
-      if (!array_key_exists('exclude', $element[$child])) {
+        if (!array_key_exists('exclude', $element[$child])) {
         $row->{$child} = drupal_render($element[$child]);
-      }
-      else {
+        }
+        else {
         $row->{$child}->format = drupal_render($element[$child]['format']);
         $row->{$child}->exclude = drupal_render($element[$child]['exclude']);
-      }
+        }
     }
     $row->label_class = in_array($key, $form['#groups']) ? 'label-group' : 'label-field';
     $row->indentation = theme('indentation', isset($element['#depth']) ? $element['#depth'] : 0);
     $rows[] = $row;
-  }
-  $vars['rows'] = $rows;
-  $vars['submit'] = drupal_render($form);
+    }
+    $vars['rows'] = $rows;
+    $vars['submit'] = drupal_render($form);
 }
\ No newline at end of file

Switch Indentation +9 added lines, -9 removed lines

@@ -53,15 +53,15 @@
     $element['hidden_name']['#attributes']['class'] = 'field-name';
     // Add target classes for the update selects behavior.
     switch ($element['#row_type']) {
-      case 'add_new_field':
-        $element['type']['#attributes']['class'] = 'content-field-type-select';
-        $element['widget_type']['#attributes']['class'] = 'content-widget-type-select';
-        break;
-      case 'add_existing_field':
-        $element['field_name']['#attributes']['class'] = 'content-field-select';
-        $element['widget_type']['#attributes']['class'] = 'content-widget-type-select';
-        $element['label']['#attributes']['class'] = 'content-label-textfield';
-        break;
+    case 'add_new_field':
+      $element['type']['#attributes']['class'] = 'content-field-type-select';
+      $element['widget_type']['#attributes']['class'] = 'content-widget-type-select';
+      break;
+    case 'add_existing_field':
+      $element['field_name']['#attributes']['class'] = 'content-field-select';
+      $element['widget_type']['#attributes']['class'] = 'content-widget-type-select';
+      $element['label']['#attributes']['class'] = 'content-label-textfield';
+      break;
     }
     foreach (element_children($element) as $child) {
       $row->{$child} = drupal_render($element[$child]);

Spacing +6 added lines, -6 removed lines

@@ -8,12 +8,12 @@ 
 function template_preprocess_content_field_overview_form(&$vars) {
   $form = &$vars['form'];
 
-  $vars['help'] = theme('advanced_help_topic', 'content', 'manage-fields') . t('Add fields and groups to the content type, and arrange them on content display and input forms.');
+  $vars['help'] = theme('advanced_help_topic', 'content', 'manage-fields').t('Add fields and groups to the content type, and arrange them on content display and input forms.');
   if (module_exists('fieldgroup')) {
-    $vars['help'] .= '<br/>'. t('You can add a field to a group by dragging it below and to the right of the group.');
+    $vars['help'] .= '<br/>'.t('You can add a field to a group by dragging it below and to the right of the group.');
   }
   if (!module_exists('advanced_help')) {
-    $vars['help'] .= '<br/>' . t('Note: Installing the <a href="!adv_help">Advanced help</a> module will let you access more and better help.', array('!adv_help' => 'http://drupal.org/project/advanced_help'));
+    $vars['help'] .= '<br/>'.t('Note: Installing the <a href="!adv_help">Advanced help</a> module will let you access more and better help.', array('!adv_help' => 'http://drupal.org/project/advanced_help'));
   }
 
   $order = _content_overview_order($form, $form['#field_rows'], $form['#group_rows']);
@@ -66,7 +66,7 @@ 
     foreach (element_children($element) as $child) {
       $row->{$child} = drupal_render($element[$child]);
     }
-    $row->label_class = 'label-'. strtr($element['#row_type'], '_', '-');
+    $row->label_class = 'label-'.strtr($element['#row_type'], '_', '-');
     $row->row_type = $element['#row_type'];
     $row->indentation = theme('indentation', isset($element['#depth']) ? $element['#depth'] : 0);
     $row->class = 'draggable';
@@ -94,7 +94,7 @@ 
     $js_fields[$field_name] = array('label' => $field['widget']['label'], 'type' => $field['type'], 'widget' => $field['widget']['type']);
   }
   drupal_add_js(array('contentWidgetTypes' => content_widget_type_options(), 'contentFields' => $js_fields), 'setting');
-  drupal_add_js(drupal_get_path('module', 'content') .'/content.js');
+  drupal_add_js(drupal_get_path('module', 'content').'/content.js');
 }
 
 /**
@@ -113,7 +113,7 @@ 
   else {
     $help = t("Configure how this content type's fields should be displayed when it's rendered in the following contexts.");
   }
-  $help .= ' '. t("Use the 'Exclude' checkbox to exclude an item from the !content value passed to the node template.", array('!content' => '$content'));
+  $help .= ' '.t("Use the 'Exclude' checkbox to exclude an item from the !content value passed to the node template.", array('!content' => '$content'));
   $vars['help'] = $help;
 
   $order = _content_overview_order($form, $form['#fields'], $form['#groups']);

Braces +2 added lines, -4 removed lines

@@ -109,8 +109,7 @@ 
 
   if ($contexts_selector == 'basic') {
     $help = t("Configure how this content type's fields and field labels should be displayed when it's viewed in teaser and full-page mode.");
-  }
-  else {
+  } else {
     $help = t("Configure how this content type's fields should be displayed when it's rendered in the following contexts.");
   }
   $help .= ' '. t("Use the 'Exclude' checkbox to exclude an item from the !content value passed to the node template.", array('!content' => '$content'));
@@ -130,8 +129,7 @@ 
     foreach (element_children($element) as $child) {
       if (!array_key_exists('exclude', $element[$child])) {
         $row->{$child} = drupal_render($element[$child]);
-      }
-      else {
+      } else {
         $row->{$child}->format = drupal_render($element[$child]['format']);
         $row->{$child}->exclude = drupal_render($element[$child]['exclude']);
       }

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

@@ -41,7 +41,7 @@ 
         $row->row_type = 'separator';
         $row->class = 'tabledrag-leaf region';
         $rows[] = $row;
-        $added_separator = TRUE;
+        $added_separator = true;
       }
     }
 
@@ -83,7 +83,7 @@ 
 
   // Add tabledrag behavior.
 //  drupal_add_tabledrag('content-field-overview', 'match', 'parent', 'group-parent', 'group-parent', 'field-name', FALSE, 1);
-  drupal_add_tabledrag('content-field-overview', 'match', 'parent', 'group-parent', 'group-parent', 'field-name', TRUE, 1);
+  drupal_add_tabledrag('content-field-overview', 'match', 'parent', 'group-parent', 'group-parent', 'field-name', true, 1);
 //  drupal_add_tabledrag('content-field-overview', 'order', 'sibling', 'field-weight', NULL, NULL, FALSE);
   drupal_add_tabledrag('content-field-overview', 'order', 'sibling', 'field-weight');