BOINC / boinc

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

Indentation +15 added lines, -15 removed lines

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

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

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

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

Indentation +22 added lines, -22 removed lines

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

Braces +2 added lines, -4 removed lines

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

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

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

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

Indentation +204 added lines, -204 removed lines

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

Switch Indentation +195 added lines, -195 removed lines

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

Spacing +21 added lines, -21 removed lines

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

Braces +4 added lines, -8 removed lines

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

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

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

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

Indentation +168 added lines, -168 removed lines

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

Switch Indentation +10 added lines, -10 removed lines

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

Spacing +7 added lines, -7 removed lines

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

Braces +2 added lines, -4 removed lines

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

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

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

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

Indentation +7 added lines, -7 removed lines

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

Switch Indentation +3 added lines, -3 removed lines

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

Spacing +3 added lines, -3 removed lines

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

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

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

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

Indentation +150 added lines, -150 removed lines

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

Switch Indentation +135 added lines, -135 removed lines

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

Spacing +11 added lines, -11 removed lines

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

Braces +4 added lines, -8 removed lines

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

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

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

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

Indentation +18 added lines, -18 removed lines

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

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

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

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/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');