BOINC / boinc

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

Spacing +7 added lines, -7 removed lines

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

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

Spacing +15 added lines, -15 removed lines

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

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

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;
 }

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

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);
   }
 

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

Spacing +24 added lines, -24 removed lines

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

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

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

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

Spacing +95 added lines, -95 removed lines

@@ -18,17 +18,17 @@ 
 function content_help($path, $arg) {
   switch ($path) {
     case 'admin/help#content':
-      $output = '<p>'. t('The content module, a required component of the Content Construction Kit (CCK), allows administrators to associate custom fields with content types. In Drupal, content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Using the content module (and the other helper modules included in CCK), custom fields beyond the default "Title" and "Body" may be added. CCK features are accessible through tabs on the <a href="@content-types">content types administration page</a>. (See the <a href="@node-help">node module help page</a> for more information about content types.)', array('@content-types' => url('admin/content/types'), '@node-help' => url('admin/help/node'))) .'</p>';
-      $output .= '<p>'. t('When adding a custom field to a content type, you determine its type (whether it will contain text, numbers, or references to other objects) and how it will be displayed (either as a text field or area, a select box, checkbox, radio button, or autocompleting field). A field may have multiple values (i.e., a "person" may have multiple e-mail addresses) or a single value (i.e., an "employee" has a single employee identification number). As you add and edit fields, CCK automatically adjusts the structure of the database as necessary. CCK also provides a number of other features, including intelligent caching for your custom data, an import and export facility for content type definitions, and integration with other contributed modules.') .'</p>';
-      $output .= '<p>'. t('Custom field types are provided by a set of optional modules included with CCK (each module provides a different type). The <a href="@modules">modules page</a> allows you to enable or disable CCK components. A default installation of CCK includes:', array('@modules' => url('admin/build/modules'))) .'</p>';
+      $output = '<p>'.t('The content module, a required component of the Content Construction Kit (CCK), allows administrators to associate custom fields with content types. In Drupal, content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Using the content module (and the other helper modules included in CCK), custom fields beyond the default "Title" and "Body" may be added. CCK features are accessible through tabs on the <a href="@content-types">content types administration page</a>. (See the <a href="@node-help">node module help page</a> for more information about content types.)', array('@content-types' => url('admin/content/types'), '@node-help' => url('admin/help/node'))).'</p>';
+      $output .= '<p>'.t('When adding a custom field to a content type, you determine its type (whether it will contain text, numbers, or references to other objects) and how it will be displayed (either as a text field or area, a select box, checkbox, radio button, or autocompleting field). A field may have multiple values (i.e., a "person" may have multiple e-mail addresses) or a single value (i.e., an "employee" has a single employee identification number). As you add and edit fields, CCK automatically adjusts the structure of the database as necessary. CCK also provides a number of other features, including intelligent caching for your custom data, an import and export facility for content type definitions, and integration with other contributed modules.').'</p>';
+      $output .= '<p>'.t('Custom field types are provided by a set of optional modules included with CCK (each module provides a different type). The <a href="@modules">modules page</a> allows you to enable or disable CCK components. A default installation of CCK includes:', array('@modules' => url('admin/build/modules'))).'</p>';
       $output .= '<ul>';
-      $output .= '<li>'. t('<em>number</em>, which adds numeric field types, in integer, decimal or floating point form. You may define a set of allowed inputs, or specify an allowable range of values. A variety of common formats for displaying numeric data are available.') .'</li>';
-      $output .= '<li>'. t("<em>text</em>, which adds text field types. A text field may contain plain text only, or optionally, may use Drupal's input format filters to securely manage rich text input. Text input fields may be either a single line (text field), multiple lines (text area), or for greater input control, a select box, checkbox, or radio buttons. If desired, CCK can validate the input to a set of allowed values.") .'</li>';
-      $output .= '<li>'. t('<em>nodereference</em>, which creates custom references between Drupal nodes. By adding a <em>nodereference</em> field and two different content types, for instance, you can easily create complex parent/child relationships between data (multiple "employee" nodes may contain a <em>nodereference</em> field linking to an "employer" node).') .'</li>';
-      $output .= '<li>'. t('<em>userreference</em>, which creates custom references to your sites\' user accounts. By adding a <em>userreference</em> field, you can create complex relationships between your site\'s users and posts. To track user involvement in a post beyond Drupal\'s standard <em>Authored by</em> field, for instance, add a <em>userreference</em> field named "Edited by" to a content type to store a link to an editor\'s user account page.') .'</li>';
-      $output .= '<li>'. t('<em>fieldgroup</em>, which creates collapsible fieldsets to hold a group of related fields. A fieldset may either be open or closed by default. The order of your fieldsets, and the order of fields within a fieldset, is managed via a drag-and-drop interface provided by content module.') .'</li>';
+      $output .= '<li>'.t('<em>number</em>, which adds numeric field types, in integer, decimal or floating point form. You may define a set of allowed inputs, or specify an allowable range of values. A variety of common formats for displaying numeric data are available.').'</li>';
+      $output .= '<li>'.t("<em>text</em>, which adds text field types. A text field may contain plain text only, or optionally, may use Drupal's input format filters to securely manage rich text input. Text input fields may be either a single line (text field), multiple lines (text area), or for greater input control, a select box, checkbox, or radio buttons. If desired, CCK can validate the input to a set of allowed values.").'</li>';
+      $output .= '<li>'.t('<em>nodereference</em>, which creates custom references between Drupal nodes. By adding a <em>nodereference</em> field and two different content types, for instance, you can easily create complex parent/child relationships between data (multiple "employee" nodes may contain a <em>nodereference</em> field linking to an "employer" node).').'</li>';
+      $output .= '<li>'.t('<em>userreference</em>, which creates custom references to your sites\' user accounts. By adding a <em>userreference</em> field, you can create complex relationships between your site\'s users and posts. To track user involvement in a post beyond Drupal\'s standard <em>Authored by</em> field, for instance, add a <em>userreference</em> field named "Edited by" to a content type to store a link to an editor\'s user account page.').'</li>';
+      $output .= '<li>'.t('<em>fieldgroup</em>, which creates collapsible fieldsets to hold a group of related fields. A fieldset may either be open or closed by default. The order of your fieldsets, and the order of fields within a fieldset, is managed via a drag-and-drop interface provided by content module.').'</li>';
       $output .= '</ul>';
-      $output .= '<p>'. t('For more information, see the online handbook entry for <a href="@handbook-cck">CCK</a> or the <a href="@project-cck">CCK project page</a>.', array('@handbook-cck' => 'http://drupal.org/handbook/modules/cck', '@project-cck' => 'http://drupal.org/project/cck')) .'</p>';
+      $output .= '<p>'.t('For more information, see the online handbook entry for <a href="@handbook-cck">CCK</a> or the <a href="@project-cck">CCK project page</a>.', array('@handbook-cck' => 'http://drupal.org/handbook/modules/cck', '@project-cck' => 'http://drupal.org/project/cck')).'</p>';
       return $output;
   }
 }
@@ -44,7 +44,7 @@ 
  * Implementation of hook_init().
  */
 function content_init() {
-  drupal_add_css(drupal_get_path('module', 'content') .'/theme/content-module.css');
+  drupal_add_css(drupal_get_path('module', 'content').'/theme/content-module.css');
   if (module_exists('token') && !function_exists('content_token_values')) {
     module_load_include('inc', 'content', 'includes/content.token');
   }
@@ -67,7 +67,7 @@ 
   // Customize the content types page with our own callback
   $items['admin/content/types']['page callback'] = 'content_types_overview';
   $items['admin/content/types']['file'] = 'content.admin.inc';
-  $items['admin/content/types']['file path'] = drupal_get_path('module', 'content') .'/includes';
+  $items['admin/content/types']['file path'] = drupal_get_path('module', 'content').'/includes';
 }
 
 /**
@@ -97,7 +97,7 @@ 
       $type_name = $type->type;
       $content_type = content_types($type_name);
       $type_url_str = $content_type['url_str'];
-      $items['admin/content/node-type/'. $type_url_str .'/fields'] = array(
+      $items['admin/content/node-type/'.$type_url_str.'/fields'] = array(
         'title' => 'Manage fields',
         'page callback' => 'drupal_get_form',
         'page arguments' => array('content_field_overview_form', $type_name),
@@ -106,7 +106,7 @@ 
         'type' => MENU_LOCAL_TASK,
         'weight' => 1,
       );
-      $items['admin/content/node-type/'. $type_url_str .'/display'] = array(
+      $items['admin/content/node-type/'.$type_url_str.'/display'] = array(
         'title' => 'Display fields',
         'page callback' => 'drupal_get_form',
         'page arguments' => array('content_display_overview_form', $type_name),
@@ -117,7 +117,7 @@ 
       );
       $contexts = content_build_modes('_tabs');
       foreach ($contexts as $key => $tab) {
-        $items['admin/content/node-type/'. $type_url_str .'/display/'. $key] = array(
+        $items['admin/content/node-type/'.$type_url_str.'/display/'.$key] = array(
           'title' => $tab['title'],
           'page arguments' => array('content_display_overview_form', $type_name, $key),
           'access arguments' => array('administer content types'),
@@ -127,9 +127,9 @@ 
       }
       // Cast as an array in case this is called before any fields have
       // been added, like when a new content type is created.
-      foreach ((array) $content_type['fields'] as $field) {
+      foreach ((array)$content_type['fields'] as $field) {
         $field_name = $field['field_name'];
-        $items['admin/content/node-type/'. $type_url_str .'/fields/'. $field_name] = array(
+        $items['admin/content/node-type/'.$type_url_str.'/fields/'.$field_name] = array(
           'title' => $field['widget']['label'],
           'page callback' => 'drupal_get_form',
           'page arguments' => array('content_field_edit_form', $type_name, $field_name),
@@ -137,7 +137,7 @@ 
           'file' => 'includes/content.admin.inc',
           'type' => MENU_LOCAL_TASK,
         );
-        $items['admin/content/node-type/'. $type_url_str .'/fields/'. $field_name .'/remove'] = array(
+        $items['admin/content/node-type/'.$type_url_str.'/fields/'.$field_name.'/remove'] = array(
           'title' => 'Remove field',
           'page callback' => 'drupal_get_form',
           'page arguments' => array('content_field_remove_form', $type_name, $field_name),
@@ -173,7 +173,7 @@ 
  * Implementation of hook_theme().
  */
 function content_theme() {
-  $path = drupal_get_path('module', 'content') .'/theme';
+  $path = drupal_get_path('module', 'content').'/theme';
   require_once "./$path/theme.inc";
 
   return array(
@@ -215,7 +215,7 @@ 
 function content_views_api() {
   return array(
     'api' => 2,
-    'path' => drupal_get_path('module', 'content') . '/includes/views',
+    'path' => drupal_get_path('module', 'content').'/includes/views',
   );
 }
 
@@ -224,7 +224,7 @@ 
  */
 function content_ctools_plugin_directory($module, $plugin) {
   if ($module == 'ctools' && $plugin == 'content_types') {
-    return 'includes/panels/' . $plugin;
+    return 'includes/panels/'.$plugin;
   }
 }
 
@@ -237,7 +237,7 @@ 
  * cache the loaded object structure and invalidate it during the update process.
  */
 function content_load(&$node) {
-  $cid = 'content:'. $node->nid .':'. $node->vid;
+  $cid = 'content:'.$node->nid.':'.$node->vid;
   if ($cached = cache_get($cid, content_cache_tablename())) {
     foreach ($cached->data as $key => $value) {
       $node->$key = $value;
@@ -297,7 +297,7 @@ 
 function content_update(&$node) {
   _content_field_invoke('update', $node);
   _content_field_invoke_default('update', $node);
-  cache_clear_all('content:'. $node->nid .':'. $node->vid, content_cache_tablename());
+  cache_clear_all('content:'.$node->nid.':'.$node->vid, content_cache_tablename());
 }
 
 /**
@@ -308,7 +308,7 @@ 
 function content_delete(&$node) {
   _content_field_invoke('delete', $node);
   _content_field_invoke_default('delete', $node);
-  cache_clear_all('content:'. $node->nid .':', content_cache_tablename(), TRUE);
+  cache_clear_all('content:'.$node->nid.':', content_cache_tablename(), TRUE);
 }
 
 /**
@@ -319,7 +319,7 @@ 
 function content_delete_revision(&$node) {
   _content_field_invoke('delete revision', $node);
   _content_field_invoke_default('delete revision', $node);
-  cache_clear_all('content:'. $node->nid .':'. $node->vid, content_cache_tablename());
+  cache_clear_all('content:'.$node->nid.':'.$node->vid, content_cache_tablename());
 }
 
 /**
@@ -333,7 +333,7 @@ 
 
   // Merge fields.
   $additions = _content_field_invoke_default('view', $node, $teaser, $page);
-  $node->content = array_merge((array) $node->content, $additions);
+  $node->content = array_merge((array)$node->content, $additions);
 }
 
 /**
@@ -371,7 +371,7 @@ 
     // One-field equivalent to _content_field_invoke('sanitize').
     $field_types = _content_field_types();
     $module = $field_types[$field['type']]['module'];
-    $function = $module .'_field';
+    $function = $module.'_field';
     if (function_exists($function)) {
       $function('sanitize', $node, $field, $items, $teaser, $page);
       $node->$field['field_name'] = $items;
@@ -405,7 +405,7 @@ 
   $additions = _content_field_invoke('prepare translation', $node);
   // Merge module additions after the default ones to enable overriding
   // of field values.
-  $node = (object) array_merge((array) $node, $default_additions, $additions);
+  $node = (object)array_merge((array)$node, $default_additions, $additions);
 }
 
 /**
@@ -417,7 +417,7 @@ 
     $type = content_types($node->type);
     // Save cycles if the type has no CCK fields.
     if (!empty($type['fields'])) {
-      $callback = 'content_'. str_replace(' ', '_', $op);
+      $callback = 'content_'.str_replace(' ', '_', $op);
       if (function_exists($callback)) {
         $callback($node, $a3, $a4);
       }
@@ -436,7 +436,7 @@ 
  *  Implementation of hook_form_alter().
  */
 function content_form_alter(&$form, $form_state, $form_id) {
-  if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id) {
+  if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'].'_node_form' == $form_id) {
     $type = content_types($form['#node']->type);
     if (!empty($type['fields'])) {
       module_load_include('inc', 'content', 'includes/content.node_form');
@@ -487,9 +487,9 @@ 
   $output = '';
 
   if ($field['multiple'] >= 1) {
-    $table_id = $element['#field_name'] .'_values';
-    $order_class = $element['#field_name'] .'-delta-order';
-    $required = !empty($element['#required']) ? '<span class="form-required" title="'. t('This field is required.') .'">*</span>' : '';
+    $table_id = $element['#field_name'].'_values';
+    $order_class = $element['#field_name'].'-delta-order';
+    $required = !empty($element['#required']) ? '<span class="form-required" title="'.t('This field is required.').'">*</span>' : '';
 
     $header = array(
       array(
@@ -504,7 +504,7 @@ 
     // preview or failed validation)
     $items = array();
     foreach (element_children($element) as $key) {
-      if ($key !== $element['#field_name'] .'_add_more') {
+      if ($key !== $element['#field_name'].'_add_more') {
         $items[] = &$element[$key];
       }
     }
@@ -526,8 +526,8 @@ 
     }
 
     $output .= theme('table', $header, $rows, array('id' => $table_id, 'class' => 'content-multiple-table'));
-    $output .= $element['#description'] ? '<div class="description">'. $element['#description'] .'</div>' : '';
-    $output .= drupal_render($element[$element['#field_name'] .'_add_more']);
+    $output .= $element['#description'] ? '<div class="description">'.$element['#description'].'</div>' : '';
+    $output .= drupal_render($element[$element['#field_name'].'_add_more']);
 
     drupal_add_tabledrag($table_id, 'order', 'sibling', $order_class);
   }
@@ -570,8 +570,8 @@ 
       if (variable_get('content_schema_version', -1) < 6007) {
         return FALSE;
       }
-      db_query("UPDATE {". content_field_tablename() ."} SET active=0 WHERE module='%s'", $module);
-      db_query("UPDATE {". content_instance_tablename() ."} SET widget_active=0 WHERE widget_module='%s'", $module);
+      db_query("UPDATE {".content_field_tablename()."} SET active=0 WHERE module='%s'", $module);
+      db_query("UPDATE {".content_instance_tablename()."} SET widget_active=0 WHERE widget_module='%s'", $module);
       content_clear_type_cache(TRUE);
       break;
   }
@@ -593,14 +593,14 @@ 
   if ($module_fields) {
     foreach ($module_fields as $name => $field_info) {
       watchdog('content', 'Updating field type %type with module %module.', array('%type' => $name, '%module' => $module));
-      db_query("UPDATE {". content_field_tablename() ."} SET module = '%s', active = %d WHERE type = '%s'", $module, 1, $name);
+      db_query("UPDATE {".content_field_tablename()."} SET module = '%s', active = %d WHERE type = '%s'", $module, 1, $name);
     }
   }
   $module_widgets = module_invoke($module, 'widget_info');
   if ($module_widgets) {
     foreach ($module_widgets as $name => $widget_info) {
       watchdog('content', 'Updating widget type %type with module %module.', array('%type' => $name, '%module' => $module));
-      db_query("UPDATE {". content_instance_tablename() ."} SET widget_module = '%s', widget_active = %d WHERE widget_type = '%s'", $module, 1, $name);
+      db_query("UPDATE {".content_instance_tablename()."} SET widget_module = '%s', widget_active = %d WHERE widget_type = '%s'", $module, 1, $name);
     }
   }
   // This is called from updates and installs, so get the install-safe
@@ -611,8 +611,8 @@ 
   foreach ($types as $type_name => $fields) {
     foreach ($fields as $field) {
       if ($field['module'] == $module && !in_array($field['field_name'], $fields_set)) {
-        $columns = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
-        db_query("UPDATE {". content_field_tablename() ."} SET db_columns = '%s' WHERE field_name = '%s'", serialize($columns), $field['field_name']);
+        $columns = (array)module_invoke($field['module'], 'field_settings', 'database columns', $field);
+        db_query("UPDATE {".content_field_tablename()."} SET db_columns = '%s' WHERE field_name = '%s'", serialize($columns), $field['field_name']);
         $fields_set[] = $field['field_name'];
       }
     }
@@ -696,7 +696,7 @@ 
 
     case 'presave':
       if (!empty($node->devel_generate)) {
-        include_once('./'. drupal_get_path('module', 'content') .'/includes/content.devel.inc');
+        include_once('./'.drupal_get_path('module', 'content').'/includes/content.devel.inc');
         content_generate_fields($node, $field);
         $items = $node->{$field['field_name']};
       }
@@ -715,7 +715,7 @@ 
 
       // If there was an AHAH add more button in this field, don't save it.
       // TODO: is it still needed ?
-      unset($items[$field['field_name'] .'_add_more']);
+      unset($items[$field['field_name'].'_add_more']);
 
       if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {
         // Reorder items to account for drag-n-drop reordering.
@@ -752,7 +752,7 @@ 
       // enabled after the field was last edited.
       $formatter_name = isset($field['display_settings'][$context]) && isset($field['display_settings'][$context]['format']) ? $field['display_settings'][$context]['format'] : 'default';
       if ($formatter = _content_get_formatter($formatter_name, $field['type'])) {
-        $theme = $formatter['module'] .'_formatter_'. $formatter_name;
+        $theme = $formatter['module'].'_formatter_'.$formatter_name;
         $single = (content_handle('formatter', 'multiple values', $formatter) == CONTENT_HANDLE_CORE);
 
         $label_display = isset($field['display_settings']['label']['format']) ? $field['display_settings']['label']['format'] : 'above';
@@ -845,7 +845,7 @@ 
               $items[$delta]['view'] = isset($element['items'][$delta]['#children']) ? $element['items'][$delta]['#children'] : '';
             }
           }
-          elseif (isset($element['items']['#children']))  {
+          elseif (isset($element['items']['#children'])) {
             // Multiple values formatter.
             $items[0]['view'] = $element['items']['#children'];
           }
@@ -873,7 +873,7 @@ 
 
       if ($wrapper) {
         // '#chilren' is not set if the field is empty.
-        $addition[$field['field_name'] .'_rendered'] = isset($wrapper['#children']) ? $wrapper['#children'] : '';
+        $addition[$field['field_name'].'_rendered'] = isset($wrapper['#children']) ? $wrapper['#children'] : '';
       }
 
       return $addition;
@@ -901,8 +901,8 @@ 
 function content_set_empty($field, $items) {
   // Filter out empty values.
   $filtered = array();
-  $function = $field['module'] .'_content_is_empty';
-  foreach ((array) $items as $delta => $item) {
+  $function = $field['module'].'_content_is_empty';
+  foreach ((array)$items as $delta => $item) {
     if (!$function($item, $field)) {
       $filtered[] = $item;
     }
@@ -985,12 +985,12 @@ 
         if (!$schema['content fields']) {
           continue;
         }
-        $query = 'SELECT * FROM {'. $table .'} WHERE vid = %d';
+        $query = 'SELECT * FROM {'.$table.'} WHERE vid = %d';
 
         // If we're loading a table for a multiple field,
         // we fetch all rows (values) ordered by delta,
         // else we only fetch one row.
-        $result = isset($schema['fields']['delta']) ? db_query($query .' ORDER BY delta', $node->vid) : db_query_range($query, $node->vid, 0, 1);
+        $result = isset($schema['fields']['delta']) ? db_query($query.' ORDER BY delta', $node->vid) : db_query_range($query, $node->vid, 0, 1);
 
         // For each table row, populate the fields.
         while ($row = db_fetch_array($result)) {
@@ -1048,7 +1048,7 @@ 
           // fields are added to content types -- either a NULL value
           // or the default value? May need to offer the user an option of
           // how to handle that.
-          if (db_result(db_query("SELECT COUNT(*) FROM {". $table ."} WHERE vid = %d", $node->vid))) {
+          if (db_result(db_query("SELECT COUNT(*) FROM {".$table."} WHERE vid = %d", $node->vid))) {
             content_write_record($table, $record, array('vid'));
           }
           else {
@@ -1063,7 +1063,7 @@ 
           $db_info = content_database_info($field);
           // Delete and insert, rather than update, in case a value was added.
           if ($op == 'update') {
-            db_query('DELETE FROM {'. $db_info['table'] .'} WHERE vid = %d', $node->vid);
+            db_query('DELETE FROM {'.$db_info['table'].'} WHERE vid = %d', $node->vid);
           }
           foreach ($node->$field['field_name'] as $delta => $item) {
             $record = array();
@@ -1081,13 +1081,13 @@ 
 
     case 'delete':
       foreach ($type['tables'] as $table) {
-        db_query('DELETE FROM {'. $table .'} WHERE nid = %d', $node->nid);
+        db_query('DELETE FROM {'.$table.'} WHERE nid = %d', $node->nid);
       }
       break;
 
     case 'delete revision':
       foreach ($type['tables'] as $table) {
-        db_query('DELETE FROM {'. $table .'} WHERE vid = %d', $node->vid);
+        db_query('DELETE FROM {'.$table.'} WHERE vid = %d', $node->vid);
       }
       break;
   }
@@ -1132,7 +1132,7 @@ 
 
   // Convert to an object if needed.
   if (is_array($object)) {
-    $object = (object) $object;
+    $object = (object)$object;
     $array = TRUE;
   }
   else {
@@ -1188,7 +1188,7 @@ 
   // Build the SQL.
   $query = '';
   if (!count($update)) {
-    $query = "INSERT INTO {". $table ."} (". implode(', ', $fields) .') VALUES ('. implode(', ', $placeholders) .')';
+    $query = "INSERT INTO {".$table."} (".implode(', ', $fields).') VALUES ('.implode(', ', $placeholders).')';
     $return = SAVED_NEW;
   }
   else {
@@ -1197,15 +1197,15 @@ 
       if ($query) {
         $query .= ', ';
       }
-      $query .= $field .' = '. $placeholders[$id];
+      $query .= $field.' = '.$placeholders[$id];
     }
 
     foreach ($update as $key) {
-      $conditions[] = "$key = ". db_type_placeholder($schema['fields'][$key]['type']);
+      $conditions[] = "$key = ".db_type_placeholder($schema['fields'][$key]['type']);
       $values[] = $object->$key;
     }
 
-    $query = "UPDATE {". $table ."} SET $query WHERE ". implode(' AND ', $conditions);
+    $query = "UPDATE {".$table."} SET $query WHERE ".implode(' AND ', $conditions);
     $return = SAVED_UPDATED;
   }
 
@@ -1220,7 +1220,7 @@ 
 
     // If we began with an array, convert back so we don't surprise the caller.
     if ($array) {
-      $object = (array) $object;
+      $object = (array)$object;
     }
 
     return $return;
@@ -1245,10 +1245,10 @@ 
     $items = isset($node->$field['field_name']) ? $node->$field['field_name'] : array();
 
     // Make sure AHAH 'add more' button isn't sent to the fields for processing.
-    unset($items[$field['field_name'] .'_add_more']);
+    unset($items[$field['field_name'].'_add_more']);
 
     $module = $field_types[$field['type']]['module'];
-    $function = $module .'_field';
+    $function = $module.'_field';
     if (function_exists($function)) {
       $result = $function($op, $node, $field, $items, $teaser, $page);
       if (is_array($result)) {
@@ -1408,7 +1408,7 @@ 
       return array();
     }
 
-    if (!$reset && $cached = cache_get('content_type_info:'. $language->language, content_cache_tablename())) {
+    if (!$reset && $cached = cache_get('content_type_info:'.$language->language, content_cache_tablename())) {
       $info = $cached->data;
     }
     else {
@@ -1469,7 +1469,7 @@ 
       // Populate actual field instances.
       module_load_include('inc', 'content', 'includes/content.crud');
       foreach (node_get_types('types', NULL, TRUE) as $type_name => $data) {
-        $type = (array) $data;
+        $type = (array)$data;
         $type['url_str'] = str_replace('_', '-', $type['type']);
         $type['fields'] = array();
         $type['tables'] = array();
@@ -1502,7 +1502,7 @@ 
         $extra = module_invoke_all('content_extra_fields', $type_name);
         drupal_alter('content_extra_fields', $extra, $type_name);
         // Add saved weights.
-        foreach (variable_get('content_extra_weights_'. $type_name, array()) as $key => $value) {
+        foreach (variable_get('content_extra_weights_'.$type_name, array()) as $key => $value) {
           // Some stored entries might not exist anymore, for instance if uploads
           // have been disabled, or vocabularies removed...
           if (isset($extra[$key])) {
@@ -1514,7 +1514,7 @@ 
         $info['content types'][$type_name] = $type;
       }
 
-      cache_set('content_type_info:'. $language->language, $info, content_cache_tablename());
+      cache_set('content_type_info:'.$language->language, $info, content_cache_tablename());
     }
   }
   return $info;
@@ -1585,10 +1585,10 @@ 
     $db_info['table'] = _content_tablename($field['type_name'], CONTENT_DB_STORAGE_PER_CONTENT_TYPE);
   }
 
-  $db_info['columns'] = (array) $field['columns'];
+  $db_info['columns'] = (array)$field['columns'];
   // Generate column names for this field from generic column names.
   foreach ($db_info['columns'] as $column_name => $attributes) {
-    $db_info['columns'][$column_name]['column'] = $field['field_name'] .'_'. $column_name;
+    $db_info['columns'][$column_name]['column'] = $field['field_name'].'_'.$column_name;
   }
 
   return $db_info;
@@ -1682,7 +1682,7 @@ 
 function content_allowed_values($field, $flatten = TRUE) {
   static $allowed_values;
 
-  $cid = $field['field_name'] .':'. ($flatten ? '1' : '0');
+  $cid = $field['field_name'].':'.($flatten ? '1' : '0');
   if (isset($allowed_values[$cid])) {
     return $allowed_values[$cid];
   }
@@ -1710,7 +1710,7 @@ 
       $opt = content_filter_xss($opt);
       if (strpos($opt, '|') !== FALSE) {
         list($key, $value) = explode('|', $opt);
-        $allowed_values[$cid][$key] = (isset($value) && $value !=='') ? $value : $key;
+        $allowed_values[$cid][$key] = (isset($value) && $value !== '') ? $value : $key;
       }
       else {
         $allowed_values[$cid][$opt] = $opt;
@@ -1755,14 +1755,14 @@ 
  * List of tags allowed by content_filter_xss().
  */
 function _content_filter_xss_allowed_tags() {
-  return array('a', 'b', 'big',  'code', 'del', 'em', 'i', 'ins',  'pre', 'q', 'small', 'span', 'strong', 'sub', 'sup', 'tt', 'ol', 'ul', 'li', 'p', 'br', 'img');
+  return array('a', 'b', 'big', 'code', 'del', 'em', 'i', 'ins', 'pre', 'q', 'small', 'span', 'strong', 'sub', 'sup', 'tt', 'ol', 'ul', 'li', 'p', 'br', 'img');
 }
 
 /**
  * Human-readable list of allowed tags, for display in help texts.
  */
 function _content_filter_xss_display_allowed_tags() {
-  return '<'. implode('> <', _content_filter_xss_allowed_tags()) .'>';
+  return '<'.implode('> <', _content_filter_xss_allowed_tags()).'>';
 }
 
 /**
@@ -1795,12 +1795,12 @@ 
   }
 
   if (content_access('view', $field, NULL, $node) && $formatter = _content_get_formatter($formatter_name, $field['type'])) {
-    $theme = $formatter['module'] .'_formatter_'. $formatter_name;
+    $theme = $formatter['module'].'_formatter_'.$formatter_name;
 
     $element = array(
       '#theme' => $theme,
       '#field_name' => $field['field_name'],
-      '#type_name' => isset($node->type) ? $node->type :'',
+      '#type_name' => isset($node->type) ? $node->type : '',
       '#formatter' => $formatter_name,
       '#node' => $node,
       '#delta' => isset($item['#delta']) ? $item['#delta'] : NULL,
@@ -1811,7 +1811,7 @@ 
 
       // hook_field('sanitize') expects an array of items, so we build one.
       $items = array($item);
-      $function = $field['module'] .'_field';
+      $function = $field['module'].'_field';
       if (function_exists($function)) {
         $function('sanitize', $node, $field, $items, FALSE, FALSE);
       }
@@ -1821,7 +1821,7 @@ 
     else {
       // Multiple values formatter.
       $items = $item;
-      $function = $field['module'] .'_field';
+      $function = $field['module'].'_field';
       if (function_exists($function)) {
         $function('sanitize', $node, $field, $items, FALSE, FALSE);
       }
@@ -1856,13 +1856,13 @@ 
   if (!isset($info)) {
     $data = array();
     foreach (module_implements('content_build_modes') as $module) {
-      $function = $module .'_content_build_modes';
-      $data = array_merge($data, (array) $function());
+      $function = $module.'_content_build_modes';
+      $data = array_merge($data, (array)$function());
     }
     $flat = array();
     foreach ($data as $tab) {
       // Use the + operator to preserve numeric indexes (core build modes).
-      $flat += (array) $tab['build modes'];
+      $flat += (array)$tab['build modes'];
     }
     $info = array('tabs' => $data, 'build modes' => $flat);
   }
@@ -1994,13 +1994,13 @@ 
 
   $name = str_replace('-', '_', $name);
   switch ("$version-$storage") {
-    case '0-'. CONTENT_DB_STORAGE_PER_CONTENT_TYPE :
+    case '0-'.CONTENT_DB_STORAGE_PER_CONTENT_TYPE :
       return "node_$name";
-    case '0-'. CONTENT_DB_STORAGE_PER_FIELD :
+    case '0-'.CONTENT_DB_STORAGE_PER_FIELD :
       return "node_data_$name";
-    case '1003-'. CONTENT_DB_STORAGE_PER_CONTENT_TYPE :
+    case '1003-'.CONTENT_DB_STORAGE_PER_CONTENT_TYPE :
       return "content_type_$name";
-    case '1003-'. CONTENT_DB_STORAGE_PER_FIELD :
+    case '1003-'.CONTENT_DB_STORAGE_PER_FIELD :
       return "content_$name";
   }
 }
@@ -2083,7 +2083,7 @@ 
 
   if (!empty($field['columns'])) {
     foreach ($field['columns'] as $column => $attributes) {
-      $column_name =  $field['field_name'] .'_'. $column;
+      $column_name = $field['field_name'].'_'.$column;
       if (isset($attributes['index']) && $attributes['index']) {
         $schema['indexes'][$column_name] = array($column_name);
         unset($attributes['index']);
@@ -2116,7 +2116,7 @@ 
   if ($db_type == 'mysql' || $db_type == 'mysqli') {
     if (version_compare(db_version(), '5.0.3') < 0) {
       // Earlier versions of MySQL don't support a WHERE clause for SHOW.
-      $result = db_query('SHOW INDEX FROM {'. $table .'}');
+      $result = db_query('SHOW INDEX FROM {'.$table.'}');
       while ($row = db_fetch_array($result)) {
         if ($row['Key_name'] == $name) {
           return TRUE;
@@ -2124,12 +2124,12 @@ 
       }
       return FALSE;
     }
-    return (bool)db_result(db_query("SHOW INDEX FROM {". $table ."} WHERE key_name = '$name'"));
+    return (bool)db_result(db_query("SHOW INDEX FROM {".$table."} WHERE key_name = '$name'"));
   }
   elseif ($db_type == 'pgsql') {
     // Note that the index names in Schema API for PostgreSQL are prefixed by
     // the table name and suffixed by '_idx'.
-    return (bool)db_result(db_query("SELECT COUNT(indexname) FROM pg_indexes WHERE indexname = '{". $table ."}_{$name}_idx'"));
+    return (bool)db_result(db_query("SELECT COUNT(indexname) FROM pg_indexes WHERE indexname = '{".$table."}_{$name}_idx'"));
   }
   return FALSE;
 }
@@ -2226,7 +2226,7 @@ 
   elseif (!empty($field['widget']['default_value'])) {
     $default_value = $field['widget']['default_value'];
   }
-  return (array) $default_value;
+  return (array)$default_value;
 }
 
 /**
@@ -2373,7 +2373,7 @@ 
       $variables['items'][$delta]['view'] = isset($element['items'][$delta]['#children']) ? $element['items'][$delta]['#children'] : '';
     }
   }
-  else  {
+  else {
     // Multiple values formatter.
     // We display the 'all items' output as $items[0], as if it was the
     // output of a single valued field.
@@ -2409,9 +2409,9 @@ 
     'field_empty' => $field_empty,
     'template_files' => array(
       'content-field',
-      'content-field-'. $element['#field_name'],
-      'content-field-'. $element['#node']->type,
-      'content-field-'. $element['#field_name'] .'-'. $element['#node']->type,
+      'content-field-'.$element['#field_name'],
+      'content-field-'.$element['#node']->type,
+      'content-field-'.$element['#field_name'].'-'.$element['#node']->type,
     ),
   );
   $variables = array_merge($variables, $additions);
@@ -2629,7 +2629,7 @@ 
       if (empty($type_name) || $content_type['type'] == $type_name) {
         foreach ($content_type['fields'] as $field) {
           $db_info = content_database_info($field);
-          if (db_result(db_query("SELECT COUNT(*) FROM {". $db_info['table'] ."}")) >= 1) {
+          if (db_result(db_query("SELECT COUNT(*) FROM {".$db_info['table']."}")) >= 1) {
             return 0;
           }
         }
@@ -2642,10 +2642,10 @@ 
   else {
     $db_info = content_database_info($field);
     if (!empty($type_name)) {
-      $delta = db_result(db_query("SELECT MAX(delta) FROM {". $db_info['table'] ."} f LEFT JOIN {node} n ON f.vid = n.vid WHERE n.type = '%s'", $type_name));
+      $delta = db_result(db_query("SELECT MAX(delta) FROM {".$db_info['table']."} f LEFT JOIN {node} n ON f.vid = n.vid WHERE n.type = '%s'", $type_name));
     }
     else {
-      $delta = db_result(db_query("SELECT MAX(delta) FROM {". $db_info['table'] ."}"));
+      $delta = db_result(db_query("SELECT MAX(delta) FROM {".$db_info['table']."}"));
     }
     if ($delta >= 0) {
       return $delta;

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

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'];

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

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