BOINC / boinc

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

Indentation +7 added lines, -7 removed lines

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

Switch Indentation +3 added lines, -3 removed lines

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

Spacing +3 added lines, -3 removed lines

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

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

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

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

Indentation +150 added lines, -150 removed lines

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

Switch Indentation +135 added lines, -135 removed lines

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

Spacing +11 added lines, -11 removed lines

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

Braces +4 added lines, -8 removed lines

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

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

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

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

Indentation +18 added lines, -18 removed lines

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

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

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

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

Indentation +16 added lines, -16 removed lines

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

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

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

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

Indentation +56 added lines, -56 removed lines

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

Switch Indentation +9 added lines, -9 removed lines

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

Spacing +6 added lines, -6 removed lines

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

Braces +2 added lines, -4 removed lines

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

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

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

drupal/sites/default/boinc/modules/contrib/content_profile/modules/content_profile_registration.module

Indentation +107 added lines, -107 removed lines

@@ -10,7 +10,7 @@ 
  * Implementation of hook_form_alter().
  */
 function content_profile_registration_form_alter(&$form, &$form_state, $form_id) {
-  if ($form_id == 'user_register') {
+    if ($form_id == 'user_register') {
     require_once drupal_get_path('module', 'node') .'/node.pages.inc';
 
     // Allow other modules to customize the used profile types, so modules
@@ -19,44 +19,44 @@ 
     $form += array('#content_profile_registration_use_types' => $default_types);
 
     foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
-      content_profile_registration_add_profile_form($type, $form, $form_state);
+        content_profile_registration_add_profile_form($type, $form, $form_state);
     }
-  }
-  elseif ($form_id == 'content_profile_admin_settings') {
+    }
+    elseif ($form_id == 'content_profile_admin_settings') {
     $type = $form_state['type'];
     // Let other modules add registration child elements before us!
     $form += array('registration' => array());
     $form['registration'] += array(
-      '#type' => 'fieldset',
-      '#title' => t('User Registration'),
-      '#description' => t('Customize how this content profile shows up on the user registration page.'),
-      '#collapsible' => TRUE,
+        '#type' => 'fieldset',
+        '#title' => t('User Registration'),
+        '#description' => t('Customize how this content profile shows up on the user registration page.'),
+        '#collapsible' => TRUE,
     );
     $form['registration']['registration_use'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Use on Registration'),
-      '#description' => t('Use this content type on the user registration page'),
-      '#default_value' => content_profile_get_settings($type, 'registration_use'),
+        '#type' => 'checkbox',
+        '#title' => t('Use on Registration'),
+        '#description' => t('Use this content type on the user registration page'),
+        '#default_value' => content_profile_get_settings($type, 'registration_use'),
     );
     $form['registration']['admin_user_create_use'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Use on administrative user creation form'),
-      '#description' => t('Use this content type when an administrative user creates a new user'),
-      '#default_value' => content_profile_get_settings($type, 'admin_user_create_use'),
+        '#type' => 'checkbox',
+        '#title' => t('Use on administrative user creation form'),
+        '#description' => t('Use this content type when an administrative user creates a new user'),
+        '#default_value' => content_profile_get_settings($type, 'admin_user_create_use'),
     );
     $form['registration']['registration_hide'] = array(
-      '#type' => 'checkboxes',
-      '#title' => t('Hide form fields'),
-      '#description' => t('Hide fields from the user registration form. Required fields cannot be hidden and are not shown here.'),
-      '#options' => _content_profile_registration_get_field_select($type),
-      '#default_value' => content_profile_get_settings($type, 'registration_hide'),
+        '#type' => 'checkboxes',
+        '#title' => t('Hide form fields'),
+        '#description' => t('Hide fields from the user registration form. Required fields cannot be hidden and are not shown here.'),
+        '#options' => _content_profile_registration_get_field_select($type),
+        '#default_value' => content_profile_get_settings($type, 'registration_hide'),
     );
     array_unshift($form['#submit'], 'content_profile_registration_admin_form_submit');
-  }
+    }
 }
 
 function content_profile_registration_admin_form_submit($form, &$form_state) {
-  $form_state['values']['registration_hide'] = array_keys(array_filter($form_state['values']['registration_hide']));
+    $form_state['values']['registration_hide'] = array_keys(array_filter($form_state['values']['registration_hide']));
 }
 
 /**
@@ -68,8 +68,8 @@ 
  *   Associated fields for the given content type.
  */
 function _content_profile_registration_get_fields($type) {
-  $typeinfo = content_types($type);
-  return $typeinfo['fields'];
+    $typeinfo = content_types($type);
+    return $typeinfo['fields'];
 }
 
 /**
@@ -81,19 +81,19 @@ 
  *   An array of fields suitable for use in a select field.
 */
 function _content_profile_registration_get_field_select($type) {
-  $fields = module_exists('content') ? _content_profile_registration_get_fields($type) : array();
-  $return = array();
-  if (!module_exists('auto_nodetitle') || auto_nodetitle_get_setting($type) != AUTO_NODETITLE_ENABLED) {
+    $fields = module_exists('content') ? _content_profile_registration_get_fields($type) : array();
+    $return = array();
+    if (!module_exists('auto_nodetitle') || auto_nodetitle_get_setting($type) != AUTO_NODETITLE_ENABLED) {
     $return['title'] = t('Title');
-  }
-  foreach ($fields as $fieldname => $info) {
+    }
+    foreach ($fields as $fieldname => $info) {
     if (!$info['required']) {
-      $return[$fieldname] = drupal_ucfirst($info['widget']['label']);
+        $return[$fieldname] = drupal_ucfirst($info['widget']['label']);
     }
-  }
-  $return['other'] = t('Other form elements (except for required CCK fields)');
+    }
+    $return['other'] = t('Other form elements (except for required CCK fields)');
   
-  return $return;
+    return $return;
 }
 
 /**
@@ -104,28 +104,28 @@ 
  * @see content_profile_registration_user_register_submit()
  */
 function content_profile_registration_add_profile_form($type, &$form, &$form_state) {
-  // Initialize new node and add in its form.
-  $node = array('uid' => 0, 'name' => '', 'type' => $type);
-  // Get the original node form.
-  $node_form = drupal_retrieve_form($type .'_node_form', $form_state, $node);
-  drupal_prepare_form($type .'_node_form', $node_form, $form_state);
+    // Initialize new node and add in its form.
+    $node = array('uid' => 0, 'name' => '', 'type' => $type);
+    // Get the original node form.
+    $node_form = drupal_retrieve_form($type .'_node_form', $form_state, $node);
+    drupal_prepare_form($type .'_node_form', $node_form, $form_state);
 
-  $node_form += array('#field_info' => array());
-  $form_add = array();
+    $node_form += array('#field_info' => array());
+    $form_add = array();
 
-  // If non-CCK form elements are hidden, only copy over the CCK stuff
-  if (in_array('other', content_profile_get_settings($type, 'registration_hide'))) {
+    // If non-CCK form elements are hidden, only copy over the CCK stuff
+    if (in_array('other', content_profile_get_settings($type, 'registration_hide'))) {
     foreach ($node_form['#field_info'] as $field_name => $info) {
-      if (isset($node_form[$field_name])) {
+        if (isset($node_form[$field_name])) {
         $form_add[$field_name] = $node_form[$field_name];
-      }
+        }
     }
     // Copy over any fieldgroups
     $keys = array_keys($node_form);
     foreach ($keys as $key) {
-      if (stristr($key, 'group_')) {
+        if (stristr($key, 'group_')) {
         $form_add[$key] = $node_form[$key];
-      }
+        }
     }
     // Add the title
     $form_add['title'] = $node_form['title'];
@@ -133,51 +133,51 @@ 
     // Set this to the values of one node, as it might be need by some #ahah callbacks
     $form_add['#node'] = $node_form['#node'];
     $form_add['type'] = $node_form['type'];
-  }
-  else {
+    }
+    else {
     foreach (array('uid', 'name', 'author', 'buttons', 'language', '#theme', 'options') as $key) {
-      unset($node_form[$key]);
+        unset($node_form[$key]);
     }
     $form_add = $node_form;
-  }
+    }
 
-  // Hide fields as configured
-  foreach (content_profile_get_settings($type, 'registration_hide') as $field_name) {
+    // Hide fields as configured
+    foreach (content_profile_get_settings($type, 'registration_hide') as $field_name) {
     if (module_exists('fieldgroup') && ($group_name = _fieldgroup_field_get_group($type, $field_name))) {
-      unset($form_add[$group_name][$field_name]);
-      if (count(element_children($form_add[$group_name])) == 0) {
+        unset($form_add[$group_name][$field_name]);
+        if (count(element_children($form_add[$group_name])) == 0) {
         unset($form_add[$group_name]);
-      }
+        }
     }
     else {
-      unset($form_add[$field_name]);
+        unset($form_add[$field_name]);
+    }
     }
-  }
   
-  // Add in the new form elements into $form.
-  $form += array('#field_info' => array());
-  $form['#field_info'] += $node_form['#field_info'];
-  $form += $form_add;
+    // Add in the new form elements into $form.
+    $form += array('#field_info' => array());
+    $form['#field_info'] += $node_form['#field_info'];
+    $form += $form_add;
   
-  // Add in further callbacks needed, if not yet done.
-  if (!isset($form['#content_profile_weights'])) {
+    // Add in further callbacks needed, if not yet done.
+    if (!isset($form['#content_profile_weights'])) {
     $form['#submit'][] = 'content_profile_registration_user_register_submit';
     $form['#validate'][] = 'content_profile_registration_user_register_validate';
     $form['#pre_render'][] = 'content_profile_registration_alter_weights';
-  }
+    }
 
-  // Care for the weights: Make use of the content types weight and sort the fields in behalf
-  // The weights will be applied by the pre_render callback.
-  $form += array('#content_profile_weights' => array());
-  $weight = content_profile_get_settings($type, 'weight') + 1;
-  foreach (element_children($form_add) as $key) {
+    // Care for the weights: Make use of the content types weight and sort the fields in behalf
+    // The weights will be applied by the pre_render callback.
+    $form += array('#content_profile_weights' => array());
+    $weight = content_profile_get_settings($type, 'weight') + 1;
+    foreach (element_children($form_add) as $key) {
     $form['#content_profile_weights'] += array($key => $weight);
-  }
+    }
 
-  // Set the enctype, if necessary.
-  if (isset($node_form['#attributes']['enctype'])){
+    // Set the enctype, if necessary.
+    if (isset($node_form['#attributes']['enctype'])){
     $form['#attributes']['enctype'] = $node_form['#attributes']['enctype'];
-  }
+    }
 }
 
 /**
@@ -187,13 +187,13 @@ 
  * @see content_profile_registration_add_profile_form().
  */
 function content_profile_registration_alter_weights($elements) {
-  foreach ($elements['#content_profile_weights'] as $key => $weight) {
+    foreach ($elements['#content_profile_weights'] as $key => $weight) {
     if (isset($elements[$key]) && is_array($elements[$key])) {
-      $elements[$key] += array('#weight' => 0);
-      $elements[$key]['#weight'] = $weight + $elements[$key]['#weight'] / 1000;
+        $elements[$key] += array('#weight' => 0);
+        $elements[$key]['#weight'] = $weight + $elements[$key]['#weight'] / 1000;
     }
-  }
-  return $elements;
+    }
+    return $elements;
 }
 
 
@@ -201,9 +201,9 @@ 
  * Validates the user registration form
  */
 function content_profile_registration_user_register_validate($form, &$form_state) {
-  require_once drupal_get_path('module', 'node') .'/node.pages.inc';
+    require_once drupal_get_path('module', 'node') .'/node.pages.inc';
 
-  foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
+    foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
     $node = (object)$form_state['values'];
     $node->type = $type;
     node_object_prepare($node);
@@ -212,32 +212,32 @@ 
     unset($node->name);
 
     if (!in_array('other', content_profile_get_settings($type, 'registration_hide'))) {
-      node_validate($node, $form);
+        node_validate($node, $form);
     }
     elseif (module_exists('content')) {
-      content_validate($node);
+        content_validate($node);
     }
 
     $form_state['content_profile_registration'][$type]['node'] = $node;
-  }
-  // Remove our added values
-  foreach ($form['#content_profile_weights'] as $key => $weight) {
+    }
+    // Remove our added values
+    foreach ($form['#content_profile_weights'] as $key => $weight) {
     _content_profile_registration_remove_values($key, $form[$key], $form_state);
-  }
+    }
 }
 
 /**
  * Recursivly removes all form values created by this element or its children.
  */
 function _content_profile_registration_remove_values($key, $element, &$form_state) {
-  if ((isset($element['#input']) || !empty($element['#tree'])) && isset($form_state['values'][$key])) {
+    if ((isset($element['#input']) || !empty($element['#tree'])) && isset($form_state['values'][$key])) {
     unset($form_state['values'][$key]);
-  }
-  elseif (empty($element['#input']) && empty($element['#tree'])) {
+    }
+    elseif (empty($element['#input']) && empty($element['#tree'])) {
     foreach (element_children($element) as $key) {
-      _content_profile_registration_remove_values($key, $element[$key], $form_state);
+        _content_profile_registration_remove_values($key, $element[$key], $form_state);
+    }
     }
-  }
 }
 
 
@@ -245,33 +245,33 @@ 
  * Submits the user registration form
  */
 function content_profile_registration_user_register_submit($form, &$form_state) {
-  foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
+    foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
     if ($node = &$form_state['content_profile_registration'][$type]['node']) {
-      // Set user's information for the node.
-      if (empty($node->title) && (!module_exists('auto_nodetitle') || auto_nodetitle_get_setting($type) != AUTO_NODETITLE_OPTIONAL)) {
+        // Set user's information for the node.
+        if (empty($node->title) && (!module_exists('auto_nodetitle') || auto_nodetitle_get_setting($type) != AUTO_NODETITLE_OPTIONAL)) {
         $node->title = $form_state['user']->name;
-      }
-      $node->uid = $form_state['user']->uid;
-      $node->name = $form_state['user']->name;
+        }
+        $node->uid = $form_state['user']->uid;
+        $node->name = $form_state['user']->name;
 
-      // Create the node.
-      $node = node_submit($node);
-      node_save($node);
-      // Give us a nice log message.
-      if ($node->nid) {
+        // Create the node.
+        $node = node_submit($node);
+        node_save($node);
+        // Give us a nice log message.
+        if ($node->nid) {
         watchdog('content', 'Content Profile: added %user %type upon registration.', array('%user' => $node->name, '%type' => $type), WATCHDOG_NOTICE, l(t('view'), "node/$node->nid"));
-      }
+        }
+    }
     }
-  }
 }
 
 /**
  * Implementation of hook_content_profile_settings().
  */
 function content_profile_registration_content_profile_settings() {
-  return array(
+    return array(
     'registration_use' => FALSE,
     'admin_user_create_use' => FALSE,
     'registration_hide' => array(),
-  );
+    );
 }

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
  */
 function content_profile_registration_form_alter(&$form, &$form_state, $form_id) {
   if ($form_id == 'user_register') {
-    require_once drupal_get_path('module', 'node') .'/node.pages.inc';
+    require_once drupal_get_path('module', 'node').'/node.pages.inc';
 
     // Allow other modules to customize the used profile types, so modules
     // can easily customize the registration form.
@@ -107,8 +107,8 @@ 
   // Initialize new node and add in its form.
   $node = array('uid' => 0, 'name' => '', 'type' => $type);
   // Get the original node form.
-  $node_form = drupal_retrieve_form($type .'_node_form', $form_state, $node);
-  drupal_prepare_form($type .'_node_form', $node_form, $form_state);
+  $node_form = drupal_retrieve_form($type.'_node_form', $form_state, $node);
+  drupal_prepare_form($type.'_node_form', $node_form, $form_state);
 
   $node_form += array('#field_info' => array());
   $form_add = array();
@@ -175,7 +175,7 @@ 
   }
 
   // Set the enctype, if necessary.
-  if (isset($node_form['#attributes']['enctype'])){
+  if (isset($node_form['#attributes']['enctype'])) {
     $form['#attributes']['enctype'] = $node_form['#attributes']['enctype'];
   }
 }
@@ -190,7 +190,7 @@ 
   foreach ($elements['#content_profile_weights'] as $key => $weight) {
     if (isset($elements[$key]) && is_array($elements[$key])) {
       $elements[$key] += array('#weight' => 0);
-      $elements[$key]['#weight'] = $weight + $elements[$key]['#weight'] / 1000;
+      $elements[$key]['#weight'] = $weight + $elements[$key]['#weight']/1000;
     }
   }
   return $elements;
@@ -201,7 +201,7 @@ 
  * Validates the user registration form
  */
 function content_profile_registration_user_register_validate($form, &$form_state) {
-  require_once drupal_get_path('module', 'node') .'/node.pages.inc';
+  require_once drupal_get_path('module', 'node').'/node.pages.inc';
 
   foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
     $node = (object)$form_state['values'];

Braces +6 added lines, -11 removed lines

@@ -21,8 +21,7 @@ 
     foreach ($form['#content_profile_registration_use_types'] as $type => $typename) {
       content_profile_registration_add_profile_form($type, $form, $form_state);
     }
-  }
-  elseif ($form_id == 'content_profile_admin_settings') {
+  } elseif ($form_id == 'content_profile_admin_settings') {
     $type = $form_state['type'];
     // Let other modules add registration child elements before us!
     $form += array('registration' => array());
@@ -133,8 +132,7 @@ 
     // Set this to the values of one node, as it might be need by some #ahah callbacks
     $form_add['#node'] = $node_form['#node'];
     $form_add['type'] = $node_form['type'];
-  }
-  else {
+  } else {
     foreach (array('uid', 'name', 'author', 'buttons', 'language', '#theme', 'options') as $key) {
       unset($node_form[$key]);
     }
@@ -148,8 +146,7 @@ 
       if (count(element_children($form_add[$group_name])) == 0) {
         unset($form_add[$group_name]);
       }
-    }
-    else {
+    } else {
       unset($form_add[$field_name]);
     }
   }
@@ -175,7 +172,7 @@ 
   }
 
   // Set the enctype, if necessary.
-  if (isset($node_form['#attributes']['enctype'])){
+  if (isset($node_form['#attributes']['enctype'])) {
     $form['#attributes']['enctype'] = $node_form['#attributes']['enctype'];
   }
 }
@@ -213,8 +210,7 @@ 
 
     if (!in_array('other', content_profile_get_settings($type, 'registration_hide'))) {
       node_validate($node, $form);
-    }
-    elseif (module_exists('content')) {
+    } elseif (module_exists('content')) {
       content_validate($node);
     }
 
@@ -232,8 +228,7 @@ 
 function _content_profile_registration_remove_values($key, $element, &$form_state) {
   if ((isset($element['#input']) || !empty($element['#tree'])) && isset($form_state['values'][$key])) {
     unset($form_state['values'][$key]);
-  }
-  elseif (empty($element['#input']) && empty($element['#tree'])) {
+  } elseif (empty($element['#input']) && empty($element['#tree'])) {
     foreach (element_children($element) as $key) {
       _content_profile_registration_remove_values($key, $element[$key], $form_state);
     }

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

@@ -30,7 +30,7 @@ 
       '#type' => 'fieldset',
       '#title' => t('User Registration'),
       '#description' => t('Customize how this content profile shows up on the user registration page.'),
-      '#collapsible' => TRUE,
+      '#collapsible' => true,
     );
     $form['registration']['registration_use'] = array(
       '#type' => 'checkbox',
@@ -270,8 +270,8 @@ 
  */
 function content_profile_registration_content_profile_settings() {
   return array(
-    'registration_use' => FALSE,
-    'admin_user_create_use' => FALSE,
+    'registration_use' => false,
+    'admin_user_create_use' => false,
     'registration_hide' => array(),
   );
 }

drupal/sites/default/boinc/modules/contrib/content_profile/modules/content_profile_tokens.module

Indentation +43 added lines, -43 removed lines

@@ -12,83 +12,83 @@
  * Implementation of hook_token_values().
  */
 function content_profile_tokens_token_values($type, $object = NULL, $options = array()) {
-  $values = array();
-  $types = content_profile_get_types('types');
-  switch ($type) {
+    $values = array();
+    $types = content_profile_get_types('types');
+    switch ($type) {
     case 'user':
       foreach($types as $type_name => $type) {
         if (isset($object)) {
-          $profile = content_profile_load($type_name, $object->uid);
+            $profile = content_profile_load($type_name, $object->uid);
         }
         else {
-          global $user;
-          $profile = content_profile_load($type_name, $user->uid);
+            global $user;
+            $profile = content_profile_load($type_name, $user->uid);
         }
         $fields = content_types($type_name);
         foreach ($fields['fields'] as $field_name => $field) {
-          if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
-          }
+            if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
+                $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
+                $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
+            }
+        }
         }
-      }
-      break;
+        break;
 
     case 'flag_friend':
       if(!empty($object)) {
         foreach($types as $type_name => $type) {
-          $profile_requestor = content_profile_load($type_name, $object->friend->uid);
-          $profile_requestee = content_profile_load($type_name, $object->uid);
+            $profile_requestor = content_profile_load($type_name, $object->friend->uid);
+            $profile_requestee = content_profile_load($type_name, $object->uid);
           
-          $fields = content_types($type_name);
-          foreach ($fields['fields'] as $field_name => $field) {
+            $fields = content_types($type_name);
+            foreach ($fields['fields'] as $field_name => $field) {
             if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
+                $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
+                $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
               
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
+                $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
+                $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
             }
-          }
+            }
+        }
         }
-      }
-      break;
-  }
-  return $values;
+        break;
+    }
+    return $values;
 }
 
 /**
  * Implementation of hook_token_list().
  */
 function content_profile_tokens_token_list($type = 'all') {
-  $tokens = array();
-  if ($type == 'user' || $type == 'all') {
+    $tokens = array();
+    if ($type == 'user' || $type == 'all') {
     $types = content_profile_get_types('types');
     foreach ($types as $type_name => $type) {
     
-      $fields = content_types($type_name);
-      foreach ($fields['fields'] as $field_name => $field) {
+        $fields = content_types($type_name);
+        foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-          $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6)] = t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+            $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6)] = t($fields['description']) .'-'. t($field['widget']['label']);
+            $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+        }
         }
-      }
     }
-  }
+    }
   
-  if ($type == 'flag_friend' && module_exists('flag_friend')) {
+    if ($type == 'flag_friend' && module_exists('flag_friend')) {
     foreach($types as $type_name => $type) {
-      $fields = content_types($type_name);
-      foreach ($fields['fields'] as $field_name => $field) {
+        $fields = content_types($type_name);
+        foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-          $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6)] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+            $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6)] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']);
+            $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
 
-          $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6)] = t('Requestee:') . t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestee:') .t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+            $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6)] = t('Requestee:') . t($fields['description']) .'-'. t($field['widget']['label']);
+            $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestee:') .t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+        }
         }
-      }
     }
-  }
-  return $tokens;
+    }
+    return $tokens;
 }

Switch Indentation +30 added lines, -30 removed lines

@@ -15,44 +15,44 @@
   $values = array();
   $types = content_profile_get_types('types');
   switch ($type) {
-    case 'user':
-      foreach($types as $type_name => $type) {
-        if (isset($object)) {
-          $profile = content_profile_load($type_name, $object->uid);
-        }
-        else {
-          global $user;
-          $profile = content_profile_load($type_name, $user->uid);
-        }
-        $fields = content_types($type_name);
-        foreach ($fields['fields'] as $field_name => $field) {
-          if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
-          }
+  case 'user':
+    foreach($types as $type_name => $type) {
+      if (isset($object)) {
+        $profile = content_profile_load($type_name, $object->uid);
+      }
+      else {
+        global $user;
+        $profile = content_profile_load($type_name, $user->uid);
+      }
+      $fields = content_types($type_name);
+      foreach ($fields['fields'] as $field_name => $field) {
+        if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
+            $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
+            $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
         }
       }
-      break;
+    }
+    break;
 
-    case 'flag_friend':
-      if(!empty($object)) {
-        foreach($types as $type_name => $type) {
-          $profile_requestor = content_profile_load($type_name, $object->friend->uid);
-          $profile_requestee = content_profile_load($type_name, $object->uid);
+  case 'flag_friend':
+    if(!empty($object)) {
+      foreach($types as $type_name => $type) {
+        $profile_requestor = content_profile_load($type_name, $object->friend->uid);
+        $profile_requestee = content_profile_load($type_name, $object->uid);
           
-          $fields = content_types($type_name);
-          foreach ($fields['fields'] as $field_name => $field) {
-            if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
+        $fields = content_types($type_name);
+        foreach ($fields['fields'] as $field_name => $field) {
+          if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
+            $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
+            $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
               
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
-            }
+            $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
+            $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
           }
         }
       }
-      break;
+    }
+    break;
   }
   return $values;
 }

Spacing +16 added lines, -16 removed lines

@@ -16,7 +16,7 @@ 
   $types = content_profile_get_types('types');
   switch ($type) {
     case 'user':
-      foreach($types as $type_name => $type) {
+      foreach ($types as $type_name => $type) {
         if (isset($object)) {
           $profile = content_profile_load($type_name, $object->uid);
         }
@@ -27,27 +27,27 @@ 
         $fields = content_types($type_name);
         foreach ($fields['fields'] as $field_name => $field) {
           if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
-              $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value'];
+              $values['content-profile-'.$type_name.'-'.substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']);
+              $values['content-profile-'.$type_name.'-'.substr($field_name, 6).'-raw'] = $profile->{$field_name}[0]['value'];
           }
         }
       }
       break;
 
     case 'flag_friend':
-      if(!empty($object)) {
-        foreach($types as $type_name => $type) {
+      if (!empty($object)) {
+        foreach ($types as $type_name => $type) {
           $profile_requestor = content_profile_load($type_name, $object->friend->uid);
           $profile_requestee = content_profile_load($type_name, $object->uid);
           
           $fields = content_types($type_name);
           foreach ($fields['fields'] as $field_name => $field) {
             if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
-              $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value'];
+              $values['requestor-'.$type_name.'-'.substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']);
+              $values['requestor-'.$type_name.'-'.substr($field_name, 6).'-raw'] = $profile_requestor->{$field_name}[0]['value'];
               
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
-              $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value'];
+              $values['requestee-'.$type_name.'-'.substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']);
+              $values['requestee-'.$type_name.'-'.substr($field_name, 6).'-raw'] = $profile_requestee->{$field_name}[0]['value'];
             }
           }
         }
@@ -69,23 +69,23 @@ 
       $fields = content_types($type_name);
       foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-          $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6)] = t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+          $tokens['user']['content-profile-'.$type_name.'-'.substr($field_name, 6)] = t($fields['description']).'-'.t($field['widget']['label']);
+          $tokens['user']['content-profile-'.$type_name.'-'.substr($field_name, 6).'-raw'] = t($fields['description']).'-'.t($field['widget']['label']).' '.t('WARNING - raw user input');
         }
       }
     }
   }
   
   if ($type == 'flag_friend' && module_exists('flag_friend')) {
-    foreach($types as $type_name => $type) {
+    foreach ($types as $type_name => $type) {
       $fields = content_types($type_name);
       foreach ($fields['fields'] as $field_name => $field) {
         if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) {
-          $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6)] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+          $tokens['content_profile_flag_friend']['requestor-'.$type_name.'-'.substr($field_name, 6)] = t('Requestor:').t($fields['description']).'-'.t($field['widget']['label']);
+          $tokens['content_profile_flag_friend']['requestor-'.$type_name.'-'.substr($field_name, 6).'-raw'] = t('Requestor:').t($fields['description']).'-'.t($field['widget']['label']).' '.t('WARNING - raw user input');
 
-          $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6)] = t('Requestee:') . t($fields['description']) .'-'. t($field['widget']['label']);
-          $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestee:') .t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input');
+          $tokens['content_profile_flag_friend']['requestee-'.$type_name.'-'.substr($field_name, 6)] = t('Requestee:').t($fields['description']).'-'.t($field['widget']['label']);
+          $tokens['content_profile_flag_friend']['requestee-'.$type_name.'-'.substr($field_name, 6).'-raw'] = t('Requestee:').t($fields['description']).'-'.t($field['widget']['label']).' '.t('WARNING - raw user input');
         }
       }
     }

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
       foreach($types as $type_name => $type) {
         if (isset($object)) {
           $profile = content_profile_load($type_name, $object->uid);
-        }
-        else {
+        } else {
           global $user;
           $profile = content_profile_load($type_name, $user->uid);
         }

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

@@ -11,7 +11,7 @@
 /**
  * Implementation of hook_token_values().
  */
-function content_profile_tokens_token_values($type, $object = NULL, $options = array()) {
+function content_profile_tokens_token_values($type, $object = null, $options = array()) {
   $values = array();
   $types = content_profile_get_types('types');
   switch ($type) {

drupal/sites/default/boinc/modules/contrib/content_profile/content_profile.rules.inc

Indentation +28 added lines, -28 removed lines

@@ -10,79 +10,79 @@ 
  * Implementation of hook_rules_condition_info().
  */
 function content_profile_rules_condition_info() {
-  return array(
+    return array(
     'content_profile_user_has_profile_condition' => array(
-      'label' => t('User has content profile'),
-      'arguments' => array(
+        'label' => t('User has content profile'),
+        'arguments' => array(
         'user' => array('type' => 'user', 'label' => t('User')),
-      ),
-      'module' => 'Content Profile',
+        ),
+        'module' => 'Content Profile',
     ),
-  );
+    );
 }
 
 function content_profile_user_has_profile_condition($user, $settings) {
-  $node = content_profile_load($settings['type'], $user->uid);
-  return (bool)$node;
+    $node = content_profile_load($settings['type'], $user->uid);
+    return (bool)$node;
 }
 
 function content_profile_user_has_profile_condition_form($settings, &$form) {
-  $settings += array('type' => array());
-  $form['settings']['type'] = array(
+    $settings += array('type' => array());
+    $form['settings']['type'] = array(
     '#type' => 'select',
     '#title' => t('Content Profile Content Type'),
     '#options' => content_profile_get_types('names'),
     '#default_value' => $settings['type'],
     '#description' => t('Select the Content Profile content type to check for.'),
     '#required' => TRUE,
-  );
+    );
 }
 
 function content_profile_user_has_profile_condition_label($settings, $argument_labels) {
-  return t('@user has his @type created', $argument_labels + array('@type' => node_get_types('name', $settings['type'])));
+    return t('@user has his @type created', $argument_labels + array('@type' => node_get_types('name', $settings['type'])));
 }
 
 /**
  * Implementation of hook_rules_action_info().
  */
 function content_profile_rules_action_info() {
-  return array(
+    return array(
     'content_profile_action_load' => array(
-      'label' => t('Load Content Profile'),
-      'arguments' => array(
+        'label' => t('Load Content Profile'),
+        'arguments' => array(
         'user' => array('type' => 'user', 'label' => t('User, whose profile should be loaded')),
-      ),
-      'new variables' => array(
+        ),
+        'new variables' => array(
         'profile_node' => array('type' => 'node', 'label' => t('Content Profile')),
-      ),
-      'module' => 'Content Profile',
+        ),
+        'module' => 'Content Profile',
     ),
-  );
+    );
 }
 
 /**
  * Loads a Content Profile
  */
 function content_profile_action_load($user, $settings) {
-  if ($node = content_profile_load($settings['type'], $user->uid)) {
+    if ($node = content_profile_load($settings['type'], $user->uid)) {
     return array('profile_node' => $node);
-  }
+    }
 }
 
 function content_profile_action_load_form($settings, &$form) {
-  $settings += array('type' => array());
-  $form['settings']['type'] = array(
+    $settings += array('type' => array());
+    $form['settings']['type'] = array(
     '#type' => 'select',
     '#title' => t('Content Profile Content Type'),
     '#options' => content_profile_get_types('names'),
     '#default_value' => $settings['type'],
     '#description' => t('Select the Content Profile content type to load.'),
     '#required' => TRUE,
-  );
+    );
 }
 
 function content_profile_action_load_label($settings, $argument_labels) {
-  return t("Load @user's @type", $argument_labels + array('@type' => node_get_types('name', $settings['type'])));
+    return t("Load @user's @type", $argument_labels + array('@type' => node_get_types('name', $settings['type'])));
 }
 
 
@@ -90,8 +90,8 @@ 
  * Support upgrading from nodeprofile-workflow-ng integration.
  */
 function nodeprofile_user_has_profile_condition_upgrade(&$element) {
-  $element['#name'] = 'content_profile_user_has_profile_condition';
+    $element['#name'] = 'content_profile_user_has_profile_condition';
 }
 function nodeprofile_action_load_upgrade(&$element) {
-  $element['#name'] = 'content_profile_action_load';
+    $element['#name'] = 'content_profile_action_load';
 }

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

@@ -34,7 +34,7 @@ 
     '#options' => content_profile_get_types('names'),
     '#default_value' => $settings['type'],
     '#description' => t('Select the Content Profile content type to check for.'),
-    '#required' => TRUE,
+    '#required' => true,
   );
 }
 
@@ -77,7 +77,7 @@ 
     '#options' => content_profile_get_types('names'),
     '#default_value' => $settings['type'],
     '#description' => t('Select the Content Profile content type to load.'),
-    '#required' => TRUE,
+    '#required' => true,
   );
 }
 

drupal/sites/default/boinc/modules/contrib/content_profile/views/content_profile_views_handler_relationship.inc

Indentation +24 added lines, -24 removed lines

@@ -6,46 +6,46 @@ 
  * Specialized relationship handler to adding content profiles.
  */
 class content_profile_views_handler_relationship extends views_handler_relationship {
-  function option_definition() {
+    function option_definition() {
     $options = parent::option_definition();
 
     $options['type'] = array('default' => '');
     return $options;
-  }
+    }
 
-  /**
-   * Adds a form element for choosing the right content type.
-   */
-  function options_form(&$form, &$form_state) {
+    /**
+     * Adds a form element for choosing the right content type.
+     */
+    function options_form(&$form, &$form_state) {
     parent::options_form($form, $form_state);
 
     $form['type'] = array(
-      '#type' => 'radios',
-      '#title' => t('Content type'),
-      '#default_value' => $this->options['type'],
-      '#options' => content_profile_get_types('names'),
-      '#required' => TRUE,
+        '#type' => 'radios',
+        '#title' => t('Content type'),
+        '#default_value' => $this->options['type'],
+        '#options' => content_profile_get_types('names'),
+        '#required' => TRUE,
     );
-  }
+    }
 
-  /**
-   * Called to implement a relationship in a query.
-   */
-  function query() {
+    /**
+     * Called to implement a relationship in a query.
+     */
+    function query() {
     // Figure out what base table this relationship brings to the party.
     $join = new views_join();
     $join->definition = array(
-      'table' => 'node',
-      'field' => 'uid',
-      'left_table' => !empty($this->relationship) ? $this->relationship : 'users',
-      'left_field' => 'uid',
-      'extra' => array(
+        'table' => 'node',
+        'field' => 'uid',
+        'left_table' => !empty($this->relationship) ? $this->relationship : 'users',
+        'left_field' => 'uid',
+        'extra' => array(
         array('field' => 'type', 'value' => $this->options['type']),
-      ),
+        ),
     );
 
     if (!empty($this->options['required'])) {
-      $join->definition['type'] = 'INNER';
+        $join->definition['type'] = 'INNER';
     }
 
     $join->construct();
@@ -53,5 +53,5 @@ 
 
     $alias = $join->definition['table'] .'_'. $join->definition['left_table'];
     $this->alias = $this->query->add_relationship($alias, $join, $this->definition['base'], $this->relationship);
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     $join->construct();
     $this->ensure_my_table();
 
-    $alias = $join->definition['table'] .'_'. $join->definition['left_table'];
+    $alias = $join->definition['table'].'_'.$join->definition['left_table'];
     $this->alias = $this->query->add_relationship($alias, $join, $this->definition['base'], $this->relationship);
   }
 }

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

@@ -24,7 +24,7 @@
       '#title' => t('Content type'),
       '#default_value' => $this->options['type'],
       '#options' => content_profile_get_types('names'),
-      '#required' => TRUE,
+      '#required' => true,
     );
   }