BOINC / boinc

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

Indentation +53 added lines, -53 removed lines

@@ -12,40 +12,40 @@ 
  * Implementation of hook_diff()
  */
 function content_diff($old_node, $new_node) {
-  $result = array();
-  // Prevent against invalid 'nodes' built by broken 3rd party code.
-  if (isset($new_node->type)) {
+    $result = array();
+    // Prevent against invalid 'nodes' built by broken 3rd party code.
+    if (isset($new_node->type)) {
     $type = content_types($new_node->type);
     $field_types = _content_field_types();
     foreach ($type['fields'] as $field) {
-      // Ignore fields the current user is not allowed to view.
-      if (!content_access('view', $field, NULL, $new_node)) {
+        // Ignore fields the current user is not allowed to view.
+        if (!content_access('view', $field, NULL, $new_node)) {
         continue;
-      }
-      $function = $field_types[$field['type']]['module'] . '_content_diff_values';
-      $function = function_exists($function) ? $function : 'content_content_diff_values';
-      $old_values = array();
-      $new_values = array();
-      if (isset($old_node->$field['field_name'])) {
+        }
+        $function = $field_types[$field['type']]['module'] . '_content_diff_values';
+        $function = function_exists($function) ? $function : 'content_content_diff_values';
+        $old_values = array();
+        $new_values = array();
+        if (isset($old_node->$field['field_name'])) {
         $old_values = $function($old_node, $field, $old_node->$field['field_name']);
-      }
-      if (isset($new_node->$field['field_name'])) {
+        }
+        if (isset($new_node->$field['field_name'])) {
         $new_values = $function($new_node, $field, $new_node->$field['field_name']);
-      }
-      if ($old_values || $new_values) {
+        }
+        if ($old_values || $new_values) {
         $result[$field['field_name']] = array(
-          '#name' => $field['widget']['label'],
-          '#old' => $old_values,
-          '#new' => $new_values,
-          '#weight' => $field['widget']['weight'],
-          '#format' => array(
+            '#name' => $field['widget']['label'],
+            '#old' => $old_values,
+            '#new' => $new_values,
+            '#weight' => $field['widget']['weight'],
+            '#format' => array(
             'show_header' => FALSE,
-          ),
+            ),
         );
-      }
+        }
     }
-  }
-  return $result;
+    }
+    return $result;
 }
 
 /**
@@ -54,75 +54,75 @@ 
  * Note that diff.module takes care of running check_plain on the output.
  */
 function content_content_diff_values($node, $field, $items) {
-  $return = array();
-  foreach ($items as $item) {
+    $return = array();
+    foreach ($items as $item) {
     foreach (explode("\n", $item['value']) as $i) {
-      $return[] = $i;
+        $return[] = $i;
+    }
     }
-  }
-  return $return;
+    return $return;
 }
 
 if (module_exists('userreference')) {
-  /**
-   * Implementation of hook_content_diff_values.
-   */
-  function userreference_content_diff_values($node, $field, $items) {
+    /**
+     * Implementation of hook_content_diff_values.
+     */
+    function userreference_content_diff_values($node, $field, $items) {
     static $titles = array();
     // Gather ids.
     $ids = array();
     foreach ($items as $item) {
-      if ($item['uid'] && is_numeric($item['uid'])) {
+        if ($item['uid'] && is_numeric($item['uid'])) {
         $ids[] = $item['uid'];
-      }
+        }
     }
     // Fetch titles we don't know yet.
     $queried_ids = array_diff($ids, array_keys($titles));
     if ($queried_ids) {
-      $result = db_query('SELECT uid, name FROM {users} WHERE uid IN ('. db_placeholders($queried_ids) .')', $queried_ids);
-      while ($row = db_fetch_array($result)) {
+        $result = db_query('SELECT uid, name FROM {users} WHERE uid IN ('. db_placeholders($queried_ids) .')', $queried_ids);
+        while ($row = db_fetch_array($result)) {
         $titles[$row['uid']] = $row['name'];
-      }
+        }
     }
     // Return result.
     $return = array();
     foreach ($items as $item) {
-      if ($item['uid'] && isset($titles[$item['uid']])) {
+        if ($item['uid'] && isset($titles[$item['uid']])) {
         $return[] = $titles[$item['uid']];
-      }
+        }
     }
     return $return;
-  }
+    }
 }
 
 if (module_exists('nodereference')) {
-  /**
-   * Implementation of hook_content_diff_values.
-   */
-  function nodereference_content_diff_values($node, $field, $items) {
+    /**
+     * Implementation of hook_content_diff_values.
+     */
+    function nodereference_content_diff_values($node, $field, $items) {
     static $titles = array();
     // Gather ids.
     $ids = array();
     foreach ($items as $item) {
-      if ($item['nid'] && is_numeric($item['nid'])) {
+        if ($item['nid'] && is_numeric($item['nid'])) {
         $ids[] = $item['nid'];
-      }
+        }
     }
     // Fetch titles we don't know yet.
     $queried_ids = array_diff($ids, array_keys($titles));
     if ($queried_ids) {
-      $result = db_query('SELECT nid, title FROM {node} WHERE nid IN ('. db_placeholders($queried_ids) .')', $queried_ids);
-      while ($row = db_fetch_array($result)) {
+        $result = db_query('SELECT nid, title FROM {node} WHERE nid IN ('. db_placeholders($queried_ids) .')', $queried_ids);
+        while ($row = db_fetch_array($result)) {
         $titles[$row['nid']] = $row['title'];
-      }
+        }
     }
     // Return result.
     $return = array();
     foreach ($items as $item) {
-      if ($item['nid'] && isset($titles[$item['nid']])) {
+        if ($item['nid'] && isset($titles[$item['nid']])) {
         $return[] = $titles[$item['nid']];
-      }
+        }
     }
     return $return;
-  }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
       if (!content_access('view', $field, NULL, $new_node)) {
         continue;
       }
-      $function = $field_types[$field['type']]['module'] . '_content_diff_values';
+      $function = $field_types[$field['type']]['module'].'_content_diff_values';
       $function = function_exists($function) ? $function : 'content_content_diff_values';
       $old_values = array();
       $new_values = array();
@@ -79,7 +79,7 @@ 
     // Fetch titles we don't know yet.
     $queried_ids = array_diff($ids, array_keys($titles));
     if ($queried_ids) {
-      $result = db_query('SELECT uid, name FROM {users} WHERE uid IN ('. db_placeholders($queried_ids) .')', $queried_ids);
+      $result = db_query('SELECT uid, name FROM {users} WHERE uid IN ('.db_placeholders($queried_ids).')', $queried_ids);
       while ($row = db_fetch_array($result)) {
         $titles[$row['uid']] = $row['name'];
       }
@@ -111,7 +111,7 @@ 
     // Fetch titles we don't know yet.
     $queried_ids = array_diff($ids, array_keys($titles));
     if ($queried_ids) {
-      $result = db_query('SELECT nid, title FROM {node} WHERE nid IN ('. db_placeholders($queried_ids) .')', $queried_ids);
+      $result = db_query('SELECT nid, title FROM {node} WHERE nid IN ('.db_placeholders($queried_ids).')', $queried_ids);
       while ($row = db_fetch_array($result)) {
         $titles[$row['nid']] = $row['title'];
       }

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

@@ -19,7 +19,7 @@ 
     $field_types = _content_field_types();
     foreach ($type['fields'] as $field) {
       // Ignore fields the current user is not allowed to view.
-      if (!content_access('view', $field, NULL, $new_node)) {
+      if (!content_access('view', $field, null, $new_node)) {
         continue;
       }
       $function = $field_types[$field['type']]['module'] . '_content_diff_values';
@@ -39,7 +39,7 @@ 
           '#new' => $new_values,
           '#weight' => $field['widget']['weight'],
           '#format' => array(
-            'show_header' => FALSE,
+            'show_header' => false,
           ),
         );
       }

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

Indentation +191 added lines, -191 removed lines

@@ -9,12 +9,12 @@ 
  * chosen widget.
  */
 function content_form(&$form, &$form_state) {
-  $type = content_types($form['type']['#value']);
-  foreach ($type['fields'] as $field_name => $field) {
+    $type = content_types($form['type']['#value']);
+    foreach ($type['fields'] as $field_name => $field) {
     $form['#field_info'][$field['field_name']] = $field;
     $form += (array) content_field_form($form, $form_state, $field);
-  }
-  return $form;
+    }
+    return $form;
 }
 
 /**
@@ -36,18 +36,18 @@ 
  *   function will return the entire $field form element.
  */
 function content_field_form(&$form, &$form_state, $field, $get_delta = NULL) {
-  $form['#cache'] = FALSE;
-  $node = $form['#node'];
-  $addition = array();
-  $form_element = array();
-  $field_name = $field['field_name'];
-
-  $items = array();
-
-  // TODO: is the "if (function_exists($function)) {" needed ?
-  // defining the $function here makes it unclear where it is actually called
-  $function = $field['widget']['module'] .'_widget';
-  if (function_exists($function)) {
+    $form['#cache'] = FALSE;
+    $node = $form['#node'];
+    $addition = array();
+    $form_element = array();
+    $field_name = $field['field_name'];
+
+    $items = array();
+
+    // TODO: is the "if (function_exists($function)) {" needed ?
+    // defining the $function here makes it unclear where it is actually called
+    $function = $field['widget']['module'] .'_widget';
+    if (function_exists($function)) {
     // Prepare the values to be filled in the widget.
     // We look in the following places:
     // - Form submitted values
@@ -55,88 +55,88 @@ 
     //   creating a new node translation)
     // - Default values set for the field (when creating a new node).
     if (!empty($form_state['values'][$field['field_name']])) {
-      $items = $form_state['values'][$field['field_name']];
-      // If there was an AHAH add more button in this field, don't save it.
-      unset($items[$field['field_name'] .'_add_more']);
+        $items = $form_state['values'][$field['field_name']];
+        // If there was an AHAH add more button in this field, don't save it.
+        unset($items[$field['field_name'] .'_add_more']);
     }
     elseif (!empty($node->$field['field_name'])) {
-      $items = $node->$field['field_name'];
+        $items = $node->$field['field_name'];
     }
     elseif (empty($node->nid)) {
-      if (content_callback('widget', 'default value', $field) != CONTENT_CALLBACK_NONE) {
+        if (content_callback('widget', 'default value', $field) != CONTENT_CALLBACK_NONE) {
         // If a module wants to insert custom default values here,
         // it should provide a hook_default_value() function to call,
         // otherwise the content module's content_default_value() function
         // will be used.
         $callback = content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_CUSTOM ? $field['widget']['module'] .'_default_value' : 'content_default_value';
         if (function_exists($callback)) {
-          $items = $callback($form, $form_state, $field, 0);
+            $items = $callback($form, $form_state, $field, 0);
+        }
         }
-      }
     }
 
     // See if access to this form element is restricted,
     // if so, skip widget processing and just set the value.
     $access = content_access('edit', $field, NULL, $node);
     if (!$access) {
-      $addition[$field_name] = array(
+        $addition[$field_name] = array(
         '#access' => $access,
         '#type' => 'value',
         '#value' => $items,
-      );
-      return $addition;
+        );
+        return $addition;
     }
 
     // If content module handles multiple values for this form element,
     // and not selecting an individual $delta, process the multiple value form.
     if (!isset($get_delta) && content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
-      $form_element = content_multiple_value_form($form, $form_state, $field, $items);
+        $form_element = content_multiple_value_form($form, $form_state, $field, $items);
     }
     // If the widget is handling multiple values (e.g optionwidgets),
     // or selecting an individual element, just get a single form
     // element and make it the $delta value.
     else {
-      $delta = isset($get_delta) ? $get_delta : 0;
-      if ($element = $function($form, $form_state, $field, $items, $delta)) {
+        $delta = isset($get_delta) ? $get_delta : 0;
+        if ($element = $function($form, $form_state, $field, $items, $delta)) {
         $title = check_plain(t($field['widget']['label']));
         $description = content_filter_xss(t($field['widget']['description']));
         $defaults = array(
-          '#required' => $get_delta > 0 ? FALSE : $field['required'],
-          '#columns'  => array_keys($field['columns']),
-          '#title' => $title,
-          '#description' => $description,
-          '#delta' => $delta,
-          '#field_name' => $field['field_name'],
-          '#type_name' => $field['type_name'],
+            '#required' => $get_delta > 0 ? FALSE : $field['required'],
+            '#columns'  => array_keys($field['columns']),
+            '#title' => $title,
+            '#description' => $description,
+            '#delta' => $delta,
+            '#field_name' => $field['field_name'],
+            '#type_name' => $field['type_name'],
         );
         // If we're processing a specific delta value for a field where the
         // content module handles multiples, set the delta in the result.
         // For fields that handle their own processing, we can't make assumptions
         // about how the field is structured, just merge in the returned value.
         if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
-          $form_element[$delta] = array_merge($element, $defaults);
+            $form_element[$delta] = array_merge($element, $defaults);
         }
         else {
-          $form_element = array_merge($element, $defaults);
+            $form_element = array_merge($element, $defaults);
+        }
         }
-      }
     }
 
     // Field name is needed at top level as well as the individual elements
     // so the multiple values or other field level theme or processing can find it.
     if ($form_element) {
-      $defaults = array(
+        $defaults = array(
         '#field_name' => $field['field_name'],
         '#tree' => TRUE,
         '#weight' => $field['widget']['weight'],
         '#access' => $access,
         // TODO: what's the need for #count ? does not seem to be used anywhere ?
         '#count' => count($form_element),
-      );
-      $addition[$field['field_name']] = array_merge($form_element, $defaults);
+        );
+        $addition[$field['field_name']] = array_merge($form_element, $defaults);
+    }
     }
-  }
-  return $addition;
+    return $addition;
 }
 
 /**
@@ -148,42 +148,42 @@ 
  * - drag-n-drop value reordering
  */
 function content_multiple_value_form(&$form, &$form_state, $field, $items) {
-  $field_name = $field['field_name'];
+    $field_name = $field['field_name'];
 
-  switch ($field['multiple']) {
+    switch ($field['multiple']) {
     case 0:
       $max = 0;
-      break;
+        break;
     case 1:
       $filled_items = content_set_empty($field, $items);
-      $current_item_count = isset($form_state['item_count'][$field_name])
+        $current_item_count = isset($form_state['item_count'][$field_name])
                             ? $form_state['item_count'][$field_name]
                             : count($items);
-      // We always want at least one empty icon for the user to fill in.
-      $max = ($current_item_count > count($filled_items))
+        // We always want at least one empty icon for the user to fill in.
+        $max = ($current_item_count > count($filled_items))
               ? $current_item_count - 1
               : $current_item_count;
 
-      break;
+        break;
     default:
       $max = $field['multiple'] - 1;
-      break;
-  }
+        break;
+    }
 
-  $title = check_plain(t($field['widget']['label']));
-  $description = content_filter_xss(t($field['widget']['description']));
+    $title = check_plain(t($field['widget']['label']));
+    $description = content_filter_xss(t($field['widget']['description']));
 
-  $form_element = array(
+    $form_element = array(
     '#theme' => 'content_multiple_values',
     '#title' => $title,
     '#required' => $field['required'],
     '#description' => $description,
-  );
-  $function = $field['widget']['module'] .'_widget';
+    );
+    $function = $field['widget']['module'] .'_widget';
 
-  for ($delta = 0; $delta <= $max; $delta++) {
+    for ($delta = 0; $delta <= $max; $delta++) {
     if ($element = $function($form, $form_state, $field, $items, $delta)) {
-      $defaults = array(
+        $defaults = array(
         '#title' => ($field['multiple'] >= 1) ? '' : $title,
         '#description' => ($field['multiple'] >= 1) ? '' : $description,
         '#required' => $delta == 0 && $field['required'],
@@ -192,51 +192,51 @@ 
         '#columns' => array_keys($field['columns']),
         '#field_name' => $field_name,
         '#type_name' => $field['type_name'],
-      );
+        );
 
-      // Add an input field for the delta (drag-n-drop reordering), which will
-      // be hidden by tabledrag js behavior.
-      if ($field['multiple'] >= 1) {
+        // Add an input field for the delta (drag-n-drop reordering), which will
+        // be hidden by tabledrag js behavior.
+        if ($field['multiple'] >= 1) {
         // We name the element '_weight' to avoid clashing with column names
         // defined by field modules.
         $element['_weight'] = array(
-          '#type' => 'weight',
-          '#delta' => $max, // this 'delta' is the 'weight' element's property
-          '#default_value' => isset($items[$delta]['_weight']) ? $items[$delta]['_weight'] : $delta,
-          '#weight' => 100,
+            '#type' => 'weight',
+            '#delta' => $max, // this 'delta' is the 'weight' element's property
+            '#default_value' => isset($items[$delta]['_weight']) ? $items[$delta]['_weight'] : $delta,
+            '#weight' => 100,
         );
-      }
+        }
 
-      $form_element[$delta] = array_merge($element, $defaults);
+        $form_element[$delta] = array_merge($element, $defaults);
+    }
     }
-  }
 
-  // Add AHAH add more button, if not working with a programmed form.
-  if ($field['multiple'] == 1 && empty($form['#programmed'])) {
+    // Add AHAH add more button, if not working with a programmed form.
+    if ($field['multiple'] == 1 && empty($form['#programmed'])) {
     // Make sure the form is cached so ahah can work.
     $form['#cache'] = TRUE;
     $content_type = content_types($field['type_name']);
     $field_name_css = str_replace('_', '-', $field_name);
 
     $form_element[$field_name .'_add_more'] = array(
-      '#type' => 'submit',
-      '#name' => $field_name .'_add_more',
-      '#value' => t('Add another item'),
-      '#weight' => $field['widget']['weight'] + $max + 1,
-      // Submit callback for disabled JavaScript. drupal_get_form() might get
-      // the form from the cache, so we can't rely on content_form_alter()
-      // including this file. Therefore, call a proxy function to do this.
-      '#submit' => array('content_add_more_submit_proxy'),
-      '#ahah' => array(
+        '#type' => 'submit',
+        '#name' => $field_name .'_add_more',
+        '#value' => t('Add another item'),
+        '#weight' => $field['widget']['weight'] + $max + 1,
+        // Submit callback for disabled JavaScript. drupal_get_form() might get
+        // the form from the cache, so we can't rely on content_form_alter()
+        // including this file. Therefore, call a proxy function to do this.
+        '#submit' => array('content_add_more_submit_proxy'),
+        '#ahah' => array(
         'path' => 'content/js_add_more/'. $content_type['url_str'] .'/'. $field_name,
         'wrapper' => $field_name_css .'-items',
         'method' => 'replace',
         'effect' => 'fade',
-      ),
-      // When JS is disabled, the content_add_more_submit handler will find
-      // the relevant field using these entries.
-      '#field_name' => $field_name,
-      '#type_name' => $field['type_name'],
+        ),
+        // When JS is disabled, the content_add_more_submit handler will find
+        // the relevant field using these entries.
+        '#field_name' => $field_name,
+        '#type_name' => $field['type_name'],
     );
 
     // Add wrappers for the fields and 'more' button.
@@ -244,8 +244,8 @@ 
     $form_element['#suffix'] = '</div>';
     $form_element[$field_name .'_add_more']['#prefix'] = '<div class="content-add-more clear-block">';
     $form_element[$field_name .'_add_more']['#suffix'] = '</div>';
-  }
-  return $form_element;
+    }
+    return $form_element;
 }
 
 /**
@@ -254,127 +254,127 @@ 
  * entire form is rebuilt during the page reload.
  */
 function content_add_more_submit($form, &$form_state) {
-  // Set the form to rebuild and run submit handlers.
-  node_form_submit_build_node($form, $form_state);
-  $field_name = $form_state['clicked_button']['#field_name'];
-  $type_name = $form_state['clicked_button']['#type_name'];
+    // Set the form to rebuild and run submit handlers.
+    node_form_submit_build_node($form, $form_state);
+    $field_name = $form_state['clicked_button']['#field_name'];
+    $type_name = $form_state['clicked_button']['#type_name'];
 
-  // Make the changes we want to the form state.
-  if ($form_state['values'][$field_name][$field_name .'_add_more']) {
+    // Make the changes we want to the form state.
+    if ($form_state['values'][$field_name][$field_name .'_add_more']) {
     $form_state['item_count'][$field_name] = count($form_state['values'][$field_name]);
-  }
+    }
 }
 
 /**
  * Menu callback for AHAH addition of new empty widgets.
  */
 function content_add_more_js($type_name_url, $field_name) {
-  $type = content_types($type_name_url);
-  $field = content_fields($field_name, $type['type']);
+    $type = content_types($type_name_url);
+    $field = content_fields($field_name, $type['type']);
 
-  if (($field['multiple'] != 1) || empty($_POST['form_build_id'])) {
+    if (($field['multiple'] != 1) || empty($_POST['form_build_id'])) {
     // Invalid request.
     drupal_json(array('data' => ''));
     exit;
-  }
+    }
 
-  // Retrieve the cached form.
-  $form_state = array('submitted' => FALSE);
-  $form_build_id = $_POST['form_build_id'];
-  $form = form_get_cache($form_build_id, $form_state);
-  if (!$form) {
+    // Retrieve the cached form.
+    $form_state = array('submitted' => FALSE);
+    $form_build_id = $_POST['form_build_id'];
+    $form = form_get_cache($form_build_id, $form_state);
+    if (!$form) {
     // Invalid form_build_id.
     drupal_json(array('data' => ''));
     exit;
-  }
-
-  // We don't simply return a new empty widget to append to existing ones, because
-  // - ahah.js won't simply let us add a new row to a table
-  // - attaching the 'draggable' behavior won't be easy
-  // So we resort to rebuilding the whole table of widgets including the existing ones,
-  // which makes us jump through a few hoops.
-
-  // The form that we get from the cache is unbuilt. We need to build it so that
-  // _value callbacks can be executed and $form_state['values'] populated.
-  // We only want to affect $form_state['values'], not the $form itself
-  // (built forms aren't supposed to enter the cache) nor the rest of $form_data,
-  // so we use copies of $form and $form_data.
-  $form_copy = $form;
-  $form_state_copy = $form_state;
-  $form_copy['#post'] = array();
-  form_builder($_POST['form_id'], $form_copy, $form_state_copy);
-  // Just grab the data we need.
-  $form_state['values'] = $form_state_copy['values'];
-  // Reset cached ids, so that they don't affect the actual form we output.
-  form_clean_id(NULL, TRUE);
-
-  // Sort the $form_state['values'] we just built *and* the incoming $_POST data
-  // according to d-n-d reordering.
-  unset($form_state['values'][$field_name][$field['field_name'] .'_add_more']);
-  foreach ($_POST[$field_name] as $delta => $item) {
+    }
+
+    // We don't simply return a new empty widget to append to existing ones, because
+    // - ahah.js won't simply let us add a new row to a table
+    // - attaching the 'draggable' behavior won't be easy
+    // So we resort to rebuilding the whole table of widgets including the existing ones,
+    // which makes us jump through a few hoops.
+
+    // The form that we get from the cache is unbuilt. We need to build it so that
+    // _value callbacks can be executed and $form_state['values'] populated.
+    // We only want to affect $form_state['values'], not the $form itself
+    // (built forms aren't supposed to enter the cache) nor the rest of $form_data,
+    // so we use copies of $form and $form_data.
+    $form_copy = $form;
+    $form_state_copy = $form_state;
+    $form_copy['#post'] = array();
+    form_builder($_POST['form_id'], $form_copy, $form_state_copy);
+    // Just grab the data we need.
+    $form_state['values'] = $form_state_copy['values'];
+    // Reset cached ids, so that they don't affect the actual form we output.
+    form_clean_id(NULL, TRUE);
+
+    // Sort the $form_state['values'] we just built *and* the incoming $_POST data
+    // according to d-n-d reordering.
+    unset($form_state['values'][$field_name][$field['field_name'] .'_add_more']);
+    foreach ($_POST[$field_name] as $delta => $item) {
     $form_state['values'][$field_name][$delta]['_weight'] = $item['_weight'];
-  }
-  $form_state['values'][$field_name] = _content_sort_items($field, $form_state['values'][$field_name]);
-  $_POST[$field_name] = _content_sort_items($field, $_POST[$field_name]);
-
-  // Build our new form element for the whole field, asking for one more element.
-  $form_state['item_count'] = array($field_name => count($_POST[$field_name]) + 1);
-  $form_element = content_field_form($form, $form_state, $field);
-  // Let other modules alter it.
-  // We pass an empty array as hook_form_alter's usual 'form_state' parameter,
-  // instead of $form_state (for reasons we may never remember).
-  // However, this argument is still expected to be passed by-reference
-  // (and PHP5.3 will throw an error if it isn't.) This leads to:
-  $data = &$form_element;
-  $empty_form_state = array();
-  $data['__drupal_alter_by_ref'] = array(&$empty_form_state);
-  drupal_alter('form', $data, 'content_add_more_js');
-
-  // Add the new element at the right place in the (original, unbuilt) form.
-  if (module_exists('fieldgroup') && ($group_name = _fieldgroup_field_get_group($type['type'], $field_name))) {
+    }
+    $form_state['values'][$field_name] = _content_sort_items($field, $form_state['values'][$field_name]);
+    $_POST[$field_name] = _content_sort_items($field, $_POST[$field_name]);
+
+    // Build our new form element for the whole field, asking for one more element.
+    $form_state['item_count'] = array($field_name => count($_POST[$field_name]) + 1);
+    $form_element = content_field_form($form, $form_state, $field);
+    // Let other modules alter it.
+    // We pass an empty array as hook_form_alter's usual 'form_state' parameter,
+    // instead of $form_state (for reasons we may never remember).
+    // However, this argument is still expected to be passed by-reference
+    // (and PHP5.3 will throw an error if it isn't.) This leads to:
+    $data = &$form_element;
+    $empty_form_state = array();
+    $data['__drupal_alter_by_ref'] = array(&$empty_form_state);
+    drupal_alter('form', $data, 'content_add_more_js');
+
+    // Add the new element at the right place in the (original, unbuilt) form.
+    if (module_exists('fieldgroup') && ($group_name = _fieldgroup_field_get_group($type['type'], $field_name))) {
     $form[$group_name][$field_name] = $form_element[$field_name];
-  }
-  else {
+    }
+    else {
     $form[$field_name] = $form_element[$field_name];
-  }
-
-  // Save the new definition of the form.
-  $form_state['values'] = array();
-  form_set_cache($form_build_id, $form, $form_state);
-
-  // Build the new form against the incoming $_POST values so that we can
-  // render the new element.
-  $delta = max(array_keys($_POST[$field_name])) + 1;
-  $_POST[$field_name][$delta]['_weight'] = $delta;
-  $form_state = array('submitted' => FALSE);
-  $form += array(
+    }
+
+    // Save the new definition of the form.
+    $form_state['values'] = array();
+    form_set_cache($form_build_id, $form, $form_state);
+
+    // Build the new form against the incoming $_POST values so that we can
+    // render the new element.
+    $delta = max(array_keys($_POST[$field_name])) + 1;
+    $_POST[$field_name][$delta]['_weight'] = $delta;
+    $form_state = array('submitted' => FALSE);
+    $form += array(
     '#post' => $_POST,
     '#programmed' => FALSE,
-  );
-  $form = form_builder($_POST['form_id'], $form, $form_state);
-
-  // Render the new output.
-  $field_form = (!empty($group_name)) ? $form[$group_name][$field_name] : $form[$field_name];
-  // We add a div around the new content to receive the ahah effect.
-  $field_form[$delta]['#prefix'] = '<div class="ahah-new-content">'. (isset($field_form[$delta]['#prefix']) ? $field_form[$delta]['#prefix'] : '');
-  $field_form[$delta]['#suffix'] = (isset($field_form[$delta]['#suffix']) ? $field_form[$delta]['#suffix'] : '') .'</div>';
-  // Prevent duplicate wrapper.
-  unset($field_form['#prefix'], $field_form['#suffix']);
-
-  // If a newly inserted widget contains AHAH behaviors, they normally won't
-  // work because AHAH doesn't know about those - it just attaches to the exact
-  // form elements that were initially specified in the Drupal.settings object.
-  // The new ones didn't exist then, so we need to update Drupal.settings
-  // by ourselves in order to let AHAH know about those new form elements.
-  $javascript = drupal_add_js(NULL, NULL);
-  $output_js = isset($javascript['setting']) ? '<script type="text/javascript">jQuery.extend(Drupal.settings, '. drupal_to_js(call_user_func_array('array_merge_recursive', $javascript['setting'])) .');</script>' : '';
-
-  $output = theme('status_messages') . drupal_render($field_form) . $output_js;
-
-  // Using drupal_json() breaks filefield's file upload, because the jQuery
-  // Form plugin handles file uploads in a way that is not compatible with
-  // 'text/javascript' response type.
-  $GLOBALS['devel_shutdown'] =  FALSE;
-  print drupal_to_js(array('status' => TRUE, 'data' => $output));
-  exit;
+    );
+    $form = form_builder($_POST['form_id'], $form, $form_state);
+
+    // Render the new output.
+    $field_form = (!empty($group_name)) ? $form[$group_name][$field_name] : $form[$field_name];
+    // We add a div around the new content to receive the ahah effect.
+    $field_form[$delta]['#prefix'] = '<div class="ahah-new-content">'. (isset($field_form[$delta]['#prefix']) ? $field_form[$delta]['#prefix'] : '');
+    $field_form[$delta]['#suffix'] = (isset($field_form[$delta]['#suffix']) ? $field_form[$delta]['#suffix'] : '') .'</div>';
+    // Prevent duplicate wrapper.
+    unset($field_form['#prefix'], $field_form['#suffix']);
+
+    // If a newly inserted widget contains AHAH behaviors, they normally won't
+    // work because AHAH doesn't know about those - it just attaches to the exact
+    // form elements that were initially specified in the Drupal.settings object.
+    // The new ones didn't exist then, so we need to update Drupal.settings
+    // by ourselves in order to let AHAH know about those new form elements.
+    $javascript = drupal_add_js(NULL, NULL);
+    $output_js = isset($javascript['setting']) ? '<script type="text/javascript">jQuery.extend(Drupal.settings, '. drupal_to_js(call_user_func_array('array_merge_recursive', $javascript['setting'])) .');</script>' : '';
+
+    $output = theme('status_messages') . drupal_render($field_form) . $output_js;
+
+    // Using drupal_json() breaks filefield's file upload, because the jQuery
+    // Form plugin handles file uploads in a way that is not compatible with
+    // 'text/javascript' response type.
+    $GLOBALS['devel_shutdown'] =  FALSE;
+    print drupal_to_js(array('status' => TRUE, 'data' => $output));
+    exit;
 }

Switch Indentation +17 added lines, -17 removed lines

@@ -151,23 +151,23 @@
   $field_name = $field['field_name'];
 
   switch ($field['multiple']) {
-    case 0:
-      $max = 0;
-      break;
-    case 1:
-      $filled_items = content_set_empty($field, $items);
-      $current_item_count = isset($form_state['item_count'][$field_name])
-                            ? $form_state['item_count'][$field_name]
-                            : count($items);
-      // We always want at least one empty icon for the user to fill in.
-      $max = ($current_item_count > count($filled_items))
-              ? $current_item_count - 1
-              : $current_item_count;
-
-      break;
-    default:
-      $max = $field['multiple'] - 1;
-      break;
+  case 0:
+    $max = 0;
+    break;
+  case 1:
+    $filled_items = content_set_empty($field, $items);
+    $current_item_count = isset($form_state['item_count'][$field_name])
+                          ? $form_state['item_count'][$field_name]
+                          : count($items);
+    // We always want at least one empty icon for the user to fill in.
+    $max = ($current_item_count > count($filled_items))
+            ? $current_item_count - 1
+            : $current_item_count;
+
+    break;
+  default:
+    $max = $field['multiple'] - 1;
+    break;
   }
 
   $title = check_plain(t($field['widget']['label']));

Spacing +19 added lines, -19 removed lines

@@ -12,7 +12,7 @@ 
   $type = content_types($form['type']['#value']);
   foreach ($type['fields'] as $field_name => $field) {
     $form['#field_info'][$field['field_name']] = $field;
-    $form += (array) content_field_form($form, $form_state, $field);
+    $form += (array)content_field_form($form, $form_state, $field);
   }
   return $form;
 }
@@ -46,7 +46,7 @@ 
 
   // TODO: is the "if (function_exists($function)) {" needed ?
   // defining the $function here makes it unclear where it is actually called
-  $function = $field['widget']['module'] .'_widget';
+  $function = $field['widget']['module'].'_widget';
   if (function_exists($function)) {
     // Prepare the values to be filled in the widget.
     // We look in the following places:
@@ -57,7 +57,7 @@ 
     if (!empty($form_state['values'][$field['field_name']])) {
       $items = $form_state['values'][$field['field_name']];
       // If there was an AHAH add more button in this field, don't save it.
-      unset($items[$field['field_name'] .'_add_more']);
+      unset($items[$field['field_name'].'_add_more']);
     }
     elseif (!empty($node->$field['field_name'])) {
       $items = $node->$field['field_name'];
@@ -68,7 +68,7 @@ 
         // it should provide a hook_default_value() function to call,
         // otherwise the content module's content_default_value() function
         // will be used.
-        $callback = content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_CUSTOM ? $field['widget']['module'] .'_default_value' : 'content_default_value';
+        $callback = content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_CUSTOM ? $field['widget']['module'].'_default_value' : 'content_default_value';
         if (function_exists($callback)) {
           $items = $callback($form, $form_state, $field, 0);
         }
@@ -179,7 +179,7 @@ 
     '#required' => $field['required'],
     '#description' => $description,
   );
-  $function = $field['widget']['module'] .'_widget';
+  $function = $field['widget']['module'].'_widget';
 
   for ($delta = 0; $delta <= $max; $delta++) {
     if ($element = $function($form, $form_state, $field, $items, $delta)) {
@@ -218,9 +218,9 @@ 
     $content_type = content_types($field['type_name']);
     $field_name_css = str_replace('_', '-', $field_name);
 
-    $form_element[$field_name .'_add_more'] = array(
+    $form_element[$field_name.'_add_more'] = array(
       '#type' => 'submit',
-      '#name' => $field_name .'_add_more',
+      '#name' => $field_name.'_add_more',
       '#value' => t('Add another item'),
       '#weight' => $field['widget']['weight'] + $max + 1,
       // Submit callback for disabled JavaScript. drupal_get_form() might get
@@ -228,8 +228,8 @@ 
       // including this file. Therefore, call a proxy function to do this.
       '#submit' => array('content_add_more_submit_proxy'),
       '#ahah' => array(
-        'path' => 'content/js_add_more/'. $content_type['url_str'] .'/'. $field_name,
-        'wrapper' => $field_name_css .'-items',
+        'path' => 'content/js_add_more/'.$content_type['url_str'].'/'.$field_name,
+        'wrapper' => $field_name_css.'-items',
         'method' => 'replace',
         'effect' => 'fade',
       ),
@@ -240,10 +240,10 @@ 
     );
 
     // Add wrappers for the fields and 'more' button.
-    $form_element['#prefix'] = '<div id="'. $field_name_css .'-items">';
+    $form_element['#prefix'] = '<div id="'.$field_name_css.'-items">';
     $form_element['#suffix'] = '</div>';
-    $form_element[$field_name .'_add_more']['#prefix'] = '<div class="content-add-more clear-block">';
-    $form_element[$field_name .'_add_more']['#suffix'] = '</div>';
+    $form_element[$field_name.'_add_more']['#prefix'] = '<div class="content-add-more clear-block">';
+    $form_element[$field_name.'_add_more']['#suffix'] = '</div>';
   }
   return $form_element;
 }
@@ -260,7 +260,7 @@ 
   $type_name = $form_state['clicked_button']['#type_name'];
 
   // Make the changes we want to the form state.
-  if ($form_state['values'][$field_name][$field_name .'_add_more']) {
+  if ($form_state['values'][$field_name][$field_name.'_add_more']) {
     $form_state['item_count'][$field_name] = count($form_state['values'][$field_name]);
   }
 }
@@ -310,7 +310,7 @@ 
 
   // Sort the $form_state['values'] we just built *and* the incoming $_POST data
   // according to d-n-d reordering.
-  unset($form_state['values'][$field_name][$field['field_name'] .'_add_more']);
+  unset($form_state['values'][$field_name][$field['field_name'].'_add_more']);
   foreach ($_POST[$field_name] as $delta => $item) {
     $form_state['values'][$field_name][$delta]['_weight'] = $item['_weight'];
   }
@@ -356,8 +356,8 @@ 
   // Render the new output.
   $field_form = (!empty($group_name)) ? $form[$group_name][$field_name] : $form[$field_name];
   // We add a div around the new content to receive the ahah effect.
-  $field_form[$delta]['#prefix'] = '<div class="ahah-new-content">'. (isset($field_form[$delta]['#prefix']) ? $field_form[$delta]['#prefix'] : '');
-  $field_form[$delta]['#suffix'] = (isset($field_form[$delta]['#suffix']) ? $field_form[$delta]['#suffix'] : '') .'</div>';
+  $field_form[$delta]['#prefix'] = '<div class="ahah-new-content">'.(isset($field_form[$delta]['#prefix']) ? $field_form[$delta]['#prefix'] : '');
+  $field_form[$delta]['#suffix'] = (isset($field_form[$delta]['#suffix']) ? $field_form[$delta]['#suffix'] : '').'</div>';
   // Prevent duplicate wrapper.
   unset($field_form['#prefix'], $field_form['#suffix']);
 
@@ -367,14 +367,14 @@ 
   // The new ones didn't exist then, so we need to update Drupal.settings
   // by ourselves in order to let AHAH know about those new form elements.
   $javascript = drupal_add_js(NULL, NULL);
-  $output_js = isset($javascript['setting']) ? '<script type="text/javascript">jQuery.extend(Drupal.settings, '. drupal_to_js(call_user_func_array('array_merge_recursive', $javascript['setting'])) .');</script>' : '';
+  $output_js = isset($javascript['setting']) ? '<script type="text/javascript">jQuery.extend(Drupal.settings, '.drupal_to_js(call_user_func_array('array_merge_recursive', $javascript['setting'])).');</script>' : '';
 
-  $output = theme('status_messages') . drupal_render($field_form) . $output_js;
+  $output = theme('status_messages').drupal_render($field_form).$output_js;
 
   // Using drupal_json() breaks filefield's file upload, because the jQuery
   // Form plugin handles file uploads in a way that is not compatible with
   // 'text/javascript' response type.
-  $GLOBALS['devel_shutdown'] =  FALSE;
+  $GLOBALS['devel_shutdown'] = FALSE;
   print drupal_to_js(array('status' => TRUE, 'data' => $output));
   exit;
 }

Braces +4 added lines, -8 removed lines

@@ -58,11 +58,9 @@ 
       $items = $form_state['values'][$field['field_name']];
       // If there was an AHAH add more button in this field, don't save it.
       unset($items[$field['field_name'] .'_add_more']);
-    }
-    elseif (!empty($node->$field['field_name'])) {
+    } elseif (!empty($node->$field['field_name'])) {
       $items = $node->$field['field_name'];
-    }
-    elseif (empty($node->nid)) {
+    } elseif (empty($node->nid)) {
       if (content_callback('widget', 'default value', $field) != CONTENT_CALLBACK_NONE) {
         // If a module wants to insert custom default values here,
         // it should provide a hook_default_value() function to call,
@@ -115,8 +113,7 @@ 
         // about how the field is structured, just merge in the returned value.
         if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
           $form_element[$delta] = array_merge($element, $defaults);
-        }
-        else {
+        } else {
           $form_element = array_merge($element, $defaults);
         }
       }
@@ -333,8 +330,7 @@ 
   // Add the new element at the right place in the (original, unbuilt) form.
   if (module_exists('fieldgroup') && ($group_name = _fieldgroup_field_get_group($type['type'], $field_name))) {
     $form[$group_name][$field_name] = $form_element[$field_name];
-  }
-  else {
+  } else {
     $form[$field_name] = $form_element[$field_name];
   }
 

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

@@ -35,8 +35,8 @@ 
  *   use to get only a specific delta value of a multiple value field, otherwise
  *   function will return the entire $field form element.
  */
-function content_field_form(&$form, &$form_state, $field, $get_delta = NULL) {
-  $form['#cache'] = FALSE;
+function content_field_form(&$form, &$form_state, $field, $get_delta = null) {
+  $form['#cache'] = false;
   $node = $form['#node'];
   $addition = array();
   $form_element = array();
@@ -77,7 +77,7 @@ 
 
     // See if access to this form element is restricted,
     // if so, skip widget processing and just set the value.
-    $access = content_access('edit', $field, NULL, $node);
+    $access = content_access('edit', $field, null, $node);
     if (!$access) {
       $addition[$field_name] = array(
         '#access' => $access,
@@ -101,7 +101,7 @@ 
         $title = check_plain(t($field['widget']['label']));
         $description = content_filter_xss(t($field['widget']['description']));
         $defaults = array(
-          '#required' => $get_delta > 0 ? FALSE : $field['required'],
+          '#required' => $get_delta > 0 ? false : $field['required'],
           '#columns'  => array_keys($field['columns']),
           '#title' => $title,
           '#description' => $description,
@@ -127,7 +127,7 @@ 
     if ($form_element) {
       $defaults = array(
         '#field_name' => $field['field_name'],
-        '#tree' => TRUE,
+        '#tree' => true,
         '#weight' => $field['widget']['weight'],
         '#access' => $access,
         // TODO: what's the need for #count ? does not seem to be used anywhere ?
@@ -214,7 +214,7 @@ 
   // Add AHAH add more button, if not working with a programmed form.
   if ($field['multiple'] == 1 && empty($form['#programmed'])) {
     // Make sure the form is cached so ahah can work.
-    $form['#cache'] = TRUE;
+    $form['#cache'] = true;
     $content_type = content_types($field['type_name']);
     $field_name_css = str_replace('_', '-', $field_name);
 
@@ -279,7 +279,7 @@ 
   }
 
   // Retrieve the cached form.
-  $form_state = array('submitted' => FALSE);
+  $form_state = array('submitted' => false);
   $form_build_id = $_POST['form_build_id'];
   $form = form_get_cache($form_build_id, $form_state);
   if (!$form) {
@@ -306,7 +306,7 @@ 
   // Just grab the data we need.
   $form_state['values'] = $form_state_copy['values'];
   // Reset cached ids, so that they don't affect the actual form we output.
-  form_clean_id(NULL, TRUE);
+  form_clean_id(null, true);
 
   // Sort the $form_state['values'] we just built *and* the incoming $_POST data
   // according to d-n-d reordering.
@@ -346,10 +346,10 @@ 
   // render the new element.
   $delta = max(array_keys($_POST[$field_name])) + 1;
   $_POST[$field_name][$delta]['_weight'] = $delta;
-  $form_state = array('submitted' => FALSE);
+  $form_state = array('submitted' => false);
   $form += array(
     '#post' => $_POST,
-    '#programmed' => FALSE,
+    '#programmed' => false,
   );
   $form = form_builder($_POST['form_id'], $form, $form_state);
 
@@ -366,7 +366,7 @@ 
   // form elements that were initially specified in the Drupal.settings object.
   // The new ones didn't exist then, so we need to update Drupal.settings
   // by ourselves in order to let AHAH know about those new form elements.
-  $javascript = drupal_add_js(NULL, NULL);
+  $javascript = drupal_add_js(null, null);
   $output_js = isset($javascript['setting']) ? '<script type="text/javascript">jQuery.extend(Drupal.settings, '. drupal_to_js(call_user_func_array('array_merge_recursive', $javascript['setting'])) .');</script>' : '';
 
   $output = theme('status_messages') . drupal_render($field_form) . $output_js;
@@ -374,7 +374,7 @@ 
   // Using drupal_json() breaks filefield's file upload, because the jQuery
   // Form plugin handles file uploads in a way that is not compatible with
   // 'text/javascript' response type.
-  $GLOBALS['devel_shutdown'] =  FALSE;
-  print drupal_to_js(array('status' => TRUE, 'data' => $output));
+  $GLOBALS['devel_shutdown'] =  false;
+  print drupal_to_js(array('status' => true, 'data' => $output));
   exit;
 }

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

Indentation +85 added lines, -85 removed lines

@@ -19,48 +19,48 @@ 
  * information in each of its CCK fields.
  **/
 function content_generate_fields(&$node, $field) {
-  $type_name = $node->type;
-  $type = content_types($type_name);
-  $field_types = _content_field_types();
+    $type_name = $node->type;
+    $type = content_types($type_name);
+    $field_types = _content_field_types();
 
-  if (!empty($type['fields'])) {
+    if (!empty($type['fields'])) {
     foreach ($type['fields'] as $field) {
-      $node_field = array();
-      // If module handles own multiples, then only call its hook once.
-      if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
+        $node_field = array();
+        // If module handles own multiples, then only call its hook once.
+        if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
         $max = 0;
-      }
-      else {
+        }
+        else {
         switch ($field['multiple']) {
-          case 0:
+            case 0:
             $max = 0;
             break;
-          case 1:
+            case 1:
             $max = rand(0, 3); //just an arbitrary number for 'unlimited'
             break;
-          default:
+            default:
             $max = $field['multiple'];
             break;
         }
-      }
-      for ($i = 0; $i <= $max; $i++) {
+        }
+        for ($i = 0; $i <= $max; $i++) {
         $module = $field_types[$field['type']]['module'];
         $function = $module .'_content_generate';
         if (function_exists($function)) {
-          $result = $function($node, $field); // $items, $teaser, $page
-          if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
+            $result = $function($node, $field); // $items, $teaser, $page
+            if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
             // Fields that handle their own multiples will add their own deltas.
             $node_field = $result;
-          }
-          else {
+            }
+            else {
             // When multiples are handled by the content module, add a delta for each result.
             $node_field[$i] = $result;
-          }
+            }
         }
-      }
-      $node->{$field['field_name']} = $node_field;
+        }
+        $node->{$field['field_name']} = $node_field;
+    }
     }
-  }
 }
 
 /**
@@ -70,149 +70,149 @@ 
  * a random number of times and compile the results into a node array.
  */
 function content_devel_multiple($function, $node, $field) {
-  $node_field = array();
-  if (function_exists($function)) {
+    $node_field = array();
+    if (function_exists($function)) {
     switch ($field['multiple']) {
-      case 0:
+        case 0:
         $max = 0;
         break;
-      case 1:
+        case 1:
         $max = rand(0, 3); //just an arbitrary number for 'unlimited'
         break;
-      default:
+        default:
         $max = $field['multiple'];
         break;
     }
     for ($i = 0; $i <= $max; $i++) {
-      $node_field[$i] = $function($node, $field);
+        $node_field[$i] = $function($node, $field);
+    }
     }
-  }
-  return $node_field;
+    return $node_field;
 }
 
 if (module_exists('text')) {
-  function text_content_generate($node, $field) {
+    function text_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
-      return content_devel_multiple('_text_content_generate', $node, $field);
+        return content_devel_multiple('_text_content_generate', $node, $field);
     }
     else {
-      return _text_content_generate($node, $field);
+        return _text_content_generate($node, $field);
+    }
     }
-  }
 
-  function _text_content_generate($node, $field) {
+    function _text_content_generate($node, $field) {
     $node_field = array();
     if ($field['widget']['type'] == 'text_textarea') {
-      $format = $field['text_processing'] ? rand(0, 3) : 0;
-      $node_field['value'] = devel_create_content($format);
-      $node_field['format'] = $format;
+        $format = $field['text_processing'] ? rand(0, 3) : 0;
+        $node_field['value'] = devel_create_content($format);
+        $node_field['format'] = $format;
     }
     else {
-      $allowed_values = content_allowed_values($field);
-      if (!empty($allowed_values)) {
+        $allowed_values = content_allowed_values($field);
+        if (!empty($allowed_values)) {
         // Just pick one of the specified allowed values.
         $node_field['value'] = array_rand($allowed_values);
-      }
-      else {
+        }
+        else {
         // Generate a value that respects max_length.
         if (empty($field['max_length'])) {
-          $field['max_length'] = 12;
+            $field['max_length'] = 12;
         }
         $node_field['value'] = user_password($field['max_length']);
-      }
+        }
     }
     return $node_field;
-  }
+    }
 }
 
 if (module_exists('number')) {
-  function number_content_generate($node, $field) {
+    function number_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
-      return content_devel_multiple('_number_content_generate', $node, $field);
+        return content_devel_multiple('_number_content_generate', $node, $field);
     }
     else {
-      return _number_content_generate($node, $field);
+        return _number_content_generate($node, $field);
+    }
     }
-  }
 
-  function _number_content_generate($node, $field) {
+    function _number_content_generate($node, $field) {
     $node_field = array();
     $allowed_values = content_allowed_values($field);
     if (!empty($allowed_values)) {
-      // Just pick one of the specified allowed values.
-      $node_field['value'] = array_rand($allowed_values);
+        // Just pick one of the specified allowed values.
+        $node_field['value'] = array_rand($allowed_values);
     }
     else {
-      $min = is_numeric($field['min']) ? $field['min'] : 0;
-      switch ($field['type']) {
+        $min = is_numeric($field['min']) ? $field['min'] : 0;
+        switch ($field['type']) {
         case 'number_integer':
           $max = is_numeric($field['max']) ? $field['max'] : 10000;
-          $decimal = 0;
-          $scale = 0;
-          break;
+            $decimal = 0;
+            $scale = 0;
+            break;
 
         case 'number_decimal':
           $precision = is_numeric($field['precision']) ? $field['precision'] : 10;
-          $scale = is_numeric($field['scale']) ? $field['scale'] : 2;
-          $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
-          $decimal = rand(0, (10 * $scale)) / 100;
-          break;
+            $scale = is_numeric($field['scale']) ? $field['scale'] : 2;
+            $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
+            $decimal = rand(0, (10 * $scale)) / 100;
+            break;
 
         case 'number_float':
           $precision = rand(10, 32);
-          $scale = rand(0, 2);
-          $decimal = rand(0, (10 * $scale)) / 100;
-          $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
-          break;
-      }
-      $node_field['value'] = round((rand($min, $max) + $decimal), $scale);
+            $scale = rand(0, 2);
+            $decimal = rand(0, (10 * $scale)) / 100;
+            $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
+            break;
+        }
+        $node_field['value'] = round((rand($min, $max) + $decimal), $scale);
     }
     return $node_field;
-  }
+    }
 }
 
 if (module_exists('nodereference')) {
-  function nodereference_content_generate($node, $field) {
+    function nodereference_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
-      return content_devel_multiple('_nodereference_content_generate', $node, $field);
+        return content_devel_multiple('_nodereference_content_generate', $node, $field);
     }
     else {
-      return _nodereference_content_generate($node, $field);
+        return _nodereference_content_generate($node, $field);
+    }
     }
-  }
 
-  function _nodereference_content_generate($node, $field) {
+    function _nodereference_content_generate($node, $field) {
     $node_field = array();
     $allowed_values = nodereference_allowed_values($field);
     unset($allowed_values[0]);
     if (!empty($allowed_values)) {
-      // Just pick one of the specified allowed values.
-      $node_field['nid'] = array_rand($allowed_values);
+        // Just pick one of the specified allowed values.
+        $node_field['nid'] = array_rand($allowed_values);
     }
     return $node_field;
-  }
+    }
 }
 
 if (module_exists('userreference')) {
-  function userreference_content_generate($node, $field) {
+    function userreference_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
-      return content_devel_multiple('_userreference_content_generate', $node, $field);
+        return content_devel_multiple('_userreference_content_generate', $node, $field);
     }
     else {
-      return _userreference_content_generate($node, $field);
+        return _userreference_content_generate($node, $field);
+    }
     }
-  }
 
-  function _userreference_content_generate($node, $field) {
+    function _userreference_content_generate($node, $field) {
     $node_field = array();
     $allowed_values = userreference_allowed_values($field);
     if (isset($allowed_values['none'])) {
-      unset($allowed_values['none']);
+        unset($allowed_values['none']);
     }
     if (!empty($allowed_values)) {
-      // Just pick one of the specified allowed values.
-      $node_field['uid'] = array_rand($allowed_values);
+        // Just pick one of the specified allowed values.
+        $node_field['uid'] = array_rand($allowed_values);
     }
     return $node_field;
-  }
+    }
 }
\ No newline at end of file

Switch Indentation +35 added lines, -35 removed lines

@@ -32,15 +32,15 @@ 
       }
       else {
         switch ($field['multiple']) {
-          case 0:
-            $max = 0;
-            break;
-          case 1:
-            $max = rand(0, 3); //just an arbitrary number for 'unlimited'
-            break;
-          default:
-            $max = $field['multiple'];
-            break;
+        case 0:
+          $max = 0;
+          break;
+        case 1:
+          $max = rand(0, 3); //just an arbitrary number for 'unlimited'
+          break;
+        default:
+          $max = $field['multiple'];
+          break;
         }
       }
       for ($i = 0; $i <= $max; $i++) {
@@ -73,15 +73,15 @@ 
   $node_field = array();
   if (function_exists($function)) {
     switch ($field['multiple']) {
-      case 0:
-        $max = 0;
-        break;
-      case 1:
-        $max = rand(0, 3); //just an arbitrary number for 'unlimited'
-        break;
-      default:
-        $max = $field['multiple'];
-        break;
+    case 0:
+      $max = 0;
+      break;
+    case 1:
+      $max = rand(0, 3); //just an arbitrary number for 'unlimited'
+      break;
+    default:
+      $max = $field['multiple'];
+      break;
     }
     for ($i = 0; $i <= $max; $i++) {
       $node_field[$i] = $function($node, $field);
@@ -145,25 +145,25 @@ 
     else {
       $min = is_numeric($field['min']) ? $field['min'] : 0;
       switch ($field['type']) {
-        case 'number_integer':
-          $max = is_numeric($field['max']) ? $field['max'] : 10000;
-          $decimal = 0;
-          $scale = 0;
-          break;
+      case 'number_integer':
+        $max = is_numeric($field['max']) ? $field['max'] : 10000;
+        $decimal = 0;
+        $scale = 0;
+        break;
 
-        case 'number_decimal':
-          $precision = is_numeric($field['precision']) ? $field['precision'] : 10;
-          $scale = is_numeric($field['scale']) ? $field['scale'] : 2;
-          $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
-          $decimal = rand(0, (10 * $scale)) / 100;
-          break;
+      case 'number_decimal':
+        $precision = is_numeric($field['precision']) ? $field['precision'] : 10;
+        $scale = is_numeric($field['scale']) ? $field['scale'] : 2;
+        $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
+        $decimal = rand(0, (10 * $scale)) / 100;
+        break;
 
-        case 'number_float':
-          $precision = rand(10, 32);
-          $scale = rand(0, 2);
-          $decimal = rand(0, (10 * $scale)) / 100;
-          $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
-          break;
+      case 'number_float':
+        $precision = rand(10, 32);
+        $scale = rand(0, 2);
+        $decimal = rand(0, (10 * $scale)) / 100;
+        $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
+        break;
       }
       $node_field['value'] = round((rand($min, $max) + $decimal), $scale);
     }

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
       }
       for ($i = 0; $i <= $max; $i++) {
         $module = $field_types[$field['type']]['module'];
-        $function = $module .'_content_generate';
+        $function = $module.'_content_generate';
         if (function_exists($function)) {
           $result = $function($node, $field); // $items, $teaser, $page
           if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
@@ -155,13 +155,13 @@ 
           $precision = is_numeric($field['precision']) ? $field['precision'] : 10;
           $scale = is_numeric($field['scale']) ? $field['scale'] : 2;
           $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
-          $decimal = rand(0, (10 * $scale)) / 100;
+          $decimal = rand(0, (10*$scale))/100;
           break;
 
         case 'number_float':
           $precision = rand(10, 32);
           $scale = rand(0, 2);
-          $decimal = rand(0, (10 * $scale)) / 100;
+          $decimal = rand(0, (10*$scale))/100;
           $max = is_numeric($field['max']) ? $field['max'] : pow(10, ($precision - $scale));
           break;
       }

Braces +9 added lines, -18 removed lines

@@ -29,8 +29,7 @@ 
       // If module handles own multiples, then only call its hook once.
       if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
         $max = 0;
-      }
-      else {
+      } else {
         switch ($field['multiple']) {
           case 0:
             $max = 0;
@@ -51,8 +50,7 @@ 
           if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
             // Fields that handle their own multiples will add their own deltas.
             $node_field = $result;
-          }
-          else {
+          } else {
             // When multiples are handled by the content module, add a delta for each result.
             $node_field[$i] = $result;
           }
@@ -94,8 +92,7 @@ 
   function text_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
       return content_devel_multiple('_text_content_generate', $node, $field);
-    }
-    else {
+    } else {
       return _text_content_generate($node, $field);
     }
   }
@@ -106,14 +103,12 @@ 
       $format = $field['text_processing'] ? rand(0, 3) : 0;
       $node_field['value'] = devel_create_content($format);
       $node_field['format'] = $format;
-    }
-    else {
+    } else {
       $allowed_values = content_allowed_values($field);
       if (!empty($allowed_values)) {
         // Just pick one of the specified allowed values.
         $node_field['value'] = array_rand($allowed_values);
-      }
-      else {
+      } else {
         // Generate a value that respects max_length.
         if (empty($field['max_length'])) {
           $field['max_length'] = 12;
@@ -129,8 +124,7 @@ 
   function number_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
       return content_devel_multiple('_number_content_generate', $node, $field);
-    }
-    else {
+    } else {
       return _number_content_generate($node, $field);
     }
   }
@@ -141,8 +135,7 @@ 
     if (!empty($allowed_values)) {
       // Just pick one of the specified allowed values.
       $node_field['value'] = array_rand($allowed_values);
-    }
-    else {
+    } else {
       $min = is_numeric($field['min']) ? $field['min'] : 0;
       switch ($field['type']) {
         case 'number_integer':
@@ -175,8 +168,7 @@ 
   function nodereference_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
       return content_devel_multiple('_nodereference_content_generate', $node, $field);
-    }
-    else {
+    } else {
       return _nodereference_content_generate($node, $field);
     }
   }
@@ -197,8 +189,7 @@ 
   function userreference_content_generate($node, $field) {
     if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_MODULE) {
       return content_devel_multiple('_userreference_content_generate', $node, $field);
-    }
-    else {
+    } else {
       return _userreference_content_generate($node, $field);
     }
   }

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

Indentation +100 added lines, -100 removed lines

@@ -7,181 +7,181 @@
  * (on behalf of token.module)
  */
 function token_content_build_modes() {
-  return array(
+    return array(
     'token' => array(
-      'title' => t('Token'),
-      'build modes' => array(
+        'title' => t('Token'),
+        'build modes' => array(
         'token' => array(
-          'title' => t('Token'),
-          'views style' => FALSE,
+            'title' => t('Token'),
+            'views style' => FALSE,
+        ),
         ),
-      ),
     ),
-  );
+    );
 }
 
 // Two helper functions that generate appropriate tokens for CCK-added fields.
 function content_token_values($type, $object = NULL, $options = array()) {
-  $tokens = array();
-  if ($type == 'node') {
+    $tokens = array();
+    if ($type == 'node') {
     // Prevent against invalid 'nodes' built by broken 3rd party code.
     if (isset($object->type)) {
-      // Let PHP free the $node object when we are done. Working directly on the
-      // incoming $object causes memory leak issues on long-running scripts such
-      // as migrations. See http://drupal.org/node/736440.
-      $node = drupal_clone($object);
-      $content_type = content_types($node->type);
-      $node->build_mode = 'token';
-      $node->content = array();
-      content_view($node);
-      // The formatted values will only be known after the content has been rendered.
-      drupal_render($node->content);
-      content_alter($node);
-
-      $field_types = _content_field_types();
-      foreach ($content_type['fields'] as $field_name => $field) {
+        // Let PHP free the $node object when we are done. Working directly on the
+        // incoming $object causes memory leak issues on long-running scripts such
+        // as migrations. See http://drupal.org/node/736440.
+        $node = drupal_clone($object);
+        $content_type = content_types($node->type);
+        $node->build_mode = 'token';
+        $node->content = array();
+        content_view($node);
+        // The formatted values will only be known after the content has been rendered.
+        drupal_render($node->content);
+        content_alter($node);
+
+        $field_types = _content_field_types();
+        foreach ($content_type['fields'] as $field_name => $field) {
         $items = isset($node->{$field_name}) ? $node->{$field_name} : array();
         $function = $field_types[$field['type']]['module'] . '_token_values';
         if (!empty($items) && function_exists($function)) {
-          $token_values = (array) $function('field', $items, $options);
-          foreach ($token_values as $token => $value) {
+            $token_values = (array) $function('field', $items, $options);
+            foreach ($token_values as $token => $value) {
             $tokens[$field_name .'-'. $token] = $value;
-          }
+            }
+        }
         }
-      }
     }
-  }
-  return $tokens;
+    }
+    return $tokens;
 }
 
 function content_token_list($type = 'all') {
-  if ($type == 'node' || $type == 'all') {
+    if ($type == 'node' || $type == 'all') {
     $list = array();
     $field_types = _content_field_types();
 
     foreach (content_fields() as $field) {
-      $sub_list = array();
-      $function = $field_types[$field['type']]['module'] . '_token_list';
-      if (function_exists($function)) {
+        $sub_list = array();
+        $function = $field_types[$field['type']]['module'] . '_token_list';
+        if (function_exists($function)) {
         $sub_list = $function('field');
         foreach ($sub_list as $category => $token_list) {
-          foreach ($token_list as $token => $description) {
+            foreach ($token_list as $token => $description) {
             $list['CCK '. $category][$field['field_name'] .'-'. $token] = $description;
-          }
+            }
+        }
         }
-      }
     }
 
     return $list;
-  }
+    }
 }
 
 if (module_exists('nodereference')) {
-  function nodereference_token_list($type = 'all') {
+    function nodereference_token_list($type = 'all') {
     if ($type == 'field' || $type == 'all') {
-      $tokens = array();
+        $tokens = array();
 
-      $tokens['node reference']['nid']   = t('Referenced node ID');
-      $tokens['node reference']['title'] = t('Referenced node title');
-      $tokens['node reference']['title-raw'] = t('Referenced node unfiltered title. WARNING - raw user input.');
-      $tokens['node reference']['link']  = t("Formatted html link to the referenced node.");
-      $tokens['node reference']['path']  = t("Relative path alias to the referenced node.");
-      $tokens['node reference']['url']  = t("Absolute path alias to the referenced node.");
+        $tokens['node reference']['nid']   = t('Referenced node ID');
+        $tokens['node reference']['title'] = t('Referenced node title');
+        $tokens['node reference']['title-raw'] = t('Referenced node unfiltered title. WARNING - raw user input.');
+        $tokens['node reference']['link']  = t("Formatted html link to the referenced node.");
+        $tokens['node reference']['path']  = t("Relative path alias to the referenced node.");
+        $tokens['node reference']['url']  = t("Absolute path alias to the referenced node.");
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 
-  function nodereference_token_values($type, $object = NULL, $options = array()) {
+    function nodereference_token_values($type, $object = NULL, $options = array()) {
     if ($type == 'field') {
-      $item = $object[0];
+        $item = $object[0];
 
-      $title = is_numeric($item['nid']) ? _nodereference_titles($item['nid']) : '';
-      $tokens['nid']   = $item['nid'];
-      $tokens['title'] = $title ? check_plain($title) : '';
-      $tokens['title-raw'] = $title;
-      $tokens['link']  = isset($item['view']) ? $item['view'] : '';
-      $tokens['path'] = is_numeric($item['nid']) ? url('node/' . $item['nid']) : '';
-      $tokens['url'] = is_numeric($item['nid']) ? url('node/' . $item['nid'], array('absolute' => TRUE)) : '';
+        $title = is_numeric($item['nid']) ? _nodereference_titles($item['nid']) : '';
+        $tokens['nid']   = $item['nid'];
+        $tokens['title'] = $title ? check_plain($title) : '';
+        $tokens['title-raw'] = $title;
+        $tokens['link']  = isset($item['view']) ? $item['view'] : '';
+        $tokens['path'] = is_numeric($item['nid']) ? url('node/' . $item['nid']) : '';
+        $tokens['url'] = is_numeric($item['nid']) ? url('node/' . $item['nid'], array('absolute' => TRUE)) : '';
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 }
 
 if (module_exists('number')) {
-  function number_token_list($type = 'all') {
+    function number_token_list($type = 'all') {
     if ($type == 'field' || $type == 'all') {
-      $tokens = array();
+        $tokens = array();
 
-      $tokens['number']['raw']       = t('Raw number value');
-      $tokens['number']['formatted'] = t('Formatted number value');
+        $tokens['number']['raw']       = t('Raw number value');
+        $tokens['number']['formatted'] = t('Formatted number value');
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 
-  function number_token_values($type, $object = NULL, $options = array()) {
+    function number_token_values($type, $object = NULL, $options = array()) {
     if ($type == 'field') {
-      $item = $object[0];
+        $item = $object[0];
 
-      $tokens['raw']       = $item['value'];
-      $tokens['formatted'] = isset($item['view']) ? $item['view'] : '';
+        $tokens['raw']       = $item['value'];
+        $tokens['formatted'] = isset($item['view']) ? $item['view'] : '';
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 }
 
 if (module_exists('text')) {
-  function text_token_list($type = 'all') {
+    function text_token_list($type = 'all') {
     if ($type == 'field' || $type == 'all') {
-      $tokens = array();
+        $tokens = array();
 
-      $tokens['text']['raw']       = t('Raw, unfiltered text');
-      $tokens['text']['formatted'] = t('Formatted and filtered text');
+        $tokens['text']['raw']       = t('Raw, unfiltered text');
+        $tokens['text']['formatted'] = t('Formatted and filtered text');
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 
-  function text_token_values($type, $object = NULL, $options = array()) {
+    function text_token_values($type, $object = NULL, $options = array()) {
     if ($type == 'field') {
-      $item = $object[0];
+        $item = $object[0];
 
-      $tokens['raw']  = $item['value'];
-      $tokens['formatted'] = isset($item['view']) ? $item['view'] : '';
-      return $tokens;
+        $tokens['raw']  = $item['value'];
+        $tokens['formatted'] = isset($item['view']) ? $item['view'] : '';
+        return $tokens;
+    }
     }
-  }
 }
 
 if (module_exists('userreference')) {
-  function userreference_token_list($type = 'all') {
+    function userreference_token_list($type = 'all') {
     if ($type == 'field' || $type == 'all') {
-      $tokens = array();
+        $tokens = array();
 
-      $tokens['user reference']['uid']   = t('Referenced user ID');
-      $tokens['user reference']['name']  = t('Referenced user name');
-      $tokens['user reference']['link']  = t('Formatted HTML link to referenced user');
-      $tokens['user reference']['path']  = t("Relative path alias to the referenced user.");
-      $tokens['user reference']['url']  = t("Absolute path alias to the referenced user.");
+        $tokens['user reference']['uid']   = t('Referenced user ID');
+        $tokens['user reference']['name']  = t('Referenced user name');
+        $tokens['user reference']['link']  = t('Formatted HTML link to referenced user');
+        $tokens['user reference']['path']  = t("Relative path alias to the referenced user.");
+        $tokens['user reference']['url']  = t("Absolute path alias to the referenced user.");
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 
-  function userreference_token_values($type, $object = NULL, $options = array()) {
+    function userreference_token_values($type, $object = NULL, $options = array()) {
     if ($type == 'field') {
-      $item = $object[0];
+        $item = $object[0];
 
-      $tokens['uid']   = $item['uid'];
-      $tokens['name']  = isset($item['view']) ? strip_tags($item['view']) : '';
-      $tokens['link']  = isset($item['view']) ? $item['view'] : '';
-      $tokens['path'] = is_numeric($item['uid']) ? url('user/' . $item['uid']) : '';
-      $tokens['url'] = is_numeric($item['uid']) ? url('user/' . $item['uid'], array('absolute' => TRUE)) : '';
+        $tokens['uid']   = $item['uid'];
+        $tokens['name']  = isset($item['view']) ? strip_tags($item['view']) : '';
+        $tokens['link']  = isset($item['view']) ? $item['view'] : '';
+        $tokens['path'] = is_numeric($item['uid']) ? url('user/' . $item['uid']) : '';
+        $tokens['url'] = is_numeric($item['uid']) ? url('user/' . $item['uid'], array('absolute' => TRUE)) : '';
 
-      return $tokens;
+        return $tokens;
+    }
     }
-  }
 }

Spacing +12 added lines, -12 removed lines

@@ -41,11 +41,11 @@ 
       $field_types = _content_field_types();
       foreach ($content_type['fields'] as $field_name => $field) {
         $items = isset($node->{$field_name}) ? $node->{$field_name} : array();
-        $function = $field_types[$field['type']]['module'] . '_token_values';
+        $function = $field_types[$field['type']]['module'].'_token_values';
         if (!empty($items) && function_exists($function)) {
-          $token_values = (array) $function('field', $items, $options);
+          $token_values = (array)$function('field', $items, $options);
           foreach ($token_values as $token => $value) {
-            $tokens[$field_name .'-'. $token] = $value;
+            $tokens[$field_name.'-'.$token] = $value;
           }
         }
       }
@@ -61,12 +61,12 @@ 
 
     foreach (content_fields() as $field) {
       $sub_list = array();
-      $function = $field_types[$field['type']]['module'] . '_token_list';
+      $function = $field_types[$field['type']]['module'].'_token_list';
       if (function_exists($function)) {
         $sub_list = $function('field');
         foreach ($sub_list as $category => $token_list) {
           foreach ($token_list as $token => $description) {
-            $list['CCK '. $category][$field['field_name'] .'-'. $token] = $description;
+            $list['CCK '.$category][$field['field_name'].'-'.$token] = $description;
           }
         }
       }
@@ -86,7 +86,7 @@ 
       $tokens['node reference']['title-raw'] = t('Referenced node unfiltered title. WARNING - raw user input.');
       $tokens['node reference']['link']  = t("Formatted html link to the referenced node.");
       $tokens['node reference']['path']  = t("Relative path alias to the referenced node.");
-      $tokens['node reference']['url']  = t("Absolute path alias to the referenced node.");
+      $tokens['node reference']['url'] = t("Absolute path alias to the referenced node.");
 
       return $tokens;
     }
@@ -101,8 +101,8 @@ 
       $tokens['title'] = $title ? check_plain($title) : '';
       $tokens['title-raw'] = $title;
       $tokens['link']  = isset($item['view']) ? $item['view'] : '';
-      $tokens['path'] = is_numeric($item['nid']) ? url('node/' . $item['nid']) : '';
-      $tokens['url'] = is_numeric($item['nid']) ? url('node/' . $item['nid'], array('absolute' => TRUE)) : '';
+      $tokens['path'] = is_numeric($item['nid']) ? url('node/'.$item['nid']) : '';
+      $tokens['url'] = is_numeric($item['nid']) ? url('node/'.$item['nid'], array('absolute' => TRUE)) : '';
 
       return $tokens;
     }
@@ -149,7 +149,7 @@ 
     if ($type == 'field') {
       $item = $object[0];
 
-      $tokens['raw']  = $item['value'];
+      $tokens['raw'] = $item['value'];
       $tokens['formatted'] = isset($item['view']) ? $item['view'] : '';
       return $tokens;
     }
@@ -165,7 +165,7 @@ 
       $tokens['user reference']['name']  = t('Referenced user name');
       $tokens['user reference']['link']  = t('Formatted HTML link to referenced user');
       $tokens['user reference']['path']  = t("Relative path alias to the referenced user.");
-      $tokens['user reference']['url']  = t("Absolute path alias to the referenced user.");
+      $tokens['user reference']['url'] = t("Absolute path alias to the referenced user.");
 
       return $tokens;
     }
@@ -178,8 +178,8 @@ 
       $tokens['uid']   = $item['uid'];
       $tokens['name']  = isset($item['view']) ? strip_tags($item['view']) : '';
       $tokens['link']  = isset($item['view']) ? $item['view'] : '';
-      $tokens['path'] = is_numeric($item['uid']) ? url('user/' . $item['uid']) : '';
-      $tokens['url'] = is_numeric($item['uid']) ? url('user/' . $item['uid'], array('absolute' => TRUE)) : '';
+      $tokens['path'] = is_numeric($item['uid']) ? url('user/'.$item['uid']) : '';
+      $tokens['url'] = is_numeric($item['uid']) ? url('user/'.$item['uid'], array('absolute' => TRUE)) : '';
 
       return $tokens;
     }

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

@@ -13,7 +13,7 @@ 
       'build modes' => array(
         'token' => array(
           'title' => t('Token'),
-          'views style' => FALSE,
+          'views style' => false,
         ),
       ),
     ),
@@ -21,7 +21,7 @@ 
 }
 
 // Two helper functions that generate appropriate tokens for CCK-added fields.
-function content_token_values($type, $object = NULL, $options = array()) {
+function content_token_values($type, $object = null, $options = array()) {
   $tokens = array();
   if ($type == 'node') {
     // Prevent against invalid 'nodes' built by broken 3rd party code.
@@ -92,7 +92,7 @@ 
     }
   }
 
-  function nodereference_token_values($type, $object = NULL, $options = array()) {
+  function nodereference_token_values($type, $object = null, $options = array()) {
     if ($type == 'field') {
       $item = $object[0];
 
@@ -102,7 +102,7 @@ 
       $tokens['title-raw'] = $title;
       $tokens['link']  = isset($item['view']) ? $item['view'] : '';
       $tokens['path'] = is_numeric($item['nid']) ? url('node/' . $item['nid']) : '';
-      $tokens['url'] = is_numeric($item['nid']) ? url('node/' . $item['nid'], array('absolute' => TRUE)) : '';
+      $tokens['url'] = is_numeric($item['nid']) ? url('node/' . $item['nid'], array('absolute' => true)) : '';
 
       return $tokens;
     }
@@ -121,7 +121,7 @@ 
     }
   }
 
-  function number_token_values($type, $object = NULL, $options = array()) {
+  function number_token_values($type, $object = null, $options = array()) {
     if ($type == 'field') {
       $item = $object[0];
 
@@ -145,7 +145,7 @@ 
     }
   }
 
-  function text_token_values($type, $object = NULL, $options = array()) {
+  function text_token_values($type, $object = null, $options = array()) {
     if ($type == 'field') {
       $item = $object[0];
 
@@ -171,7 +171,7 @@ 
     }
   }
 
-  function userreference_token_values($type, $object = NULL, $options = array()) {
+  function userreference_token_values($type, $object = null, $options = array()) {
     if ($type == 'field') {
       $item = $object[0];
 
@@ -179,7 +179,7 @@ 
       $tokens['name']  = isset($item['view']) ? strip_tags($item['view']) : '';
       $tokens['link']  = isset($item['view']) ? $item['view'] : '';
       $tokens['path'] = is_numeric($item['uid']) ? url('user/' . $item['uid']) : '';
-      $tokens['url'] = is_numeric($item['uid']) ? url('user/' . $item['uid'], array('absolute' => TRUE)) : '';
+      $tokens['url'] = is_numeric($item['uid']) ? url('user/' . $item['uid'], array('absolute' => true)) : '';
 
       return $tokens;
     }

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

Indentation +124 added lines, -124 removed lines

@@ -10,34 +10,34 @@ 
  * Implementation of hook_rules_action_info().
  */
 function content_rules_action_info() {
-  $info = array();
-  $info['content_rules_action_populate_field'] = array(
+    $info = array();
+    $info['content_rules_action_populate_field'] = array(
     'label' => t('Populate a field'),
     'arguments' => array(
-      'node' => array(
+        'node' => array(
         'type' => 'node',
         'label' => t('Content'),
-      ),
+        ),
     ),
     'eval input' => array('code'),
     'help' => t('You should make sure that the used field exists in the given content type.'),
     'module' => 'CCK',
-  );
-  return $info;
+    );
+    return $info;
 }
 
 /**
  * Action: populate a field.
  */
 function content_rules_action_populate_field($node, $settings, $element, &$state) {
-  // Get information about the field.
-  $field = content_fields($settings['field_name'], $node->type);
-  $value = _content_rules_get_field_value($settings, $state);
+    // Get information about the field.
+    $field = content_fields($settings['field_name'], $node->type);
+    $value = _content_rules_get_field_value($settings, $state);
 
-  if (!empty($field) && is_array($value)) {
+    if (!empty($field) && is_array($value)) {
     $node->$settings['field_name'] = $value;
     return array('node' => $node);
-  }
+    }
 }
 
 
@@ -46,15 +46,15 @@ 
  * This is a multistep form!
  */
 function content_rules_action_populate_field_form($settings, &$form, &$form_state) {
-  $settings += array('field_name' => '', 'code' => '', 'value' => NULL);
-  if (empty($settings['field_name'])) {
+    $settings += array('field_name' => '', 'code' => '', 'value' => NULL);
+    if (empty($settings['field_name'])) {
     $form['settings']['field_name'] = array(
-      '#type' => 'select',
-      '#title' => t('Field'),
-      '#options' => content_rules_get_field_names_by_type(),
-      '#default_value' => $settings['field_name'],
-      '#description' => t('Select the machine-name of the field.'),
-      '#required' => TRUE,
+        '#type' => 'select',
+        '#title' => t('Field'),
+        '#options' => content_rules_get_field_names_by_type(),
+        '#default_value' => $settings['field_name'],
+        '#description' => t('Select the machine-name of the field.'),
+        '#required' => TRUE,
     );
     // Hide some form elements in the first step.
     $form['negate']['#access'] = FALSE;
@@ -64,8 +64,8 @@ 
     // Replace the usual submit handlers with a own handler.
     $form['submit']['#submit'] = array('content_rules_action_populate_field_form_step_submit');
     $form['submit']['#value'] = t('Continue');
-  }
-  else {
+    }
+    else {
     // Show the fields form here.
     module_load_include('inc', 'content', 'includes/content.node_form');
     $field = content_fields($settings['field_name']);
@@ -78,111 +78,111 @@ 
 
     unset($form['#cache']);
 
-      // Advanced: PHP code.
+        // Advanced: PHP code.
     $form['advanced_options'] = array(
-      '#type' => 'fieldset',
-      '#title' => t('Advanced: Specify the fields value with PHP code'),
-      '#collapsible' => TRUE,
-      '#collapsed' => empty($settings['code']),
-      '#weight' => 5,
+        '#type' => 'fieldset',
+        '#title' => t('Advanced: Specify the fields value with PHP code'),
+        '#collapsible' => TRUE,
+        '#collapsed' => empty($settings['code']),
+        '#weight' => 5,
     );
 
     $db_info = content_database_info($field);
     $columns = array_keys($db_info['columns']);
     foreach ($columns as $key => $column) {
-      $columns[$key] = t("'@column' => value for @column", array('@column' => $column));
+        $columns[$key] = t("'@column' => value for @column", array('@column' => $column));
     }
     $sample = t("return array(\n  0 => array(@columns),\n  // You'll usually want to stop here. Provide more values\n  // if you want your 'default value' to be multi-valued:\n  1 => array(@columns),\n  2 => ...\n);", array('@columns' => implode(', ', $columns)));
 
     $form['advanced_options']['code'] = array(
-      '#type' => 'textarea',
-      '#title' => t('Code'),
-      '#default_value' => $settings['code'],
-      '#rows' => 6,
-      '#description' => t('Advanced usage only: PHP code that returns the value to set. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>Using <a href="@link_devel">devel.module\'s</a> \'devel load\' tab on a content page might help you figure out the expected format.', array(
+        '#type' => 'textarea',
+        '#title' => t('Code'),
+        '#default_value' => $settings['code'],
+        '#rows' => 6,
+        '#description' => t('Advanced usage only: PHP code that returns the value to set. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>Using <a href="@link_devel">devel.module\'s</a> \'devel load\' tab on a content page might help you figure out the expected format.', array(
         '!sample' => $sample,
         '@link_devel' => 'http://www.drupal.org/project/devel',
-      )),
+        )),
     );
 
     // Add this file to be included when the form is built by rules
     // as it's needed by CCKs add more button.
     // See rules_after_build_include_files().
     $form['#includes'][] = './'. drupal_get_path('module', 'node') .'/node.pages.inc';
-  }
+    }
 }
 
 function content_rules_action_populate_field_form_step_submit($form, &$form_state) {
-  $form_state['element']['#settings']['field_name'] = $form_state['values']['settings']['field_name'];
+    $form_state['element']['#settings']['field_name'] = $form_state['values']['settings']['field_name'];
 }
 
 /**
  * Validate the chosen value or php code.
  */
 function content_rules_action_populate_field_validate($form, &$form_state) {
-  if (!isset($form_state['element']['#settings']['field_name'])) {
+    if (!isset($form_state['element']['#settings']['field_name'])) {
     //Just validate the last step.
     return;
-  }
+    }
 
-  if (isset($form_state['values']['code']) && ($php = $form_state['values']['code'])) {
+    if (isset($form_state['values']['code']) && ($php = $form_state['values']['code'])) {
     if (strpos($php, 'return') === FALSE) {
-      form_set_error('code', t('You have to return the default value in the expected format.'));
+        form_set_error('code', t('You have to return the default value in the expected format.'));
     }
-  }
-  else {
+    }
+    else {
     // Validate the field.
     $settings = $form_state['element']['#settings'];
     $field = content_fields($settings['field_name']);
     $field_types = _content_field_types();
     $function = $field_types[$field['type']]['module'] .'_field';
     if (function_exists($function)) {
-      $form['#node'] = (object)array('type' => '', $settings['field_name'] => $form_state['values'][$settings['field_name']]);
-      $items = isset($form['#node']->$field['field_name']) ? $form['#node']->$field['field_name'] : array();
+        $form['#node'] = (object)array('type' => '', $settings['field_name'] => $form_state['values'][$settings['field_name']]);
+        $items = isset($form['#node']->$field['field_name']) ? $form['#node']->$field['field_name'] : array();
 
-      //Make sure AHAH 'add more' button isn't sent to the fields
-      // for processing.
-      unset($items[$field['field_name'] .'_add_more']);
+        //Make sure AHAH 'add more' button isn't sent to the fields
+        // for processing.
+        unset($items[$field['field_name'] .'_add_more']);
 
-      $function('validate', $form['#node'], $field, $items, $form, NULL);
-      content_field('validate', $form['#node'], $field, $items, $form, NULL);
+        $function('validate', $form['#node'], $field, $items, $form, NULL);
+        content_field('validate', $form['#node'], $field, $items, $form, NULL);
+    }
     }
-  }
 }
 
 function content_rules_action_populate_field_submit(&$settings, $form, &$form_state) {
-  // Take over field values and filter out private properties added by CCK
-  $settings['value'] = array_filter($form_state['values'][$settings['field_name']], 'is_array');
+    // Take over field values and filter out private properties added by CCK
+    $settings['value'] = array_filter($form_state['values'][$settings['field_name']], 'is_array');
 
-  foreach ($settings['value'] as $key => $data) {
+    foreach ($settings['value'] as $key => $data) {
     foreach (array_filter(array_keys($data)) as $col) {
-      if ($col[0] == '_') {
+        if ($col[0] == '_') {
         unset($settings['value'][$key][$col]);
-      }
+        }
     }
     if ($key && count(array_filter($settings['value'][$key])) == 0) {
-      // For multi-valued fields don't check for any additional empty values.
-      unset($settings['value'][$key]);
+        // For multi-valued fields don't check for any additional empty values.
+        unset($settings['value'][$key]);
+    }
     }
-  }
 
-  $settings['code'] = $form_state['values']['code'];
+    $settings['code'] = $form_state['values']['code'];
 
-  if (function_exists('rules_action_custom_php_submit')) {
+    if (function_exists('rules_action_custom_php_submit')) {
     // Support adding variables to the php code, if php module is present.
     rules_action_custom_php_submit($settings, $form, $form_state);
-  }
+    }
 
-  // Add all values to the input evaluator, so that textfields / textares can
-  // make use of it.
-  $names = array('code');
+    // Add all values to the input evaluator, so that textfields / textares can
+    // make use of it.
+    $names = array('code');
 
-  foreach ($settings['value'] as $key => $data) {
+    foreach ($settings['value'] as $key => $data) {
     foreach (array_filter($data, 'is_string') as $col => $value) {
-      $names[] = "value|$key|$col";
+        $names[] = "value|$key|$col";
+    }
     }
-  }
-  $form_state['element']['#info']['eval input'] = $names;
+    $form_state['element']['#info']['eval input'] = $names;
 }
 
 
@@ -190,14 +190,14 @@ 
  * Label callback: Improve the label of the action.
  */
 function content_rules_action_populate_field_label($settings, $argument_labels) {
-  return t("Populate @node's field '@field'", array('@field' => $settings['field_name']) + $argument_labels);
+    return t("Populate @node's field '@field'", array('@field' => $settings['field_name']) + $argument_labels);
 }
 
 function workflow_ng_action_populate_field_upgrade(&$element) {
-  $element['#name'] = 'content_rules_action_populate_field';
-  $element['#settings']['code'] = $element['#settings']['default_value_php'];
-  $element['#settings'][$element['#settings']['field_name']] = array();
-  unset($element['#settings']['default_value_php']);
+    $element['#name'] = 'content_rules_action_populate_field';
+    $element['#settings']['code'] = $element['#settings']['default_value_php'];
+    $element['#settings'][$element['#settings']['field_name']] = array();
+    unset($element['#settings']['default_value_php']);
 }
 
 
@@ -205,84 +205,84 @@ 
  * Implementation of hook_rules_condition_info().
  */
 function content_rules_condition_info() {
-  $info = array();
-  $info['content_rules_field_has_value'] = array(
+    $info = array();
+    $info['content_rules_field_has_value'] = array(
     'label' => t('Field has value'),
     'arguments' => array(
-      'node' => array('type' => 'node', 'label' => t('Content')),
+        'node' => array('type' => 'node', 'label' => t('Content')),
     ),
     'eval input' => array('code'),
     'help' => t('You should make sure that the used field exists in the given content type. The condition returns TRUE, if the selected field has the given value.'),
     'module' => 'CCK',
-  );
-  $info['content_rules_field_changed'] = array(
+    );
+    $info['content_rules_field_changed'] = array(
     'label' => t('Field has changed'),
     'arguments' => array(
-      'node' => array('type' => 'node', 'label' => t('Content containing changes')),
-      'node_unchanged' => array('type' => 'node', 'label' => t('Content not containing changes')),
+        'node' => array('type' => 'node', 'label' => t('Content containing changes')),
+        'node_unchanged' => array('type' => 'node', 'label' => t('Content not containing changes')),
     ),
     'help' => t('You should make sure that the used field exists in the given content type.'),
     'module' => 'CCK',
-  );
-  return $info;
+    );
+    return $info;
 }
 
 /**
  * Condition: Check the value of a field.
  */
 function content_rules_field_has_value($node, $settings) {
-  // Get information about the field.
-  $field = content_fields($settings['field_name'], $node->type);
-  $value = _content_rules_get_field_value($settings, $state);
+    // Get information about the field.
+    $field = content_fields($settings['field_name'], $node->type);
+    $value = _content_rules_get_field_value($settings, $state);
 
-  if (empty($field) || !is_array($value)) {
+    if (empty($field) || !is_array($value)) {
     return FALSE;
-  }
+    }
 
-  return _content_rules_field_has_value($node->$settings['field_name'], $value);
+    return _content_rules_field_has_value($node->$settings['field_name'], $value);
 }
 
 /**
  * Use the same configuration form as the "populate field" action.
  */
 function content_rules_field_has_value_form($settings, &$form, &$form_state) {
-  content_rules_action_populate_field_form($settings, $form, $form_state);
+    content_rules_action_populate_field_form($settings, $form, $form_state);
 }
 function content_rules_field_has_value_validate($form, &$form_state) {
-  content_rules_action_populate_field_validate($form, $form_state);
+    content_rules_action_populate_field_validate($form, $form_state);
 }
 function content_rules_field_has_value_submit(&$settings, $form, &$form_state) {
-  content_rules_action_populate_field_submit($settings, $form, $form_state);
+    content_rules_action_populate_field_submit($settings, $form, $form_state);
 }
 
 function content_rules_field_has_value_label($settings, $argument_labels) {
-  return t("@node's field '@field' has value", array('@field' => $settings['field_name']) + $argument_labels);
+    return t("@node's field '@field' has value", array('@field' => $settings['field_name']) + $argument_labels);
 }
 
 /**
  * Condition: Check if the field has changed.
  */
 function content_rules_field_changed($node1, $node2, $settings) {
-  // Get information about the field.
-  $field = content_fields($settings['field_name'], $node1->type);
+    // Get information about the field.
+    $field = content_fields($settings['field_name'], $node1->type);
 
-  return !empty($field) && !_content_rules_field_has_value($node1->$settings['field_name'], $node2->$settings['field_name']);
+    return !empty($field) && !_content_rules_field_has_value($node1->$settings['field_name'], $node2->$settings['field_name']);
 }
 
 function content_rules_field_changed_form($settings, &$form, &$form_state) {
-  $settings += array('field_name' => '');
-  $form['settings']['field_name'] = array(
+    $settings += array('field_name' => '');
+    $form['settings']['field_name'] = array(
     '#type' => 'select',
     '#title' => t('Field'),
     '#options' => content_rules_get_field_names_by_type(),
     '#default_value' => $settings['field_name'],
     '#description' => t('Select the machine-name of the field to look at.'),
     '#required' => TRUE,
-  );
+    );
 }
 
 function content_rules_field_changed_label($settings, $argument_labels) {
-  return t("@node's field '@field' has been changed", array('@field' => $settings['field_name']) + $argument_labels);
+    return t("@node's field '@field' has been changed", array('@field' => $settings['field_name']) + $argument_labels);
 }
 
 
@@ -291,32 +291,32 @@ 
  * Suitable for using it with #options.
  */
 function content_rules_get_field_names_by_type($type = NULL) {
-  $fields = array();
-  foreach (content_fields() as $field) {
+    $fields = array();
+    foreach (content_fields() as $field) {
     if (!isset($type) || $field['type'] == $type) {
-      $fields[$field['field_name']] = $field['field_name'];
+        $fields[$field['field_name']] = $field['field_name'];
+    }
     }
-  }
-  asort($fields);
-  return $fields;
+    asort($fields);
+    return $fields;
 }
 
 function _content_rules_get_field_value($settings, &$state) {
-  if ($settings['code']) {
+    if ($settings['code']) {
     if (function_exists('rules_input_evaluator_php_apply')) {
-      // Support adding variables to the php code, if php module is present.
-      $value = rules_input_evaluator_php_apply($settings['code'], $settings['vars'], $state, FALSE);
+        // Support adding variables to the php code, if php module is present.
+        $value = rules_input_evaluator_php_apply($settings['code'], $settings['vars'], $state, FALSE);
     }
     else {
-      ob_start();
-      $value = eval($settings['code']);
-      ob_end_clean();
+        ob_start();
+        $value = eval($settings['code']);
+        ob_end_clean();
     }
-  }
-  else {
+    }
+    else {
     $value = $settings['value'];
-  }
-  return $value;
+    }
+    return $value;
 }
 
 /**
@@ -329,20 +329,20 @@ 
  * @param $value The value to check for.
  */
 function _content_rules_field_has_value($node_value, $value) {
-  if (count($value) != count($node_value)) {
+    if (count($value) != count($node_value)) {
     return FALSE;
-  }
-  // Loop over multiple fields
-  foreach ($value as $delta => $sub_value) {
+    }
+    // Loop over multiple fields
+    foreach ($value as $delta => $sub_value) {
     // Check if all properties of the value are there in the node value too
     if (is_array($sub_value) && is_array($node_value[$delta])) {
-      if (count(array_diff_assoc($sub_value, $node_value[$delta])) != 0) {
+        if (count(array_diff_assoc($sub_value, $node_value[$delta])) != 0) {
         return FALSE;
-      }
+        }
     }
     elseif ($sub_value !== $node_value[$delta]) {
-      return FALSE;
+        return FALSE;
+    }
     }
-  }
-  return TRUE;
+    return TRUE;
 }

Spacing +5 added lines, -5 removed lines

@@ -73,8 +73,8 @@ 
     $form['#node'] = (object)array('type' => '', $settings['field_name'] => $settings['value']);
     $form['#field_info'][$field['field_name']] = $field;
     // We can't put it into $form['settings'] as this would break AHAH callbacks
-    $form += (array) content_field_form($form, $form_state, $field);
-    $form[ $settings['field_name'] ]['#weight'] = 4;
+    $form += (array)content_field_form($form, $form_state, $field);
+    $form[$settings['field_name']]['#weight'] = 4;
 
     unset($form['#cache']);
 
@@ -108,7 +108,7 @@ 
     // Add this file to be included when the form is built by rules
     // as it's needed by CCKs add more button.
     // See rules_after_build_include_files().
-    $form['#includes'][] = './'. drupal_get_path('module', 'node') .'/node.pages.inc';
+    $form['#includes'][] = './'.drupal_get_path('module', 'node').'/node.pages.inc';
   }
 }
 
@@ -135,14 +135,14 @@ 
     $settings = $form_state['element']['#settings'];
     $field = content_fields($settings['field_name']);
     $field_types = _content_field_types();
-    $function = $field_types[$field['type']]['module'] .'_field';
+    $function = $field_types[$field['type']]['module'].'_field';
     if (function_exists($function)) {
       $form['#node'] = (object)array('type' => '', $settings['field_name'] => $form_state['values'][$settings['field_name']]);
       $items = isset($form['#node']->$field['field_name']) ? $form['#node']->$field['field_name'] : array();
 
       //Make sure AHAH 'add more' button isn't sent to the fields
       // for processing.
-      unset($items[$field['field_name'] .'_add_more']);
+      unset($items[$field['field_name'].'_add_more']);
 
       $function('validate', $form['#node'], $field, $items, $form, NULL);
       content_field('validate', $form['#node'], $field, $items, $form, NULL);

Braces +5 added lines, -10 removed lines

@@ -64,8 +64,7 @@ 
     // Replace the usual submit handlers with a own handler.
     $form['submit']['#submit'] = array('content_rules_action_populate_field_form_step_submit');
     $form['submit']['#value'] = t('Continue');
-  }
-  else {
+  } else {
     // Show the fields form here.
     module_load_include('inc', 'content', 'includes/content.node_form');
     $field = content_fields($settings['field_name']);
@@ -129,8 +128,7 @@ 
     if (strpos($php, 'return') === FALSE) {
       form_set_error('code', t('You have to return the default value in the expected format.'));
     }
-  }
-  else {
+  } else {
     // Validate the field.
     $settings = $form_state['element']['#settings'];
     $field = content_fields($settings['field_name']);
@@ -306,14 +304,12 @@ 
     if (function_exists('rules_input_evaluator_php_apply')) {
       // Support adding variables to the php code, if php module is present.
       $value = rules_input_evaluator_php_apply($settings['code'], $settings['vars'], $state, FALSE);
-    }
-    else {
+    } else {
       ob_start();
       $value = eval($settings['code']);
       ob_end_clean();
     }
-  }
-  else {
+  } else {
     $value = $settings['value'];
   }
   return $value;
@@ -339,8 +335,7 @@ 
       if (count(array_diff_assoc($sub_value, $node_value[$delta])) != 0) {
         return FALSE;
       }
-    }
-    elseif ($sub_value !== $node_value[$delta]) {
+    } elseif ($sub_value !== $node_value[$delta]) {
       return FALSE;
     }
   }

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

@@ -46,7 +46,7 @@ 
  * This is a multistep form!
  */
 function content_rules_action_populate_field_form($settings, &$form, &$form_state) {
-  $settings += array('field_name' => '', 'code' => '', 'value' => NULL);
+  $settings += array('field_name' => '', 'code' => '', 'value' => null);
   if (empty($settings['field_name'])) {
     $form['settings']['field_name'] = array(
       '#type' => 'select',
@@ -54,12 +54,12 @@ 
       '#options' => content_rules_get_field_names_by_type(),
       '#default_value' => $settings['field_name'],
       '#description' => t('Select the machine-name of the field.'),
-      '#required' => TRUE,
+      '#required' => true,
     );
     // Hide some form elements in the first step.
-    $form['negate']['#access'] = FALSE;
-    $form['input_help']['#access'] = FALSE;
-    $form['weight']['#access'] = FALSE;
+    $form['negate']['#access'] = false;
+    $form['input_help']['#access'] = false;
+    $form['weight']['#access'] = false;
 
     // Replace the usual submit handlers with a own handler.
     $form['submit']['#submit'] = array('content_rules_action_populate_field_form_step_submit');
@@ -82,7 +82,7 @@ 
     $form['advanced_options'] = array(
       '#type' => 'fieldset',
       '#title' => t('Advanced: Specify the fields value with PHP code'),
-      '#collapsible' => TRUE,
+      '#collapsible' => true,
       '#collapsed' => empty($settings['code']),
       '#weight' => 5,
     );
@@ -126,7 +126,7 @@ 
   }
 
   if (isset($form_state['values']['code']) && ($php = $form_state['values']['code'])) {
-    if (strpos($php, 'return') === FALSE) {
+    if (strpos($php, 'return') === false) {
       form_set_error('code', t('You have to return the default value in the expected format.'));
     }
   }
@@ -144,8 +144,8 @@ 
       // for processing.
       unset($items[$field['field_name'] .'_add_more']);
 
-      $function('validate', $form['#node'], $field, $items, $form, NULL);
-      content_field('validate', $form['#node'], $field, $items, $form, NULL);
+      $function('validate', $form['#node'], $field, $items, $form, null);
+      content_field('validate', $form['#node'], $field, $items, $form, null);
     }
   }
 }
@@ -236,7 +236,7 @@ 
   $value = _content_rules_get_field_value($settings, $state);
 
   if (empty($field) || !is_array($value)) {
-    return FALSE;
+    return false;
   }
 
   return _content_rules_field_has_value($node->$settings['field_name'], $value);
@@ -277,7 +277,7 @@ 
     '#options' => content_rules_get_field_names_by_type(),
     '#default_value' => $settings['field_name'],
     '#description' => t('Select the machine-name of the field to look at.'),
-    '#required' => TRUE,
+    '#required' => true,
   );
 }
 
@@ -290,7 +290,7 @@ 
  * Returns the fields of a given field type only.
  * Suitable for using it with #options.
  */
-function content_rules_get_field_names_by_type($type = NULL) {
+function content_rules_get_field_names_by_type($type = null) {
   $fields = array();
   foreach (content_fields() as $field) {
     if (!isset($type) || $field['type'] == $type) {
@@ -305,7 +305,7 @@ 
   if ($settings['code']) {
     if (function_exists('rules_input_evaluator_php_apply')) {
       // Support adding variables to the php code, if php module is present.
-      $value = rules_input_evaluator_php_apply($settings['code'], $settings['vars'], $state, FALSE);
+      $value = rules_input_evaluator_php_apply($settings['code'], $settings['vars'], $state, false);
     }
     else {
       ob_start();
@@ -330,19 +330,19 @@ 
  */
 function _content_rules_field_has_value($node_value, $value) {
   if (count($value) != count($node_value)) {
-    return FALSE;
+    return false;
   }
   // Loop over multiple fields
   foreach ($value as $delta => $sub_value) {
     // Check if all properties of the value are there in the node value too
     if (is_array($sub_value) && is_array($node_value[$delta])) {
       if (count(array_diff_assoc($sub_value, $node_value[$delta])) != 0) {
-        return FALSE;
+        return false;
       }
     }
     elseif ($sub_value !== $node_value[$delta]) {
-      return FALSE;
+      return false;
     }
   }
-  return TRUE;
+  return true;
 }

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

Indentation +68 added lines, -68 removed lines

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

Spacing +1 added lines, -1 removed lines

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

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

Indentation +366 added lines, -366 removed lines

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

Switch Indentation +28 added lines, -28 removed lines

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

Spacing +45 added lines, -45 removed lines

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

Braces +13 added lines, -26 removed lines

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

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

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

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

Indentation +15 added lines, -15 removed lines

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

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

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

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

Indentation +22 added lines, -22 removed lines

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

Braces +2 added lines, -4 removed lines

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

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

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