BOINC / boinc

drupal/sites/default/boinc/modules/contrib/cck/includes/content.crud.inc

Indentation +262 added lines, -262 removed lines

@@ -29,46 +29,46 @@ 
  * Create an array of default values for a field type.
  */
 function content_field_default_values($field_type) {
-  $field_types = _content_field_types();
-  $module = $field_types[$field_type]['module'];
+    $field_types = _content_field_types();
+    $module = $field_types[$field_type]['module'];
 
-  $field = array(
+    $field = array(
     'module' => $module,
     'type' => $field_type,
     'active' => 0,
-  );
+    );
 
-  if (module_exists($module)) {
+    if (module_exists($module)) {
     $field['active'] = 1;
-  }
+    }
 
-  $field['columns'] = (array) module_invoke($module, 'field_settings', 'database columns', $field);
-  // Ensure columns always default to NULL values.
-  foreach ($field['columns'] as $column_name => $column) {
+    $field['columns'] = (array) module_invoke($module, 'field_settings', 'database columns', $field);
+    // Ensure columns always default to NULL values.
+    foreach ($field['columns'] as $column_name => $column) {
     $field['columns'][$column_name]['not null'] = FALSE;
-  }
+    }
 
-  $field['required'] = 0;
-  $field['multiple'] = 0;
-  $field['db_storage'] = CONTENT_DB_STORAGE_PER_CONTENT_TYPE;
+    $field['required'] = 0;
+    $field['multiple'] = 0;
+    $field['db_storage'] = CONTENT_DB_STORAGE_PER_CONTENT_TYPE;
 
-  // Make sure field settings all have an index in the array.
-  $setting_names = (array) module_invoke($module, 'field_settings', 'save', $field);
-  drupal_alter('field_settings', $setting_names, 'save', $field);
-  foreach ($setting_names as $setting) {
+    // Make sure field settings all have an index in the array.
+    $setting_names = (array) module_invoke($module, 'field_settings', 'save', $field);
+    drupal_alter('field_settings', $setting_names, 'save', $field);
+    foreach ($setting_names as $setting) {
     $field[$setting] = NULL;
-  }
-  return $field;
+    }
+    return $field;
 }
 
 /**
  * Create an array of default values for a field instance.
  */
 function content_instance_default_values($field_name, $type_name, $widget_type) {
-  $widget_types = _content_widget_types();
-  $module = $widget_types[$widget_type]['module'];
+    $widget_types = _content_widget_types();
+    $module = $widget_types[$widget_type]['module'];
 
-  $widget = array(
+    $widget = array(
     'field_name' => $field_name,
     'type_name' => $type_name,
     'weight' => 0,
@@ -78,101 +78,101 @@ 
     'widget_module' => $module,
     'display_settings' => array(),
     'widget_settings' => array(),
-  );
+    );
 
-  if (module_exists($module)) {
+    if (module_exists($module)) {
     $widget['widget_active'] = 1;
-  }
+    }
 
-  $settings_names = array_merge(array('label'), array_keys(content_build_modes()));
-  $widget['display_settings'] = array();
-  foreach ($settings_names as $name) {
+    $settings_names = array_merge(array('label'), array_keys(content_build_modes()));
+    $widget['display_settings'] = array();
+    foreach ($settings_names as $name) {
     $widget['display_settings'][$name]['format'] = ($name == 'label') ? 'above' : 'default';
     $widget['display_settings'][$name]['exclude'] = 0;
-  }
+    }
 
-  // Make sure widget settings all have an index in the array.
-  $settings_names = (array) module_invoke($module, 'widget_settings', 'save', $widget);
-  drupal_alter('widget_settings', $settings_names, 'save', $widget);
-  $widget['widget_settings'] = array();
-  foreach ($settings_names as $name) {
+    // Make sure widget settings all have an index in the array.
+    $settings_names = (array) module_invoke($module, 'widget_settings', 'save', $widget);
+    drupal_alter('widget_settings', $settings_names, 'save', $widget);
+    $widget['widget_settings'] = array();
+    foreach ($settings_names as $name) {
     $widget['widget_settings'][$name] = NULL;
-  }
-  return $widget;
+    }
+    return $widget;
 }
 
 /**
  * Expand field info to create field => widget info.
  */
 function content_field_instance_expand($field) {
-  if (isset($field['widget'])) {
+    if (isset($field['widget'])) {
     return $field;
-  }
-  $field['widget'] = !empty($field['widget_settings']) ? $field['widget_settings'] : array();
-  $field['widget']['label'] = !empty($field['label']) ? $field['label'] : $field['field_name'];
-  $field['widget']['weight'] = !empty($field['weight']) ? $field['weight'] : 0;
-  $field['widget']['description'] = !empty($field['description']) ? $field['description'] : '';
+    }
+    $field['widget'] = !empty($field['widget_settings']) ? $field['widget_settings'] : array();
+    $field['widget']['label'] = !empty($field['label']) ? $field['label'] : $field['field_name'];
+    $field['widget']['weight'] = !empty($field['weight']) ? $field['weight'] : 0;
+    $field['widget']['description'] = !empty($field['description']) ? $field['description'] : '';
 
-  if (!empty($field['widget_type'])) {
+    if (!empty($field['widget_type'])) {
     $field['widget']['type'] = $field['widget_type'];
     $widget_types = _content_widget_types();
     $field['widget']['module'] = isset($widget_types[$field['widget_type']]['module']) ? $widget_types[$field['widget_type']]['module'] : $field['widget_module'];
-  }
-  elseif (!empty($field['widget_module'])) {
+    }
+    elseif (!empty($field['widget_module'])) {
     $field['widget']['module'] = $field['widget_module'];
-  }
-
-  unset($field['widget_type']);
-  unset($field['weight']);
-  unset($field['label']);
-  unset($field['description']);
-  unset($field['widget_module']);
-  unset($field['widget_settings']);
-
-  // If content.module is handling the default value,
-  // initialize $widget_settings with default values,
-  if (isset($field['default_value']) && isset($field['default_value_php']) &&
+    }
+
+    unset($field['widget_type']);
+    unset($field['weight']);
+    unset($field['label']);
+    unset($field['description']);
+    unset($field['widget_module']);
+    unset($field['widget_settings']);
+
+    // If content.module is handling the default value,
+    // initialize $widget_settings with default values,
+    if (isset($field['default_value']) && isset($field['default_value_php']) &&
       content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_DEFAULT) {
     $field['widget']['default_value'] = !empty($field['default_value']) ? $field['default_value']  : NULL;
     $field['widget']['default_value_php'] = !empty($field['default_value_php']) ? $field['default_value_php'] : NULL;
     unset($field['default_value']);
     unset($field['default_value_php']);
-  }
-  return $field;
+    }
+    return $field;
 }
 
 /**
  * Collapse field info from field => widget to flattened form values.
  */
 function content_field_instance_collapse($field) {
-  if (!isset($field['widget'])) {
+    if (!isset($field['widget'])) {
     return $field;
-  }
-  $field['widget_settings'] = !empty($field['widget']) ? $field['widget'] : array();
-  $field['widget_type'] = !empty($field['widget']['type']) ? $field['widget']['type'] : '';
-  $field['weight'] = !empty($field['widget']['weight']) ? $field['widget']['weight'] : 0;
-  $field['label'] = !empty($field['widget']['label']) ? $field['widget']['label'] : $field['field_name'];
-  $field['description'] = !empty($field['widget']['description']) ? $field['widget']['description'] : '';
-  $field['type_name'] = !empty($field['type_name']) ? $field['type_name'] : '';
-
-  if (!empty($field['widget']['module'])) {
+    }
+    $field['widget_settings'] = !empty($field['widget']) ? $field['widget'] : array();
+    $field['widget_type'] = !empty($field['widget']['type']) ? $field['widget']['type'] : '';
+    $field['weight'] = !empty($field['widget']['weight']) ? $field['widget']['weight'] : 0;
+    $field['label'] = !empty($field['widget']['label']) ? $field['widget']['label'] : $field['field_name'];
+    $field['description'] = !empty($field['widget']['description']) ? $field['widget']['description'] : '';
+    $field['type_name'] = !empty($field['type_name']) ? $field['type_name'] : '';
+
+    if (!empty($field['widget']['module'])) {
     $widget_module = $field['widget']['module'];
-  }
-  elseif (!empty($field['widget']['type'])) {
+    }
+    elseif (!empty($field['widget']['type'])) {
     $widget_types = _content_widget_types();
     $widget_module = $widget_types[$field['widget']['type']]['module'];
-  }
-  else {
+    }
+    else {
     $widget_module = '';
-  }
-  $field['widget_module'] = $widget_module;
-  unset($field['widget_settings']['type']);
-  unset($field['widget_settings']['weight']);
-  unset($field['widget_settings']['label']);
-  unset($field['widget_settings']['description']);
-  unset($field['widget_settings']['module']);
-  unset($field['widget']);
-  return $field;
+    }
+    $field['widget_module'] = $widget_module;
+    unset($field['widget_settings']['type']);
+    unset($field['widget_settings']['weight']);
+    unset($field['widget_settings']['label']);
+    unset($field['widget_settings']['description']);
+    unset($field['widget_settings']['module']);
+    unset($field['widget']);
+    return $field;
 }
 
 /**
@@ -208,15 +208,15 @@ 
  * @see menu_rebuild()
  */
 function content_field_instance_create($field, $rebuild = TRUE) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+    include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
 
-  $form_values = $field;
-  $field = content_field_instance_expand($field);
+    $form_values = $field;
+    $field = content_field_instance_expand($field);
 
-  // If there are prior instances, fill out missing values from the prior values,
-  // otherwise get missing values from default values.
-  $prior_instances = content_field_instance_read(array('field_name' => $field['field_name']));
-  if (!empty($prior_instances) && is_array($prior_instances)) {
+    // If there are prior instances, fill out missing values from the prior values,
+    // otherwise get missing values from default values.
+    $prior_instances = content_field_instance_read(array('field_name' => $field['field_name']));
+    if (!empty($prior_instances) && is_array($prior_instances)) {
     $prev_field = content_field_instance_expand($prior_instances[0]);
 
     // Weight, label, and description may have been forced into the $field
@@ -226,72 +226,72 @@ 
     $field['widget']['weight'] = isset($form_values['weight']) ? $form_values['weight'] : $prev_field['widget']['weight'];
     $field['widget']['label']  = isset($form_values['label']) ? $form_values['label'] : $prev_field['widget']['label'];
     $field['widget']['description'] = isset($form_values['description']) ? $form_values['description'] : $prev_field['widget']['description'];
-  }
-  else {
+    }
+    else {
     $prev_field = array('widget' => array());
-  }
+    }
 
-  // If we have a field type, we can build default values for this field type.
-  $default_values = array('widget' => array());
-  if (isset($field['type'])) {
+    // If we have a field type, we can build default values for this field type.
+    $default_values = array('widget' => array());
+    if (isset($field['type'])) {
     $default_values = content_field_default_values($field['type']);
     $default_instance_values = content_instance_default_values($field['field_name'], $field['type_name'], $field['widget']['type']);
     $default_values = content_field_instance_expand(array_merge($default_values, $default_instance_values));
-  }
+    }
 
-  // Merge default values, previous values, and current values to create
-  // a complete field array.
-  $widget = array_merge($default_values['widget'], $prev_field['widget'], $field['widget']);
-  $field = array_merge($default_values, $prev_field, $field);
-  $field['widget'] = $widget;
+    // Merge default values, previous values, and current values to create
+    // a complete field array.
+    $widget = array_merge($default_values['widget'], $prev_field['widget'], $field['widget']);
+    $field = array_merge($default_values, $prev_field, $field);
+    $field['widget'] = $widget;
 
-  // Make sure we know what module to invoke for field info.
-  if (empty($field['module']) && !empty($field['type'])) {
+    // Make sure we know what module to invoke for field info.
+    if (empty($field['module']) && !empty($field['type'])) {
     $field_types = _content_field_types();
     $field['module'] = $field_types[$field['type']]['module'];
-  }
+    }
 
-  // The storage type may need to be updated.
-  $field['db_storage'] = content_storage_type($field);
+    // The storage type may need to be updated.
+    $field['db_storage'] = content_storage_type($field);
 
-  // Get a fresh copy of the column information whenever a field is created.
-  $field['columns'] = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
+    // Get a fresh copy of the column information whenever a field is created.
+    $field['columns'] = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
 
-  if (empty($prev_field['widget']) || $prior_instances < 1) {
+    if (empty($prev_field['widget']) || $prior_instances < 1) {
     // If this is the first instance, create the field.
     $field['db_storage'] = $field['multiple'] > 0 ? CONTENT_DB_STORAGE_PER_FIELD : CONTENT_DB_STORAGE_PER_CONTENT_TYPE;
     _content_field_write($field, 'create');
-  }
-  elseif (!empty($prev_field['widget']) && $prev_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE && count($prior_instances) > 0) {
+    }
+    elseif (!empty($prev_field['widget']) && $prev_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE && count($prior_instances) > 0) {
     // If the database storage has changed, update the field and previous instances.
     $field['db_storage'] = CONTENT_DB_STORAGE_PER_FIELD;
 
     foreach ($prior_instances as $instance) {
-      $new_instance = $instance;
-      $new_instance['db_storage'] = CONTENT_DB_STORAGE_PER_FIELD;
+        $new_instance = $instance;
+        $new_instance['db_storage'] = CONTENT_DB_STORAGE_PER_FIELD;
 
-      // Invoke hook_content_fieldapi().
-      module_invoke_all('content_fieldapi', 'update instance', $new_instance);
+        // Invoke hook_content_fieldapi().
+        module_invoke_all('content_fieldapi', 'update instance', $new_instance);
 
-      content_alter_schema($instance, $new_instance);
+        content_alter_schema($instance, $new_instance);
+    }
     }
-  }
 
-  // Invoke hook_content_fieldapi().
-  module_invoke_all('content_fieldapi', 'create instance', $field);
+    // Invoke hook_content_fieldapi().
+    module_invoke_all('content_fieldapi', 'create instance', $field);
 
-  // Update the field and the instance with the latest values.
-  _content_field_write($field, 'update');
-  _content_field_instance_write($field, 'create');
+    // Update the field and the instance with the latest values.
+    _content_field_write($field, 'update');
+    _content_field_instance_write($field, 'create');
 
-  content_alter_schema(array(), $field);
+    content_alter_schema(array(), $field);
 
-  if ($rebuild) {
+    if ($rebuild) {
     content_clear_type_cache(TRUE);
     menu_rebuild();
-  }
+    }
 
-  return $field;
+    return $field;
 }
 
 /**
@@ -319,44 +319,44 @@ 
  * @see menu_rebuild()
  */
 function content_field_instance_update($field, $rebuild = TRUE) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+    include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
 
-  // Ensure the field description is in the 'expanded' form.
-  $field = content_field_instance_expand($field);
+    // Ensure the field description is in the 'expanded' form.
+    $field = content_field_instance_expand($field);
 
-  // Get the previous value from the table.
-  $previous = content_field_instance_read(array('field_name' => $field['field_name'], 'type_name' => $field['type_name']));
-  $prev_field = array_pop($previous);
+    // Get the previous value from the table.
+    $previous = content_field_instance_read(array('field_name' => $field['field_name'], 'type_name' => $field['type_name']));
+    $prev_field = array_pop($previous);
 
-  // Create a complete field array by merging the previous and current values,
-  // letting the current values overwrite the previous ones.
-  $widget = array_merge($prev_field['widget'], $field['widget']);
-  $field = array_merge($prev_field, $field);
-  $field['widget'] = $widget;
+    // Create a complete field array by merging the previous and current values,
+    // letting the current values overwrite the previous ones.
+    $widget = array_merge($prev_field['widget'], $field['widget']);
+    $field = array_merge($prev_field, $field);
+    $field['widget'] = $widget;
 
-  // Make sure we know what module to invoke for field info.
-  if (empty($field['module']) && !empty($field['type'])) {
+    // Make sure we know what module to invoke for field info.
+    if (empty($field['module']) && !empty($field['type'])) {
     $field_types = _content_field_types();
     $field['module'] = $field_types[$field['type']]['module'];
-  }
+    }
 
-  // The storage type may need to be updated.
-  $field['db_storage'] = content_storage_type($field);
+    // The storage type may need to be updated.
+    $field['db_storage'] = content_storage_type($field);
 
-  // Changes in field values may affect columns, or column
-  // information may have changed, get a fresh copy.
-  $field['columns'] = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
+    // Changes in field values may affect columns, or column
+    // information may have changed, get a fresh copy.
+    $field['columns'] = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
 
-  // If the database storage has changed, update the field and previous instances.
-  $prior_instances = content_field_instance_read(array('field_name' => $field['field_name']));
+    // If the database storage has changed, update the field and previous instances.
+    $prior_instances = content_field_instance_read(array('field_name' => $field['field_name']));
 
-  if ($prev_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE && count($prior_instances) > 1) {
+    if ($prev_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE && count($prior_instances) > 1) {
     // Update the field's data storage.
     $field['db_storage'] = CONTENT_DB_STORAGE_PER_FIELD;
 
     // Update the schema for prior instances to adapt to the change in db storage.
     foreach ($prior_instances as $instance) {
-      if ($instance['type_name'] != $field['type_name']) {
+        if ($instance['type_name'] != $field['type_name']) {
         $new_instance = $instance;
         $new_instance['db_storage'] = CONTENT_DB_STORAGE_PER_FIELD;
 
@@ -364,30 +364,30 @@ 
         module_invoke_all('content_fieldapi', 'update instance', $new_instance);
 
         content_alter_schema($instance, $new_instance);
-      }
+        }
+    }
     }
-  }
 
-  // Invoke hook_content_fieldapi().
-  module_invoke_all('content_fieldapi', 'update instance', $field);
+    // Invoke hook_content_fieldapi().
+    module_invoke_all('content_fieldapi', 'update instance', $field);
 
-  // Update the field and the instance with the latest values.
-  _content_field_write($field, 'update');
-  _content_field_instance_write($field, 'update');
+    // Update the field and the instance with the latest values.
+    _content_field_write($field, 'update');
+    _content_field_instance_write($field, 'update');
 
-  content_alter_schema($prev_field, $field);
+    content_alter_schema($prev_field, $field);
 
-  if ($rebuild) {
+    if ($rebuild) {
     content_clear_type_cache(TRUE);
 
     // The label is in the menu tree, so we need a menu rebuild
     // if the label changes.
     if ($prev_field['widget']['label'] != $field['widget']['label']) {
-      menu_rebuild();
+        menu_rebuild();
+    }
     }
-  }
 
-  return $field;
+    return $field;
 }
 
 /**
@@ -397,30 +397,30 @@ 
  *   The field array to process.
  */
 function _content_field_write($field, $op = 'update') {
-  // Rearrange the data to create the global_settings array.
-  $field['global_settings'] = array();
-  $setting_names = (array) module_invoke($field['module'], 'field_settings', 'save', $field);
-  drupal_alter('field_settings', $setting_names, 'save', $field);
+    // Rearrange the data to create the global_settings array.
+    $field['global_settings'] = array();
+    $setting_names = (array) module_invoke($field['module'], 'field_settings', 'save', $field);
+    drupal_alter('field_settings', $setting_names, 'save', $field);
 
-  foreach ($setting_names as $setting) {
+    foreach ($setting_names as $setting) {
     // Unlike _content_field_instance_write() and 'widget_settings', 'global_settings'
     // is never preexisting, so we take no particular precautions here.
     $field['global_settings'][$setting] = isset($field[$setting]) ? $field[$setting] : '';
     unset($field[$setting]);
-  }
-  // 'columns' is a reserved word in MySQL4, so our column is named 'db_columns'.
-  $field['db_columns'] = $field['columns'];
+    }
+    // 'columns' is a reserved word in MySQL4, so our column is named 'db_columns'.
+    $field['db_columns'] = $field['columns'];
 
-  switch ($op) {
+    switch ($op) {
     case 'create':
       drupal_write_record(content_field_tablename(), $field);
-      break;
+        break;
     case 'update':
       drupal_write_record(content_field_tablename(), $field, 'field_name');
-      break;
-  }
-  unset($field['db_columns']);
-  return $field;
+        break;
+    }
+    unset($field['db_columns']);
+    return $field;
 }
 
 /**
@@ -430,32 +430,32 @@ 
  *   The field array to process.
  */
 function _content_field_instance_write($field, $op = 'update') {
-  // Collapse the field => widget format, so that the values to be saved by
-  // drupal_write_record are on top-level.
-  $field = content_field_instance_collapse($field);
-
-  // Rearrange the data to create the widget_settings array.
-  $setting_names = (array) module_invoke($field['widget_module'], 'widget_settings', 'save', $field);
-  drupal_alter('widget_settings', $setting_names, 'save', $field);
-  foreach ($setting_names as $setting) {
+    // Collapse the field => widget format, so that the values to be saved by
+    // drupal_write_record are on top-level.
+    $field = content_field_instance_collapse($field);
+
+    // Rearrange the data to create the widget_settings array.
+    $setting_names = (array) module_invoke($field['widget_module'], 'widget_settings', 'save', $field);
+    drupal_alter('widget_settings', $setting_names, 'save', $field);
+    foreach ($setting_names as $setting) {
     // In some cases (when the updated $field was originally read from
     // the db, as opposed to gathered from the values of a form), the values
     // are already in the right place, we take care to not wipe them.
     if (isset($field[$setting])) {
-      $field['widget_settings'][$setting] = $field[$setting];
-      unset($field[$setting]);
+        $field['widget_settings'][$setting] = $field[$setting];
+        unset($field[$setting]);
+    }
     }
-  }
 
-  switch ($op) {
+    switch ($op) {
     case 'create':
       drupal_write_record(content_instance_tablename(), $field);
-      break;
+        break;
     case 'update':
       drupal_write_record(content_instance_tablename(), $field, array('field_name', 'type_name'));
-      break;
-  }
-  return $field;
+        break;
+    }
+    return $field;
 }
 
 /**
@@ -473,30 +473,30 @@ 
  *   The field arrays.
  */
 function content_field_instance_read($param = NULL, $include_inactive = FALSE) {
-  $cond = array();
-  $args = array();
-  if (is_array($param)) {
+    $cond = array();
+    $args = array();
+    if (is_array($param)) {
     // Turn the conditions into a query.
     foreach ($param as $key => $value) {
-      $cond[] = 'nfi.'. db_escape_string($key) ." = '%s'";
-      $args[] = $value;
+        $cond[] = 'nfi.'. db_escape_string($key) ." = '%s'";
+        $args[] = $value;
+    }
     }
-  }
-  if (!$include_inactive) {
+    if (!$include_inactive) {
     $cond[] = 'nf.active = 1';
     $cond[] = 'nfi.widget_active = 1';
-  }
-  $where = $cond ? ' WHERE '. implode(' AND ', $cond) : '';
+    }
+    $where = $cond ? ' WHERE '. implode(' AND ', $cond) : '';
 
-  $db_result = db_query("SELECT * FROM {". content_instance_tablename() ."} nfi ".
+    $db_result = db_query("SELECT * FROM {". content_instance_tablename() ."} nfi ".
     " JOIN {". content_field_tablename() ."} nf ON nfi.field_name = nf.field_name ".
     "$where ORDER BY nfi.weight ASC, nfi.label ASC", $args);
 
-  $fields = array();
-  while ($instance = db_fetch_array($db_result)) {
+    $fields = array();
+    while ($instance = db_fetch_array($db_result)) {
     // Unserialize arrays.
     foreach (array('widget_settings', 'display_settings', 'global_settings', 'db_columns') as $key) {
-      $instance[$key] = (!empty($instance[$key])) ? (array) unserialize($instance[$key]) : array();
+        $instance[$key] = (!empty($instance[$key])) ? (array) unserialize($instance[$key]) : array();
     }
     // 'columns' is a reserved word in MySQL4, so our column is named 'db_columns'.
     $instance['columns'] = $instance['db_columns'];
@@ -504,7 +504,7 @@ 
 
     // Unfold 'global_settings'.
     foreach ($instance['global_settings'] as $key => $value) {
-      $instance[$key] = $value;
+        $instance[$key] = $value;
     }
     unset($instance['global_settings']);
 
@@ -515,8 +515,8 @@ 
     // Invoke hook_content_fieldapi().
     module_invoke_all('content_fieldapi', 'read instance', $field);
     $fields[] = $field;
-  }
-  return $fields;
+    }
+    return $fields;
 }
 
 /**
@@ -544,26 +544,26 @@ 
  * @see menu_rebuild()
  */
 function content_field_instance_delete($field_name, $type_name, $rebuild = TRUE) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+    include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
 
-  // Get the previous field value.
-  $field = array_pop(content_field_instance_read(array('field_name' => $field_name, 'type_name' => $type_name)));
+    // Get the previous field value.
+    $field = array_pop(content_field_instance_read(array('field_name' => $field_name, 'type_name' => $type_name)));
 
-  // Invoke hook_content_fieldapi().
-  module_invoke_all('content_fieldapi', 'delete instance', $field);
+    // Invoke hook_content_fieldapi().
+    module_invoke_all('content_fieldapi', 'delete instance', $field);
 
-  db_query("DELETE FROM {". content_instance_tablename() .
+    db_query("DELETE FROM {". content_instance_tablename() .
     "} WHERE field_name = '%s' AND type_name = '%s'", $field['field_name'], $field['type_name']);
 
-  // If no instances remain, delete the field entirely.
-  $instances = content_field_instance_read(array('field_name' => $field_name));
-  if (sizeof($instances) < 1) {
+    // If no instances remain, delete the field entirely.
+    $instances = content_field_instance_read(array('field_name' => $field_name));
+    if (sizeof($instances) < 1) {
     db_query("DELETE FROM {". content_field_tablename() ."} WHERE field_name = '%s'", $field['field_name']);
     content_alter_schema($field, array());
-  }
-  // If only one instance remains, we may need to change the database
-  // representation for this field.
-  elseif (sizeof($instances) == 1 && !($field['multiple'])) {
+    }
+    // If only one instance remains, we may need to change the database
+    // representation for this field.
+    elseif (sizeof($instances) == 1 && !($field['multiple'])) {
     // Multiple-valued fields are always stored per-field-type.
     $instance = $instances[0];
     $new_instance = $instance;
@@ -571,23 +571,23 @@ 
     _content_field_write($new_instance, 'update');
 
     content_alter_schema($instance, $new_instance);
-  }
+    }
 
-  // If the deleted instance was the last field for the content type,
-  // we drop the per-type table. We also consider possibly inactive fields.
-  if (!content_field_instance_read(array('type_name' => $field['type_name']), TRUE)) {
+    // If the deleted instance was the last field for the content type,
+    // we drop the per-type table. We also consider possibly inactive fields.
+    if (!content_field_instance_read(array('type_name' => $field['type_name']), TRUE)) {
     $base_tablename = _content_tablename($field['type_name'], CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
     if (db_table_exists($base_tablename)) {
-      db_drop_table($ret, $base_tablename);
+        db_drop_table($ret, $base_tablename);
+    }
     }
-  }
 
-  if ($rebuild) {
+    if ($rebuild) {
     content_clear_type_cache(TRUE);
     menu_rebuild();
-  }
+    }
 
-  return $field;
+    return $field;
 }
 
 /**
@@ -596,18 +596,18 @@ 
  * @param string $module
  */
 function content_module_delete($module) {
-  // Delete the field data.
-  // If content module has been uninstalled first, all tables
-  // have already been dropped, and running that code will raise errors.
-  if (db_table_exists(content_instance_tablename())) {
+    // Delete the field data.
+    // If content module has been uninstalled first, all tables
+    // have already been dropped, and running that code will raise errors.
+    if (db_table_exists(content_instance_tablename())) {
     $results = db_query("SELECT field_name, type_name FROM {". content_instance_tablename() ."} WHERE widget_module = '%s'", $module);
     while ($field = db_fetch_array($results)) {
-      content_field_instance_delete($field['field_name'], $field['type_name'], FALSE);
+        content_field_instance_delete($field['field_name'], $field['type_name'], FALSE);
     }
     // Force the caches and static arrays to update to the new info.
     content_clear_type_cache(TRUE);
     menu_rebuild();
-  }
+    }
 }
 
 /**
@@ -621,8 +621,8 @@ 
  * content_clear_type_cache() can do its job properly.
  */
 function content_type_create($info) {
-  node_get_types(NULL, NULL, TRUE);
-  content_clear_type_cache(TRUE);
+    node_get_types(NULL, NULL, TRUE);
+    content_clear_type_cache(TRUE);
 }
 
 /**
@@ -632,7 +632,7 @@ 
  *   value supplied by hook_node_type()
  */
 function content_type_update($info) {
-  if (!empty($info->old_type) && $info->old_type != $info->type) {
+    if (!empty($info->old_type) && $info->old_type != $info->type) {
     // Rename the content type in all fields that use changed content type.
     db_query("UPDATE {". content_instance_tablename() ."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
 
@@ -641,23 +641,23 @@ 
     $old_name = _content_tablename($old_type['type'], CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
     $new_name = _content_tablename($info->type, CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
     if (db_table_exists($old_name)) {
-      $ret = array();
-      db_rename_table($ret, $old_name, $new_name);
-      watchdog('content', 'Content fields table %old_name has been renamed to %new_name and field instances have been updated.', array(
+        $ret = array();
+        db_rename_table($ret, $old_name, $new_name);
+        watchdog('content', 'Content fields table %old_name has been renamed to %new_name and field instances have been updated.', array(
         '%old_name' => $old_name, '%new_name' => $new_name));
     }
 
     // Rename the variable storing weights for non-CCK fields.
     if ($extra = variable_get('content_extra_weights_'. $info->old_type, array())) {
-      variable_set('content_extra_weights_'. $info->type, $extra);
-      variable_del('content_extra_weights_'. $info->old_type);
+        variable_set('content_extra_weights_'. $info->type, $extra);
+        variable_del('content_extra_weights_'. $info->old_type);
+    }
     }
-  }
 
-  // Reset all content type info.
-  // Menu needs to be rebuilt as well, but node types need to be rebuilt first.
-  // node_type_form_submit() takes care of this.
-  content_clear_type_cache(TRUE);
+    // Reset all content type info.
+    // Menu needs to be rebuilt as well, but node types need to be rebuilt first.
+    // node_type_form_submit() takes care of this.
+    content_clear_type_cache(TRUE);
 }
 
 /**
@@ -672,24 +672,24 @@ 
  *
  */
 function content_type_delete($info) {
-  // Don't delete data for content-types defined by disabled modules.
-  if (!empty($info->disabled)) {
+    // Don't delete data for content-types defined by disabled modules.
+    if (!empty($info->disabled)) {
     return;
-  }
+    }
 
-  // TODO : What about inactive fields ?
-  // Currently, content_field_instance_delete doesn't work on those...
-  $fields = content_field_instance_read(array('type_name' => $info->type));
-  foreach ($fields as $field) {
+    // TODO : What about inactive fields ?
+    // Currently, content_field_instance_delete doesn't work on those...
+    $fields = content_field_instance_read(array('type_name' => $info->type));
+    foreach ($fields as $field) {
     content_field_instance_delete($field['field_name'], $info->type, FALSE);
-  }
-  $table = _content_tablename($info->type, CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
-  if (db_table_exists($table)) {
+    }
+    $table = _content_tablename($info->type, CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
+    if (db_table_exists($table)) {
     $ret = array();
     db_drop_table($ret, $table);
     watchdog('content', 'The content fields table %name has been deleted.', array('%name' => $table));
-  }
-  // Menu needs to be rebuilt as well, but node types need to be rebuilt first.
-  // node_type_form_submit() takes care of this.
-  content_clear_type_cache(TRUE);
+    }
+    // Menu needs to be rebuilt as well, but node types need to be rebuilt first.
+    // node_type_form_submit() takes care of this.
+    content_clear_type_cache(TRUE);
 }

Switch Indentation +12 added lines, -12 removed lines

@@ -412,12 +412,12 @@ 
   $field['db_columns'] = $field['columns'];
 
   switch ($op) {
-    case 'create':
-      drupal_write_record(content_field_tablename(), $field);
-      break;
-    case 'update':
-      drupal_write_record(content_field_tablename(), $field, 'field_name');
-      break;
+  case 'create':
+    drupal_write_record(content_field_tablename(), $field);
+    break;
+  case 'update':
+    drupal_write_record(content_field_tablename(), $field, 'field_name');
+    break;
   }
   unset($field['db_columns']);
   return $field;
@@ -448,12 +448,12 @@ 
   }
 
   switch ($op) {
-    case 'create':
-      drupal_write_record(content_instance_tablename(), $field);
-      break;
-    case 'update':
-      drupal_write_record(content_instance_tablename(), $field, array('field_name', 'type_name'));
-      break;
+  case 'create':
+    drupal_write_record(content_instance_tablename(), $field);
+    break;
+  case 'update':
+    drupal_write_record(content_instance_tablename(), $field, array('field_name', 'type_name'));
+    break;
   }
   return $field;
 }

Spacing +23 added lines, -23 removed lines

@@ -42,7 +42,7 @@ 
     $field['active'] = 1;
   }
 
-  $field['columns'] = (array) module_invoke($module, 'field_settings', 'database columns', $field);
+  $field['columns'] = (array)module_invoke($module, 'field_settings', 'database columns', $field);
   // Ensure columns always default to NULL values.
   foreach ($field['columns'] as $column_name => $column) {
     $field['columns'][$column_name]['not null'] = FALSE;
@@ -53,7 +53,7 @@ 
   $field['db_storage'] = CONTENT_DB_STORAGE_PER_CONTENT_TYPE;
 
   // Make sure field settings all have an index in the array.
-  $setting_names = (array) module_invoke($module, 'field_settings', 'save', $field);
+  $setting_names = (array)module_invoke($module, 'field_settings', 'save', $field);
   drupal_alter('field_settings', $setting_names, 'save', $field);
   foreach ($setting_names as $setting) {
     $field[$setting] = NULL;
@@ -92,7 +92,7 @@ 
   }
 
   // Make sure widget settings all have an index in the array.
-  $settings_names = (array) module_invoke($module, 'widget_settings', 'save', $widget);
+  $settings_names = (array)module_invoke($module, 'widget_settings', 'save', $widget);
   drupal_alter('widget_settings', $settings_names, 'save', $widget);
   $widget['widget_settings'] = array();
   foreach ($settings_names as $name) {
@@ -133,7 +133,7 @@ 
   // initialize $widget_settings with default values,
   if (isset($field['default_value']) && isset($field['default_value_php']) &&
       content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_DEFAULT) {
-    $field['widget']['default_value'] = !empty($field['default_value']) ? $field['default_value']  : NULL;
+    $field['widget']['default_value'] = !empty($field['default_value']) ? $field['default_value'] : NULL;
     $field['widget']['default_value_php'] = !empty($field['default_value_php']) ? $field['default_value_php'] : NULL;
     unset($field['default_value']);
     unset($field['default_value_php']);
@@ -208,7 +208,7 @@ 
  * @see menu_rebuild()
  */
 function content_field_instance_create($field, $rebuild = TRUE) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+  include_once('./'.drupal_get_path('module', 'content').'/includes/content.admin.inc');
 
   $form_values = $field;
   $field = content_field_instance_expand($field);
@@ -255,7 +255,7 @@ 
   $field['db_storage'] = content_storage_type($field);
 
   // Get a fresh copy of the column information whenever a field is created.
-  $field['columns'] = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
+  $field['columns'] = (array)module_invoke($field['module'], 'field_settings', 'database columns', $field);
 
   if (empty($prev_field['widget']) || $prior_instances < 1) {
     // If this is the first instance, create the field.
@@ -319,7 +319,7 @@ 
  * @see menu_rebuild()
  */
 function content_field_instance_update($field, $rebuild = TRUE) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+  include_once('./'.drupal_get_path('module', 'content').'/includes/content.admin.inc');
 
   // Ensure the field description is in the 'expanded' form.
   $field = content_field_instance_expand($field);
@@ -345,7 +345,7 @@ 
 
   // Changes in field values may affect columns, or column
   // information may have changed, get a fresh copy.
-  $field['columns'] = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
+  $field['columns'] = (array)module_invoke($field['module'], 'field_settings', 'database columns', $field);
 
   // If the database storage has changed, update the field and previous instances.
   $prior_instances = content_field_instance_read(array('field_name' => $field['field_name']));
@@ -399,7 +399,7 @@ 
 function _content_field_write($field, $op = 'update') {
   // Rearrange the data to create the global_settings array.
   $field['global_settings'] = array();
-  $setting_names = (array) module_invoke($field['module'], 'field_settings', 'save', $field);
+  $setting_names = (array)module_invoke($field['module'], 'field_settings', 'save', $field);
   drupal_alter('field_settings', $setting_names, 'save', $field);
 
   foreach ($setting_names as $setting) {
@@ -435,7 +435,7 @@ 
   $field = content_field_instance_collapse($field);
 
   // Rearrange the data to create the widget_settings array.
-  $setting_names = (array) module_invoke($field['widget_module'], 'widget_settings', 'save', $field);
+  $setting_names = (array)module_invoke($field['widget_module'], 'widget_settings', 'save', $field);
   drupal_alter('widget_settings', $setting_names, 'save', $field);
   foreach ($setting_names as $setting) {
     // In some cases (when the updated $field was originally read from
@@ -478,7 +478,7 @@ 
   if (is_array($param)) {
     // Turn the conditions into a query.
     foreach ($param as $key => $value) {
-      $cond[] = 'nfi.'. db_escape_string($key) ." = '%s'";
+      $cond[] = 'nfi.'.db_escape_string($key)." = '%s'";
       $args[] = $value;
     }
   }
@@ -486,17 +486,17 @@ 
     $cond[] = 'nf.active = 1';
     $cond[] = 'nfi.widget_active = 1';
   }
-  $where = $cond ? ' WHERE '. implode(' AND ', $cond) : '';
+  $where = $cond ? ' WHERE '.implode(' AND ', $cond) : '';
 
-  $db_result = db_query("SELECT * FROM {". content_instance_tablename() ."} nfi ".
-    " JOIN {". content_field_tablename() ."} nf ON nfi.field_name = nf.field_name ".
+  $db_result = db_query("SELECT * FROM {".content_instance_tablename()."} nfi ".
+    " JOIN {".content_field_tablename()."} nf ON nfi.field_name = nf.field_name ".
     "$where ORDER BY nfi.weight ASC, nfi.label ASC", $args);
 
   $fields = array();
   while ($instance = db_fetch_array($db_result)) {
     // Unserialize arrays.
     foreach (array('widget_settings', 'display_settings', 'global_settings', 'db_columns') as $key) {
-      $instance[$key] = (!empty($instance[$key])) ? (array) unserialize($instance[$key]) : array();
+      $instance[$key] = (!empty($instance[$key])) ? (array)unserialize($instance[$key]) : array();
     }
     // 'columns' is a reserved word in MySQL4, so our column is named 'db_columns'.
     $instance['columns'] = $instance['db_columns'];
@@ -544,7 +544,7 @@ 
  * @see menu_rebuild()
  */
 function content_field_instance_delete($field_name, $type_name, $rebuild = TRUE) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+  include_once('./'.drupal_get_path('module', 'content').'/includes/content.admin.inc');
 
   // Get the previous field value.
   $field = array_pop(content_field_instance_read(array('field_name' => $field_name, 'type_name' => $type_name)));
@@ -552,13 +552,13 @@ 
   // Invoke hook_content_fieldapi().
   module_invoke_all('content_fieldapi', 'delete instance', $field);
 
-  db_query("DELETE FROM {". content_instance_tablename() .
+  db_query("DELETE FROM {".content_instance_tablename().
     "} WHERE field_name = '%s' AND type_name = '%s'", $field['field_name'], $field['type_name']);
 
   // If no instances remain, delete the field entirely.
   $instances = content_field_instance_read(array('field_name' => $field_name));
   if (sizeof($instances) < 1) {
-    db_query("DELETE FROM {". content_field_tablename() ."} WHERE field_name = '%s'", $field['field_name']);
+    db_query("DELETE FROM {".content_field_tablename()."} WHERE field_name = '%s'", $field['field_name']);
     content_alter_schema($field, array());
   }
   // If only one instance remains, we may need to change the database
@@ -600,7 +600,7 @@ 
   // If content module has been uninstalled first, all tables
   // have already been dropped, and running that code will raise errors.
   if (db_table_exists(content_instance_tablename())) {
-    $results = db_query("SELECT field_name, type_name FROM {". content_instance_tablename() ."} WHERE widget_module = '%s'", $module);
+    $results = db_query("SELECT field_name, type_name FROM {".content_instance_tablename()."} WHERE widget_module = '%s'", $module);
     while ($field = db_fetch_array($results)) {
       content_field_instance_delete($field['field_name'], $field['type_name'], FALSE);
     }
@@ -634,7 +634,7 @@ 
 function content_type_update($info) {
   if (!empty($info->old_type) && $info->old_type != $info->type) {
     // Rename the content type in all fields that use changed content type.
-    db_query("UPDATE {". content_instance_tablename() ."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
+    db_query("UPDATE {".content_instance_tablename()."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
 
     // Rename the content fields table to match new content type name.
     $old_type = content_types($info->old_type);
@@ -648,9 +648,9 @@ 
     }
 
     // Rename the variable storing weights for non-CCK fields.
-    if ($extra = variable_get('content_extra_weights_'. $info->old_type, array())) {
-      variable_set('content_extra_weights_'. $info->type, $extra);
-      variable_del('content_extra_weights_'. $info->old_type);
+    if ($extra = variable_get('content_extra_weights_'.$info->old_type, array())) {
+      variable_set('content_extra_weights_'.$info->type, $extra);
+      variable_del('content_extra_weights_'.$info->old_type);
     }
   }
 

Braces +5 added lines, -10 removed lines

@@ -117,8 +117,7 @@ 
     $field['widget']['type'] = $field['widget_type'];
     $widget_types = _content_widget_types();
     $field['widget']['module'] = isset($widget_types[$field['widget_type']]['module']) ? $widget_types[$field['widget_type']]['module'] : $field['widget_module'];
-  }
-  elseif (!empty($field['widget_module'])) {
+  } elseif (!empty($field['widget_module'])) {
     $field['widget']['module'] = $field['widget_module'];
   }
 
@@ -157,12 +156,10 @@ 
 
   if (!empty($field['widget']['module'])) {
     $widget_module = $field['widget']['module'];
-  }
-  elseif (!empty($field['widget']['type'])) {
+  } elseif (!empty($field['widget']['type'])) {
     $widget_types = _content_widget_types();
     $widget_module = $widget_types[$field['widget']['type']]['module'];
-  }
-  else {
+  } else {
     $widget_module = '';
   }
   $field['widget_module'] = $widget_module;
@@ -226,8 +223,7 @@ 
     $field['widget']['weight'] = isset($form_values['weight']) ? $form_values['weight'] : $prev_field['widget']['weight'];
     $field['widget']['label']  = isset($form_values['label']) ? $form_values['label'] : $prev_field['widget']['label'];
     $field['widget']['description'] = isset($form_values['description']) ? $form_values['description'] : $prev_field['widget']['description'];
-  }
-  else {
+  } else {
     $prev_field = array('widget' => array());
   }
 
@@ -261,8 +257,7 @@ 
     // If this is the first instance, create the field.
     $field['db_storage'] = $field['multiple'] > 0 ? CONTENT_DB_STORAGE_PER_FIELD : CONTENT_DB_STORAGE_PER_CONTENT_TYPE;
     _content_field_write($field, 'create');
-  }
-  elseif (!empty($prev_field['widget']) && $prev_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE && count($prior_instances) > 0) {
+  } elseif (!empty($prev_field['widget']) && $prev_field['db_storage'] == CONTENT_DB_STORAGE_PER_CONTENT_TYPE && count($prior_instances) > 0) {
     // If the database storage has changed, update the field and previous instances.
     $field['db_storage'] = CONTENT_DB_STORAGE_PER_FIELD;
 

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

@@ -45,7 +45,7 @@ 
   $field['columns'] = (array) module_invoke($module, 'field_settings', 'database columns', $field);
   // Ensure columns always default to NULL values.
   foreach ($field['columns'] as $column_name => $column) {
-    $field['columns'][$column_name]['not null'] = FALSE;
+    $field['columns'][$column_name]['not null'] = false;
   }
 
   $field['required'] = 0;
@@ -56,7 +56,7 @@ 
   $setting_names = (array) module_invoke($module, 'field_settings', 'save', $field);
   drupal_alter('field_settings', $setting_names, 'save', $field);
   foreach ($setting_names as $setting) {
-    $field[$setting] = NULL;
+    $field[$setting] = null;
   }
   return $field;
 }
@@ -96,7 +96,7 @@ 
   drupal_alter('widget_settings', $settings_names, 'save', $widget);
   $widget['widget_settings'] = array();
   foreach ($settings_names as $name) {
-    $widget['widget_settings'][$name] = NULL;
+    $widget['widget_settings'][$name] = null;
   }
   return $widget;
 }
@@ -133,8 +133,8 @@ 
   // initialize $widget_settings with default values,
   if (isset($field['default_value']) && isset($field['default_value_php']) &&
       content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_DEFAULT) {
-    $field['widget']['default_value'] = !empty($field['default_value']) ? $field['default_value']  : NULL;
-    $field['widget']['default_value_php'] = !empty($field['default_value_php']) ? $field['default_value_php'] : NULL;
+    $field['widget']['default_value'] = !empty($field['default_value']) ? $field['default_value']  : null;
+    $field['widget']['default_value_php'] = !empty($field['default_value_php']) ? $field['default_value_php'] : null;
     unset($field['default_value']);
     unset($field['default_value_php']);
   }
@@ -207,7 +207,7 @@ 
  * @see content_clear_type_cache()
  * @see menu_rebuild()
  */
-function content_field_instance_create($field, $rebuild = TRUE) {
+function content_field_instance_create($field, $rebuild = true) {
   include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
 
   $form_values = $field;
@@ -287,7 +287,7 @@ 
   content_alter_schema(array(), $field);
 
   if ($rebuild) {
-    content_clear_type_cache(TRUE);
+    content_clear_type_cache(true);
     menu_rebuild();
   }
 
@@ -318,7 +318,7 @@ 
  * @see content_clear_type_cache()
  * @see menu_rebuild()
  */
-function content_field_instance_update($field, $rebuild = TRUE) {
+function content_field_instance_update($field, $rebuild = true) {
   include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
 
   // Ensure the field description is in the 'expanded' form.
@@ -378,7 +378,7 @@ 
   content_alter_schema($prev_field, $field);
 
   if ($rebuild) {
-    content_clear_type_cache(TRUE);
+    content_clear_type_cache(true);
 
     // The label is in the menu tree, so we need a menu rebuild
     // if the label changes.
@@ -472,7 +472,7 @@ 
  * @return
  *   The field arrays.
  */
-function content_field_instance_read($param = NULL, $include_inactive = FALSE) {
+function content_field_instance_read($param = null, $include_inactive = false) {
   $cond = array();
   $args = array();
   if (is_array($param)) {
@@ -543,7 +543,7 @@ 
  * @see content_clear_type_cache()
  * @see menu_rebuild()
  */
-function content_field_instance_delete($field_name, $type_name, $rebuild = TRUE) {
+function content_field_instance_delete($field_name, $type_name, $rebuild = true) {
   include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
 
   // Get the previous field value.
@@ -575,7 +575,7 @@ 
 
   // If the deleted instance was the last field for the content type,
   // we drop the per-type table. We also consider possibly inactive fields.
-  if (!content_field_instance_read(array('type_name' => $field['type_name']), TRUE)) {
+  if (!content_field_instance_read(array('type_name' => $field['type_name']), true)) {
     $base_tablename = _content_tablename($field['type_name'], CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
     if (db_table_exists($base_tablename)) {
       db_drop_table($ret, $base_tablename);
@@ -583,7 +583,7 @@ 
   }
 
   if ($rebuild) {
-    content_clear_type_cache(TRUE);
+    content_clear_type_cache(true);
     menu_rebuild();
   }
 
@@ -602,10 +602,10 @@ 
   if (db_table_exists(content_instance_tablename())) {
     $results = db_query("SELECT field_name, type_name FROM {". content_instance_tablename() ."} WHERE widget_module = '%s'", $module);
     while ($field = db_fetch_array($results)) {
-      content_field_instance_delete($field['field_name'], $field['type_name'], FALSE);
+      content_field_instance_delete($field['field_name'], $field['type_name'], false);
     }
     // Force the caches and static arrays to update to the new info.
-    content_clear_type_cache(TRUE);
+    content_clear_type_cache(true);
     menu_rebuild();
   }
 }
@@ -621,8 +621,8 @@ 
  * content_clear_type_cache() can do its job properly.
  */
 function content_type_create($info) {
-  node_get_types(NULL, NULL, TRUE);
-  content_clear_type_cache(TRUE);
+  node_get_types(null, null, true);
+  content_clear_type_cache(true);
 }
 
 /**
@@ -657,7 +657,7 @@ 
   // Reset all content type info.
   // Menu needs to be rebuilt as well, but node types need to be rebuilt first.
   // node_type_form_submit() takes care of this.
-  content_clear_type_cache(TRUE);
+  content_clear_type_cache(true);
 }
 
 /**
@@ -681,7 +681,7 @@ 
   // Currently, content_field_instance_delete doesn't work on those...
   $fields = content_field_instance_read(array('type_name' => $info->type));
   foreach ($fields as $field) {
-    content_field_instance_delete($field['field_name'], $info->type, FALSE);
+    content_field_instance_delete($field['field_name'], $info->type, false);
   }
   $table = _content_tablename($info->type, CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
   if (db_table_exists($table)) {
@@ -691,5 +691,5 @@ 
   }
   // Menu needs to be rebuilt as well, but node types need to be rebuilt first.
   // node_type_form_submit() takes care of this.
-  content_clear_type_cache(TRUE);
+  content_clear_type_cache(true);
 }

drupal/sites/default/boinc/modules/contrib/cck/includes/views/content.views_convert.inc

Indentation +21 added lines, -21 removed lines

@@ -14,42 +14,42 @@ 
  * the right results, usually needed to set field options or values.
  */
 function content_views_convert($display, $type, &$view, $views_field) {
-  static $views_fields;
+    static $views_fields;
 
-  if (empty($views_fields)) {
+    if (empty($views_fields)) {
     $views_fields = array();
     $types = content_types();
     foreach ($types as $ctype) {
-      foreach ($ctype['fields'] as $field) {
+        foreach ($ctype['fields'] as $field) {
         $module = $field['module'];
         $result = (array) module_invoke($module, 'field_settings', 'views data', $field);
         drupal_alter('field_settings', $result, 'views data', $field);
         if (empty($result)) {
-          // The views field name had the column name appended,
-          // like field_name_value or field_username_uid.
-          $column = array_shift(array_keys($field['columns']));
-          $views_fields[$field['field_name'] .'_'. $column] = $field;
+            // The views field name had the column name appended,
+            // like field_name_value or field_username_uid.
+            $column = array_shift(array_keys($field['columns']));
+            $views_fields[$field['field_name'] .'_'. $column] = $field;
         }
-      }
+        }
+    }
     }
-  }
 
-  // Is this a field that CCK should handle? If not, return.
-  if (!in_array($views_field['field'], array_keys($views_fields))) {
+    // Is this a field that CCK should handle? If not, return.
+    if (!in_array($views_field['field'], array_keys($views_fields))) {
     return;
-  }
+    }
 
-  // Now update values, options, etc. to those selected in the imported view.
-  switch ($type) {
+    // Now update values, options, etc. to those selected in the imported view.
+    switch ($type) {
     case 'field':
       $view->display[$display]->display_options['fields'][$views_field['field']]['format'] = $views_field['options'];
-      if ($views_field['handler'] == 'content_views_field_handler_group') {
+        if ($views_field['handler'] == 'content_views_field_handler_group') {
         $view->display[$display]->display_options['fields'][$views_field['field']]['multiple']['group'] = 1;
-      }
-      else {
+        }
+        else {
         $view->display[$display]->display_options['fields'][$views_field['field']]['multiple']['group'] = 0;
-      }
-      return;
+        }
+        return;
 
     case 'filter':
       // TODO
@@ -67,6 +67,6 @@ 
       // TODO
       break;
 
-  }
-  return;
+    }
+    return;
 }
\ No newline at end of file

Switch Indentation +21 added lines, -21 removed lines

@@ -41,31 +41,31 @@
 
   // Now update values, options, etc. to those selected in the imported view.
   switch ($type) {
-    case 'field':
-      $view->display[$display]->display_options['fields'][$views_field['field']]['format'] = $views_field['options'];
-      if ($views_field['handler'] == 'content_views_field_handler_group') {
-        $view->display[$display]->display_options['fields'][$views_field['field']]['multiple']['group'] = 1;
-      }
-      else {
-        $view->display[$display]->display_options['fields'][$views_field['field']]['multiple']['group'] = 0;
-      }
-      return;
+  case 'field':
+    $view->display[$display]->display_options['fields'][$views_field['field']]['format'] = $views_field['options'];
+    if ($views_field['handler'] == 'content_views_field_handler_group') {
+      $view->display[$display]->display_options['fields'][$views_field['field']]['multiple']['group'] = 1;
+    }
+    else {
+      $view->display[$display]->display_options['fields'][$views_field['field']]['multiple']['group'] = 0;
+    }
+    return;
 
-    case 'filter':
-      // TODO
-      return;
+  case 'filter':
+    // TODO
+    return;
 
-    case 'exposed_filter':
-      // TODO
-      return;
+  case 'exposed_filter':
+    // TODO
+    return;
 
-    case 'argument':
-      // TODO
-      return;
+  case 'argument':
+    // TODO
+    return;
 
-    case 'sort':
-      // TODO
-      break;
+  case 'sort':
+    // TODO
+    break;
 
   }
   return;

Spacing +2 added lines, -2 removed lines

@@ -22,13 +22,13 @@
     foreach ($types as $ctype) {
       foreach ($ctype['fields'] as $field) {
         $module = $field['module'];
-        $result = (array) module_invoke($module, 'field_settings', 'views data', $field);
+        $result = (array)module_invoke($module, 'field_settings', 'views data', $field);
         drupal_alter('field_settings', $result, 'views data', $field);
         if (empty($result)) {
           // The views field name had the column name appended,
           // like field_name_value or field_username_uid.
           $column = array_shift(array_keys($field['columns']));
-          $views_fields[$field['field_name'] .'_'. $column] = $field;
+          $views_fields[$field['field_name'].'_'.$column] = $field;
         }
       }
     }

Braces +1 added lines, -2 removed lines

@@ -45,8 +45,7 @@
       $view->display[$display]->display_options['fields'][$views_field['field']]['format'] = $views_field['options'];
       if ($views_field['handler'] == 'content_views_field_handler_group') {
         $view->display[$display]->display_options['fields'][$views_field['field']]['multiple']['group'] = 1;
-      }
-      else {
+      } else {
         $view->display[$display]->display_options['fields'][$views_field['field']]['multiple']['group'] = 0;
       }
       return;

drupal/sites/default/boinc/modules/contrib/cck/includes/views/content.views.inc

Indentation +134 added lines, -134 removed lines

@@ -16,62 +16,62 @@ 
  * Implementation of hook_views_handlers().
  */
 function content_views_handlers() {
-  return array(
+    return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'content') . '/includes/views/handlers',
+        'path' => drupal_get_path('module', 'content') . '/includes/views/handlers',
     ),
     'handlers' => array(
 
-      // argument handlers
-      'content_handler_argument' => array(
+        // argument handlers
+        'content_handler_argument' => array(
         'parent' => 'views_handler_argument',
-      ),
-      'content_handler_argument_string' => array(
+        ),
+        'content_handler_argument_string' => array(
         'parent' => 'views_handler_argument_string',
-      ),
-      'content_handler_argument_numeric' => array(
+        ),
+        'content_handler_argument_numeric' => array(
         'parent' => 'views_handler_argument_numeric',
-      ),
-      'content_handler_argument_reference' => array(
+        ),
+        'content_handler_argument_reference' => array(
         'parent' => 'content_handler_argument_numeric',
-      ),
-      'content_handler_argument_many_to_one' => array(
+        ),
+        'content_handler_argument_many_to_one' => array(
         'parent' => 'views_handler_argument_many_to_one',
-      ),
+        ),
 
-      // field handlers
-      'content_handler_field' => array(
+        // field handlers
+        'content_handler_field' => array(
         'parent' => 'views_handler_field_node',
-      ),
-      'content_handler_field_multiple' => array(
+        ),
+        'content_handler_field_multiple' => array(
         'parent' => 'content_handler_field',
-      ),
+        ),
 
-      // filter handlers
-      'content_handler_filter_string' => array(
+        // filter handlers
+        'content_handler_filter_string' => array(
         'parent' => 'views_handler_filter_string',
-      ),
-      'content_handler_filter_numeric' => array(
+        ),
+        'content_handler_filter_numeric' => array(
         'parent' => 'views_handler_filter_numeric',
-      ),
-      'content_handler_filter_float' => array(
+        ),
+        'content_handler_filter_float' => array(
         'parent' => 'views_handler_filter_float',
-      ),
-      'content_handler_filter_many_to_one' => array(
+        ),
+        'content_handler_filter_many_to_one' => array(
         'parent' => 'views_handler_filter_many_to_one',
-      ),
+        ),
 
-      // relationship handlers
-      'content_handler_relationship' => array(
+        // relationship handlers
+        'content_handler_relationship' => array(
         'parent' => 'views_handler_relationship',
-      ),
+        ),
 
-      // sort handlers
-      'content_handler_sort' => array(
+        // sort handlers
+        'content_handler_sort' => array(
         'parent' => 'views_handler_sort',
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
@@ -81,10 +81,10 @@ 
  * nodereference and userreference.
  */
 function content_views_plugins() {
-  $plugins = array(
+    $plugins = array(
     'module' => 'content', // This just tells our themes are elsewhere.
     'display' => array(
-      'content_simple' => array(
+        'content_simple' => array(
         'path' => drupal_get_path('module', 'content') . '/includes/views/handlers',
         // Those strings are not translated for now.
         // We'll need to change that if / when we remove 'no ui'
@@ -96,8 +96,8 @@ 
         'use ajax' => FALSE,
         'use pager' => FALSE,
         'accept attachments' => FALSE,
-      ),
-      'content_references' => array(
+        ),
+        'content_references' => array(
         'path' => drupal_get_path('module', 'content') . '/includes/views/handlers',
         // Those strings are not translated for now.
         // We'll need to change that if / when we remove 'no ui'
@@ -110,10 +110,10 @@ 
         'use ajax' => FALSE,
         'use pager' => FALSE,
         'accept attachments' => FALSE,
-      ),
+        ),
     ),
     'style' => array(
-      'content_php_array_autocomplete' => array(
+        'content_php_array_autocomplete' => array(
         'path' => drupal_get_path('module', 'content') . '/includes/views/handlers',
         // Those strings are not translated for now.
         // We'll need to change that if / when we remove 'no ui'
@@ -125,10 +125,10 @@ 
         'uses fields' => TRUE,
         'type' => 'content_simple',
         'even empty' => TRUE,
-      ),
+        ),
     ),
-  );
-  return $plugins;
+    );
+    return $plugins;
 }
 
 /**
@@ -137,187 +137,187 @@ 
  * Exposes all fields to the views system.
  */
 function content_views_data() {
-  $data = array();
-  foreach (content_fields() as $field) {
+    $data = array();
+    foreach (content_fields() as $field) {
     $module = $field['module'];
     $result = (array) module_invoke($module, 'field_settings', 'views data', $field);
     drupal_alter('field_settings', $result, 'views data', $field);
     if (empty($result)) {
-      $result = content_views_field_views_data($field);
+        $result = content_views_field_views_data($field);
     }
     if (is_array($result)) {
-      $data = array_merge($data, $result);
+        $data = array_merge($data, $result);
+    }
     }
-  }
-  return $data;
+    return $data;
 }
 
 
 function content_views_field_views_data($field) {
-  $field_types = _content_field_types();
+    $field_types = _content_field_types();
 
-  // Check the field module is available.
-  // TODO: is this really how we should do it ?
-  if (isset($field_types[$field['type']])) {
+    // Check the field module is available.
+    // TODO: is this really how we should do it ?
+    if (isset($field_types[$field['type']])) {
     $db_info = content_database_info($field);
 
     // Field modules that do not store data in the database
     // should not create views data tables.
     if (empty($db_info['columns'])) {
-      return;
+        return;
     }
 
     $table_alias = content_views_tablename($field);
 
     $types = array();
     foreach (content_types() as $type) {
-      if (isset($type['fields'][$field['field_name']])) {
+        if (isset($type['fields'][$field['field_name']])) {
         // TODO : run check_plain here instead of on the imploded string below ?
         $types[] = $type['name'];
-      }
+        }
     }
 
     $data = array();
     $data['table']['group']  = t('Content');
     $data['table']['join']['node'] = array(
-      'table' => $db_info['table'],
-      'left_field' => 'vid',
-      'field' => 'vid',
+        'table' => $db_info['table'],
+        'left_field' => 'vid',
+        'field' => 'vid',
     );
     $data['table']['join']['node_revisions'] = array(
-      'table' => $db_info['table'],
-      'left_field' => 'vid',
-      'field' => 'vid',
+        'table' => $db_info['table'],
+        'left_field' => 'vid',
+        'field' => 'vid',
     );
 
     // Build the list of columns enabled for default views integration.
     $db_columns = array();
     $additional_fields = array();
     foreach ($db_info['columns'] as $column => $attributes) {
-      // Select explicitly enabled field columns.
-      if (!empty($attributes['views'])) {
+        // Select explicitly enabled field columns.
+        if (!empty($attributes['views'])) {
         $db_columns[$column] = $attributes;
-      }
-      // Ensure all columns are retrieved.
-      $additional_fields[$attributes['column']] = $attributes['column'];
+        }
+        // Ensure all columns are retrieved.
+        $additional_fields[$attributes['column']] = $attributes['column'];
     }
     // Pick up the first column when none has been explicitly enabled
     // (pre CCK 2.2 backwards compatibility).
     if (empty($db_columns)) {
-      // Can't use array_slice(), it won't work in PHP4 for assoc array.
-      foreach ($db_info['columns'] as $column => $attributes) {
+        // Can't use array_slice(), it won't work in PHP4 for assoc array.
+        foreach ($db_info['columns'] as $column => $attributes) {
         $db_columns[$column] = $attributes;
         break;
-      }
+        }
     }
     $columns = array();
     $db_fields = array();
     $arguments = array();
     $filters = array();
     foreach ($db_columns as $column => $attributes) {
-      $columns[] = $column;
-      $db_fields[] = $attributes['column'];
-      $sorts[] = !empty($attributes['sortable']) ? TRUE : FALSE;
+        $columns[] = $column;
+        $db_fields[] = $attributes['column'];
+        $sorts[] = !empty($attributes['sortable']) ? TRUE : FALSE;
 
-      // Identify likely filters and arguments for each column based on field type.
-      switch ($attributes['type']) {
+        // Identify likely filters and arguments for each column based on field type.
+        switch ($attributes['type']) {
         case 'int':
         case 'mediumint':
         case 'tinyint':
         case 'bigint':
         case 'serial':
           $filters[] = 'content_handler_filter_numeric';
-          $arguments[] = 'content_handler_argument_numeric';
-          break;
+            $arguments[] = 'content_handler_argument_numeric';
+            break;
         case 'numeric':
         case 'float':
           $filters[] = 'content_handler_filter_float';
-          $arguments[] = 'content_handler_argument_numeric';
-          break;
+            $arguments[] = 'content_handler_argument_numeric';
+            break;
 
         case 'text':
         case 'blob':
           // TODO add markup handlers for these types
         default:
           $filters[] = 'content_handler_filter_string';
-          $arguments[] = 'content_handler_argument_string';
-          break;
-      }
+            $arguments[] = 'content_handler_argument_string';
+            break;
+        }
     }
 
     // Provide automatic filters, sorts, and arguments for each column, not just the first.
     $db_fields_count = count($db_fields);
     foreach ($db_fields as $i => $db_field) {
-      $label_truncated = truncate_utf8(t($field['widget']['label']), 10, TRUE);
-      if ($db_fields_count == 1) {
+        $label_truncated = truncate_utf8(t($field['widget']['label']), 10, TRUE);
+        if ($db_fields_count == 1) {
         $title = t('@label (!name)', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
         $title_short = check_plain($label_truncated);
-      }
-      else {
+        }
+        else {
         $title = t('@label (!name) - !column', array('@label' => t($field['widget']['label']), '!name' => $field['field_name'], '!column' => $columns[$i]));
         $title_short = t('@label-truncated - !column', array('@label-truncated' => $label_truncated, '!column' => $columns[$i]));
-      }
+        }
 
-      $data[$db_field] = array(
+        $data[$db_field] = array(
         'group' => t('Content'),
         'title' => $title,
         'title short' => $title_short,
         'help' =>  t($field_types[$field['type']]['label']) .' - '. t('Appears in: @types', array('@types' => implode(', ', $types))),
-      );
-      if ($i == 0) {
+        );
+        if ($i == 0) {
         $data[$db_field]['field'] = array(
-          'title' => t('@label (!name)', array('@label' => t($field['widget']['label']), '!name' => $field['field_name'])),
-          'title short' => check_plain($label_truncated),
-          'field' => $db_field,
-          'table' => $db_info['table'],
-          'handler' => 'content_handler_field_multiple',
-          'click sortable' => $sorts[$i],
-          'additional fields' => $additional_fields,
-          'content_field_name' => $field['field_name'],
-          'access callback' => 'content_access',
-          'access arguments' => array('view', $field),
+            'title' => t('@label (!name)', array('@label' => t($field['widget']['label']), '!name' => $field['field_name'])),
+            'title short' => check_plain($label_truncated),
+            'field' => $db_field,
+            'table' => $db_info['table'],
+            'handler' => 'content_handler_field_multiple',
+            'click sortable' => $sorts[$i],
+            'additional fields' => $additional_fields,
+            'content_field_name' => $field['field_name'],
+            'access callback' => 'content_access',
+            'access arguments' => array('view', $field),
         );
-      }
-      $data[$db_field]['argument'] = array(
+        }
+        $data[$db_field]['argument'] = array(
         'field' => $db_field,
         'table' => $db_info['table'],
         'handler' => $arguments[$i],
         'additional fields' => $additional_fields,
         'content_field_name' => $field['field_name'],
         'empty field name' => t('<No value>'),
-      );
-      $data[$db_field]['filter'] = array(
+        );
+        $data[$db_field]['filter'] = array(
         'field' => $db_field,
         'table' => $db_info['table'],
         'handler' => $filters[$i],
         'additional fields' => $additional_fields,
         'content_field_name' => $field['field_name'],
         'allow empty' => TRUE,
-      );
-      if (!empty($sorts[$i])) {
+        );
+        if (!empty($sorts[$i])) {
         $data[$db_field]['sort'] = array(
-          'field' => $db_field,
-          'table' => $db_info['table'],
-          'handler' => 'content_handler_sort',
-          'additional fields' => $additional_fields,
-          'content_field_name' => $field['field_name'],
+            'field' => $db_field,
+            'table' => $db_info['table'],
+            'handler' => 'content_handler_sort',
+            'additional fields' => $additional_fields,
+            'content_field_name' => $field['field_name'],
         );
-      }
+        }
     }
 
     // Expose additional delta column for multiple value fields.
     if ($field['multiple']) {
-      $title = t('@label (!name) - delta', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
-      $title_short = t('@label-truncated - delta', array('@label-truncated' => $label_truncated));
+        $title = t('@label (!name) - delta', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
+        $title_short = t('@label-truncated - delta', array('@label-truncated' => $label_truncated));
 
-      $db_field = 'delta';
-      $data[$db_field] = array(
+        $db_field = 'delta';
+        $data[$db_field] = array(
         'group' => t('Content'),
         'title' => $title,
         'title short' => $title_short,
         'help' => t('Delta - Appears in: @types', array('@types' => implode(', ', $types))),
-      );
-      $data[$db_field]['field'] = array(
+        );
+        $data[$db_field]['field'] = array(
         'title' => $title,
         'title short' => $title_short,
         'field' => $db_field,
@@ -327,31 +327,31 @@ 
         'additional fields' => $additional_fields,
         'access callback' => 'content_access',
         'access arguments' => array('view', $field),
-      );
-      $data[$db_field]['argument'] = array(
+        );
+        $data[$db_field]['argument'] = array(
         'field' => $db_field,
         'table' => $db_info['table'],
         'handler' => 'views_handler_argument_numeric',
         'additional fields' => $additional_fields,
         'empty field name' => t('<No value>'),
-      );
-      $data[$db_field]['filter'] = array(
+        );
+        $data[$db_field]['filter'] = array(
         'field' => $db_field,
         'table' => $db_info['table'],
         'handler' => 'views_handler_filter_numeric',
         'additional fields' => $additional_fields,
         'allow empty' => TRUE,
-      );
-      $data[$db_field]['sort'] = array(
+        );
+        $data[$db_field]['sort'] = array(
         'field' => $db_field,
         'table' => $db_info['table'],
         'handler' => 'views_handler_sort',
         'additional fields' => $additional_fields,
-      );
+        );
     }
 
     return array($table_alias => $data);
-  }
+    }
 }
 
 /**
@@ -359,17 +359,17 @@ 
  * in the future without re-writing code.
  */
 function content_views_tablename($field) {
-  return 'node_data_'. $field['field_name'];
+    return 'node_data_'. $field['field_name'];
 }
 
 function theme_content_view_multiple_field($items, $field, $values) {
-  $output = '';
-  $i = 0;
-  foreach ($items as $item) {
+    $output = '';
+    $i = 0;
+    foreach ($items as $item) {
     if (!empty($item) || $item == '0') {
-      $output .= '<div class="field-item field-item-'. $i .'">'. $item .'</div>';
-      $i++;
+        $output .= '<div class="field-item field-item-'. $i .'">'. $item .'</div>';
+        $i++;
+    }
     }
-  }
-  return $output;
+    return $output;
 }
\ No newline at end of file

Switch Indentation +20 added lines, -20 removed lines

@@ -221,27 +221,27 @@
 
       // Identify likely filters and arguments for each column based on field type.
       switch ($attributes['type']) {
-        case 'int':
-        case 'mediumint':
-        case 'tinyint':
-        case 'bigint':
-        case 'serial':
-          $filters[] = 'content_handler_filter_numeric';
-          $arguments[] = 'content_handler_argument_numeric';
-          break;
-        case 'numeric':
-        case 'float':
-          $filters[] = 'content_handler_filter_float';
-          $arguments[] = 'content_handler_argument_numeric';
-          break;
+      case 'int':
+      case 'mediumint':
+      case 'tinyint':
+      case 'bigint':
+      case 'serial':
+        $filters[] = 'content_handler_filter_numeric';
+        $arguments[] = 'content_handler_argument_numeric';
+        break;
+      case 'numeric':
+      case 'float':
+        $filters[] = 'content_handler_filter_float';
+        $arguments[] = 'content_handler_argument_numeric';
+        break;
 
-        case 'text':
-        case 'blob':
-          // TODO add markup handlers for these types
-        default:
-          $filters[] = 'content_handler_filter_string';
-          $arguments[] = 'content_handler_argument_string';
-          break;
+      case 'text':
+      case 'blob':
+        // TODO add markup handlers for these types
+      default:
+        $filters[] = 'content_handler_filter_string';
+        $arguments[] = 'content_handler_argument_string';
+        break;
       }
     }
 

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
 function content_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'content') . '/includes/views/handlers',
+      'path' => drupal_get_path('module', 'content').'/includes/views/handlers',
     ),
     'handlers' => array(
 
@@ -85,7 +85,7 @@ 
     'module' => 'content', // This just tells our themes are elsewhere.
     'display' => array(
       'content_simple' => array(
-        'path' => drupal_get_path('module', 'content') . '/includes/views/handlers',
+        'path' => drupal_get_path('module', 'content').'/includes/views/handlers',
         // Those strings are not translated for now.
         // We'll need to change that if / when we remove 'no ui'
         'title' => 'Simple', // TODO: better name ? (currently not displayed anyway)
@@ -98,7 +98,7 @@ 
         'accept attachments' => FALSE,
       ),
       'content_references' => array(
-        'path' => drupal_get_path('module', 'content') . '/includes/views/handlers',
+        'path' => drupal_get_path('module', 'content').'/includes/views/handlers',
         // Those strings are not translated for now.
         // We'll need to change that if / when we remove 'no ui'
         'title' => 'Simple - for reference fields', // TODO: better name ? (currently not displayed anyway)
@@ -114,7 +114,7 @@ 
     ),
     'style' => array(
       'content_php_array_autocomplete' => array(
-        'path' => drupal_get_path('module', 'content') . '/includes/views/handlers',
+        'path' => drupal_get_path('module', 'content').'/includes/views/handlers',
         // Those strings are not translated for now.
         // We'll need to change that if / when we remove 'no ui'
         'title' => 'Results array (with title)',
@@ -140,7 +140,7 @@ 
   $data = array();
   foreach (content_fields() as $field) {
     $module = $field['module'];
-    $result = (array) module_invoke($module, 'field_settings', 'views data', $field);
+    $result = (array)module_invoke($module, 'field_settings', 'views data', $field);
     drupal_alter('field_settings', $result, 'views data', $field);
     if (empty($result)) {
       $result = content_views_field_views_data($field);
@@ -178,7 +178,7 @@ 
     }
 
     $data = array();
-    $data['table']['group']  = t('Content');
+    $data['table']['group'] = t('Content');
     $data['table']['join']['node'] = array(
       'table' => $db_info['table'],
       'left_field' => 'vid',
@@ -262,7 +262,7 @@ 
         'group' => t('Content'),
         'title' => $title,
         'title short' => $title_short,
-        'help' =>  t($field_types[$field['type']]['label']) .' - '. t('Appears in: @types', array('@types' => implode(', ', $types))),
+        'help' =>  t($field_types[$field['type']]['label']).' - '.t('Appears in: @types', array('@types' => implode(', ', $types))),
       );
       if ($i == 0) {
         $data[$db_field]['field'] = array(
@@ -359,7 +359,7 @@ 
  * in the future without re-writing code.
  */
 function content_views_tablename($field) {
-  return 'node_data_'. $field['field_name'];
+  return 'node_data_'.$field['field_name'];
 }
 
 function theme_content_view_multiple_field($items, $field, $values) {
@@ -367,7 +367,7 @@ 
   $i = 0;
   foreach ($items as $item) {
     if (!empty($item) || $item == '0') {
-      $output .= '<div class="field-item field-item-'. $i .'">'. $item .'</div>';
+      $output .= '<div class="field-item field-item-'.$i.'">'.$item.'</div>';
       $i++;
     }
   }

Braces +1 added lines, -2 removed lines

@@ -252,8 +252,7 @@
       if ($db_fields_count == 1) {
         $title = t('@label (!name)', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
         $title_short = check_plain($label_truncated);
-      }
-      else {
+      } else {
         $title = t('@label (!name) - !column', array('@label' => t($field['widget']['label']), '!name' => $field['field_name'], '!column' => $columns[$i]));
         $title_short = t('@label-truncated - !column', array('@label-truncated' => $label_truncated, '!column' => $columns[$i]));
       }

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

@@ -91,11 +91,11 @@ 
         'title' => 'Simple', // TODO: better name ? (currently not displayed anyway)
         'help' => 'Destination-agnostic display. Mostly useful for programmatic views.',
         'handler' => 'content_plugin_display_simple',
-        'no ui' => TRUE, // Programmatic use only.
-        'uses hook menu' => FALSE,
-        'use ajax' => FALSE,
-        'use pager' => FALSE,
-        'accept attachments' => FALSE,
+        'no ui' => true, // Programmatic use only.
+        'uses hook menu' => false,
+        'use ajax' => false,
+        'use pager' => false,
+        'accept attachments' => false,
       ),
       'content_references' => array(
         'path' => drupal_get_path('module', 'content') . '/includes/views/handlers',
@@ -105,11 +105,11 @@ 
         'help' => 'Destination-agnostic display. Mostly useful for programmatic views.',
         'parent' => 'content_simple',
         'handler' => 'content_plugin_display_references',
-        'no ui' => TRUE, // Programmatic use only.
-        'uses hook menu' => FALSE,
-        'use ajax' => FALSE,
-        'use pager' => FALSE,
-        'accept attachments' => FALSE,
+        'no ui' => true, // Programmatic use only.
+        'uses hook menu' => false,
+        'use ajax' => false,
+        'use pager' => false,
+        'accept attachments' => false,
       ),
     ),
     'style' => array(
@@ -120,11 +120,11 @@ 
         'title' => 'Results array (with title)',
         'help' => 'Returns the view as a PHP array of names + rendered rows.',
         'handler' => 'content_plugin_style_php_array_ac',
-        'no ui' => TRUE, // Programmatic use only.
-        'uses row plugin' => TRUE,
-        'uses fields' => TRUE,
+        'no ui' => true, // Programmatic use only.
+        'uses row plugin' => true,
+        'uses fields' => true,
         'type' => 'content_simple',
-        'even empty' => TRUE,
+        'even empty' => true,
       ),
     ),
   );
@@ -217,7 +217,7 @@ 
     foreach ($db_columns as $column => $attributes) {
       $columns[] = $column;
       $db_fields[] = $attributes['column'];
-      $sorts[] = !empty($attributes['sortable']) ? TRUE : FALSE;
+      $sorts[] = !empty($attributes['sortable']) ? true : false;
 
       // Identify likely filters and arguments for each column based on field type.
       switch ($attributes['type']) {
@@ -248,7 +248,7 @@ 
     // Provide automatic filters, sorts, and arguments for each column, not just the first.
     $db_fields_count = count($db_fields);
     foreach ($db_fields as $i => $db_field) {
-      $label_truncated = truncate_utf8(t($field['widget']['label']), 10, TRUE);
+      $label_truncated = truncate_utf8(t($field['widget']['label']), 10, true);
       if ($db_fields_count == 1) {
         $title = t('@label (!name)', array('@label' => t($field['widget']['label']), '!name' => $field['field_name']));
         $title_short = check_plain($label_truncated);
@@ -292,7 +292,7 @@ 
         'handler' => $filters[$i],
         'additional fields' => $additional_fields,
         'content_field_name' => $field['field_name'],
-        'allow empty' => TRUE,
+        'allow empty' => true,
       );
       if (!empty($sorts[$i])) {
         $data[$db_field]['sort'] = array(
@@ -323,7 +323,7 @@ 
         'field' => $db_field,
         'table' => $db_info['table'],
         'handler' => 'views_handler_field_numeric',
-        'click sortable' => TRUE,
+        'click sortable' => true,
         'additional fields' => $additional_fields,
         'access callback' => 'content_access',
         'access arguments' => array('view', $field),
@@ -340,7 +340,7 @@ 
         'table' => $db_info['table'],
         'handler' => 'views_handler_filter_numeric',
         'additional fields' => $additional_fields,
-        'allow empty' => TRUE,
+        'allow empty' => true,
       );
       $data[$db_field]['sort'] = array(
         'field' => $db_field,

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_relationship.inc

Indentation +31 added lines, -31 removed lines

@@ -7,67 +7,67 @@
  * values by allowing the views administrator to select deltas.
  */
 class content_handler_relationship extends views_handler_relationship {
-  var $content_field;
+    var $content_field;
 
-  function construct() {
+    function construct() {
     parent::construct();
 
     $this->content_field = content_fields($this->definition['content_field_name']);
-  }
+    }
 
-  function option_definition() {
+    function option_definition() {
     $options = parent::option_definition();
     $options['delta'] = array('default' => -1);
 
     return $options;
-  }
+    }
 
-  /**
-   * Add a delta selector for multiple fields.
-   */
-  function options_form(&$form, &$form_state) {
+    /**
+     * Add a delta selector for multiple fields.
+     */
+    function options_form(&$form, &$form_state) {
     $field = $this->content_field;
     parent::options_form($form, $form_state);
 
     // Only add the form gadget if the field is multiple.
     if ($field['multiple']) {
-      $max_delta = $field['multiple'];
-      // 1 means unlimited.
-      if ($max_delta == 1) {
+        $max_delta = $field['multiple'];
+        // 1 means unlimited.
+        if ($max_delta == 1) {
         $max_delta = 10;
-      }
+        }
 
-      $options = array('-1' => t('All'));
-      for ($i = 0; $i < $max_delta; $i++) {
+        $options = array('-1' => t('All'));
+        for ($i = 0; $i < $max_delta; $i++) {
         $options[$i] = $i + 1;
-      }
-      $form['delta'] = array(
+        }
+        $form['delta'] = array(
         '#type' => 'select',
         '#options' => $options,
         '#default_value' => $this->options['delta'],
         '#title' => t('Delta'),
         '#description' => t('The delta allows you to select which item in a multiple value field to key the relationship off of. Select "1" to use the first item, "2" for the second item, and so on. If you select "All", each item in the field will create a new row, which may appear to cause duplicates.'),
-      );
+        );
+    }
     }
-  }
 
-  function ensure_my_table() {
+    function ensure_my_table() {
     if (!isset($this->table_alias)) {
-      $join = $this->get_join();
-      if (!isset($join->extra)) {
+        $join = $this->get_join();
+        if (!isset($join->extra)) {
         $join->extra = array();
-      }
-      $delta = isset($this->options['delta']) ? $this->options['delta'] : -1;
-      if ($delta != -1) {
+        }
+        $delta = isset($this->options['delta']) ? $this->options['delta'] : -1;
+        if ($delta != -1) {
         $join->extra[] = array(
-          'field' => 'delta',
-          'value' => $delta,
-          'numeric' => TRUE,
+            'field' => 'delta',
+            'value' => $delta,
+            'numeric' => TRUE,
         );
-      }
+        }
 
-      $this->table_alias = $this->query->add_table($this->table, $this->relationship, $join);
+        $this->table_alias = $this->query->add_table($this->table, $this->relationship, $join);
     }
     return $this->table_alias;
-  }
+    }
 }
\ No newline at end of file

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

@@ -62,7 +62,7 @@
         $join->extra[] = array(
           'field' => 'delta',
           'value' => $delta,
-          'numeric' => TRUE,
+          'numeric' => true,
         );
       }
 

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_argument_reference.inc

Indentation +6 added lines, -6 removed lines

@@ -6,10 +6,10 @@ 
  * Provide handler to replace reference with title.
  */
 class content_handler_argument_reference extends content_handler_argument_numeric {
-  /**
-   * Override the behavior of title().
-   */
-  function title_query() {
+    /**
+     * Override the behavior of title().
+     */
+    function title_query() {
     $titles = array();
     $placeholders = implode(', ', array_fill(0, sizeof($this->value), '%d'));
 
@@ -18,8 +18,8 @@ 
 
     $result = db_query("SELECT $this->name_field AS title FROM {". $table['table'] ."} WHERE ". $table['field'] ." IN ($placeholders)", $this->value);
     while ($row = db_fetch_object($result)) {
-      $titles[] = check_plain($row->title);
+        $titles[] = check_plain($row->title);
     }
     return $titles;
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     $table_data = views_fetch_data($this->name_table);
     $table = array_shift($table_data['table']['join']);
 
-    $result = db_query("SELECT $this->name_field AS title FROM {". $table['table'] ."} WHERE ". $table['field'] ." IN ($placeholders)", $this->value);
+    $result = db_query("SELECT $this->name_field AS title FROM {".$table['table']."} WHERE ".$table['field']." IN ($placeholders)", $this->value);
     while ($row = db_fetch_object($result)) {
       $titles[] = check_plain($row->title);
     }

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

@@ -16,7 +16,7 @@
     $table_data = views_fetch_data($this->name_table);
     $table = array_shift($table_data['table']['join']);
 
-    $result = db_query("SELECT $this->name_field AS title FROM {". $table['table'] ."} WHERE ". $table['field'] ." IN ($placeholders)", $this->value);
+    $result = db_query("select $this->name_field AS title FROM {". $table['table'] ."} WHERE ". $table['field'] ." IN ($placeholders)", $this->value);
     while ($row = db_fetch_object($result)) {
       $titles[] = check_plain($row->title);
     }

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_plugin_style_php_array_ac.inc

Indentation +6 added lines, -6 removed lines

@@ -6,7 +6,7 @@ 
  * Handler for 'content_php_array_autocomplete' style.
  */
 class content_plugin_style_php_array_ac extends views_plugin_style {
-  function render() {
+    function render() {
     $results = array();
 
     // Group the rows according to the grouping field, if specified.
@@ -20,15 +20,15 @@ 
     // Could be useful for select widget, though.
     $this->view->row_index = 0;
     foreach ($sets as $title => $records) {
-      foreach ($records as $label => $row) {
+        foreach ($records as $label => $row) {
         $results[$row->{$base_field}] = array(
-          'title' => $row->{$title_field_alias},
-          'rendered' => $this->row_plugin->render($row),
+            'title' => $row->{$title_field_alias},
+            'rendered' => $this->row_plugin->render($row),
         );
         $this->view->row_index++;
-      }
+        }
     }
     unset($this->view->row_index);
     return $results;
-  }
+    }
 }

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_argument_string.inc

Indentation +3 added lines, -3 removed lines

@@ -7,12 +7,12 @@
  * for field-specific subclasses to use if they need to.
  */
 class content_handler_argument_string extends views_handler_argument_string {
-  var $content_field;
+    var $content_field;
 
-  function construct() {
+    function construct() {
     parent::construct();
 
     $this->content_field = content_fields($this->definition['content_field_name']);
     $this->additional_fields = $this->definition['additional fields'];
-  }
+    }
 }
\ No newline at end of file

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_argument_numeric.inc

Indentation +3 added lines, -3 removed lines

@@ -7,12 +7,12 @@
  * for field-specific subclasses to use if they need to.
  */
 class content_handler_argument_numeric extends views_handler_argument_numeric {
-  var $content_field;
+    var $content_field;
 
-  function construct() {
+    function construct() {
     parent::construct();
 
     $this->content_field = content_fields($this->definition['content_field_name']);
     $this->additional_fields = $this->definition['additional fields'];
-  }
+    }
 }
\ No newline at end of file

drupal/sites/default/boinc/modules/contrib/cck/includes/views/handlers/content_handler_filter_string.inc

Indentation +3 added lines, -3 removed lines

@@ -7,11 +7,11 @@
  * for field-specific subclasses to use if they need to.
  */
 class content_handler_filter_string extends views_handler_filter_string {
-  var $content_field;
+    var $content_field;
 
-  function construct() {
+    function construct() {
     parent::construct();
     $this->content_field = content_fields($this->definition['content_field_name']);
     $this->additional_fields = $this->definition['additional fields'];
-  }
+    }
 }
\ No newline at end of file