BOINC / boinc

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

Spacing +3 added lines, -3 removed lines

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

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

Spacing +19 added lines, -19 removed lines

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

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

Spacing +3 added lines, -3 removed lines

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

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

Spacing +12 added lines, -12 removed lines

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

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

Spacing +5 added lines, -5 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +45 added lines, -45 removed lines

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

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

Spacing +29 added lines, -29 removed lines

@@ -57,7 +57,7 @@ 
  */
 function nodereference_ctools_plugin_directory($module, $plugin) {
   if ($module == 'ctools' && $plugin == 'relationships') {
-    return 'panels/' . $plugin;
+    return 'panels/'.$plugin;
   }
 }
 
@@ -115,7 +115,7 @@ 
             '#title' => t('View used to select the nodes'),
             '#options' => $views,
             '#default_value' => isset($field['advanced_view']) ? $field['advanced_view'] : '--',
-            '#description' => t('<p>Choose the "Views module" view that selects the nodes that can be referenced.<br />Note:</p>') .
+            '#description' => t('<p>Choose the "Views module" view that selects the nodes 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 "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
           );
           $form['advanced']['advanced_view_args'] = array(
@@ -128,7 +128,7 @@ 
         }
         else {
           $form['advanced']['no_view_help'] = array(
-            '#value' => t('<p>The list of nodes 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 nodes 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 "Content types" settings above. Use the view\'s "filters" section instead.</li><li>Use the view\'s "fields" section to display additional informations about candidate nodes on node creation/edition form.</li><li>Use the view\'s "sort criteria" section to determine the order in which candidate nodes will be displayed.</li></ul>'),
           );
         }
@@ -155,19 +155,19 @@ 
       $table_alias = content_views_tablename($field);
 
       // Filter: swap the handler to the 'in' operator.
-      $data[$table_alias][$field['field_name'] .'_nid']['filter']['handler'] = 'content_handler_filter_many_to_one';
+      $data[$table_alias][$field['field_name'].'_nid']['filter']['handler'] = 'content_handler_filter_many_to_one';
       // Argument: use node.title for summaries.
       $data["node_$table_alias"]['table']['join']['node'] = array(
         'table' => 'node',
         'field' => 'nid',
         'left_table' => $table_alias,
-        'left_field' => $field['field_name'] .'_nid',
+        'left_field' => $field['field_name'].'_nid',
       );
-      $data[$table_alias][$field['field_name'] .'_nid']['argument']['handler'] = 'content_handler_argument_reference';
-      $data[$table_alias][$field['field_name'] .'_nid']['argument']['name table'] = "node_$table_alias";
-      $data[$table_alias][$field['field_name'] .'_nid']['argument']['name field'] = 'title';
+      $data[$table_alias][$field['field_name'].'_nid']['argument']['handler'] = 'content_handler_argument_reference';
+      $data[$table_alias][$field['field_name'].'_nid']['argument']['name table'] = "node_$table_alias";
+      $data[$table_alias][$field['field_name'].'_nid']['argument']['name field'] = 'title';
       // Relationship: add a relationship for related node.
-      $data[$table_alias][$field['field_name'] .'_nid']['relationship'] = array(
+      $data[$table_alias][$field['field_name'].'_nid']['relationship'] = array(
         'base' => 'node',
         'field' => $db_info['columns']['nid']['column'],
         'handler' => 'content_handler_relationship',
@@ -255,11 +255,11 @@ 
         // this page request.
         $missing_ids = array_diff($ids, array_keys($sanitized_nodes));
         if (!empty($missing_ids)) {
-          $where = array('n.nid in ('. db_placeholders($missing_ids) . ')');
+          $where = array('n.nid in ('.db_placeholders($missing_ids).')');
           if (!user_access('administer nodes')) {
             $where[] = 'n.status = 1';
           }
-          $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, n.status FROM {node} n WHERE '. implode(' AND ', $where)), $missing_ids);
+          $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, n.status FROM {node} n WHERE '.implode(' AND ', $where)), $missing_ids);
           while ($row = db_fetch_array($result)) {
             $sanitized_nodes[$row['nid']] = $row;
           }
@@ -318,9 +318,9 @@ 
 function theme_nodereference_formatter_default($element) {
   $output = '';
   if (!empty($element['#item']['safe']['nid'])) {
-    $output = l($element['#item']['safe']['title'], 'node/'. $element['#item']['safe']['nid']);
+    $output = l($element['#item']['safe']['title'], 'node/'.$element['#item']['safe']['nid']);
     if (!$element['#item']['safe']['status']) {
-      $output = '<span class="node-unpublished"> '. t('(Unpublished)') ." $output</span>";
+      $output = '<span class="node-unpublished"> '.t('(Unpublished)')." $output</span>";
     }
   }
   return $output;
@@ -334,7 +334,7 @@ 
   if (!empty($element['#item']['safe']['nid'])) {
     $output = check_plain($element['#item']['safe']['title']);
     if (!$element['#item']['safe']['status']) {
-      $output = '<span class="node-unpublished"> '. t('(Unpublished)') ." $output</span>";
+      $output = '<span class="node-unpublished"> '.t('(Unpublished)')." $output</span>";
     }
   }
   return $output;
@@ -563,11 +563,11 @@ 
  * Substitute in the node title for the node nid.
  */
 function nodereference_autocomplete_value($element, $edit = FALSE) {
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
   if (!empty($element['#default_value'][$field_key])) {
     $nid = $element['#default_value'][$field_key];
     $value = db_result(db_query(db_rewrite_sql('SELECT n.title FROM {node} n WHERE n.nid = %d'), $nid));
-    $value .= ' [nid:'. $nid .']';
+    $value .= ' [nid:'.$nid.']';
     return array($field_key => $value);
   }
   return array($field_key => NULL);
@@ -586,7 +586,7 @@ 
   // element, it can wrap around the optionwidgets_select element.
   // This will create a new, nested instance of the field.
   // 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'] : '',
@@ -620,7 +620,7 @@ 
   // element, it can wrap around the optionwidgets_select element.
   // This will create a new, nested instance of the field.
   // 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'] : '',
@@ -654,12 +654,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' => 'nodereference/autocomplete/'. $element['#field_name'],
+    '#autocomplete_path' => 'nodereference/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'],
@@ -697,7 +697,7 @@ 
  * like optionwidgets are using #element_validate to alter the value.
  */
 function nodereference_optionwidgets_validate($element, &$form_state) {
-  $field_key  = $element['#columns'][0];
+  $field_key = $element['#columns'][0];
 
   $value = $form_state['values'];
   $new_parents = array();
@@ -805,7 +805,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'] != '--') {
@@ -931,15 +931,15 @@ 
       'equals' => "= '%s'",
       'starts_with' => "$like '%s%%'",
     );
-    $where[] = 'n.title '. (isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
+    $where[] = 'n.title '.(isset($match_clauses[$match]) ? $match_clauses[$match] : $match_clauses['contains']);
     $args[] = $string;
   }
   elseif ($ids) {
-    $where[] = 'n.nid IN (' . db_placeholders($ids) . ')';
+    $where[] = 'n.nid IN ('.db_placeholders($ids).')';
     $args = array_merge($args, $ids);
   }
 
-  $where_clause = $where ? 'WHERE ('. implode(') AND (', $where) .')' : '';
+  $where_clause = $where ? 'WHERE ('.implode(') AND (', $where).')' : '';
   $sql = db_rewrite_sql("SELECT n.nid, n.title AS node_title, n.type AS node_type FROM {node} n $where_clause ORDER BY n.title, n.type");
   $result = $limit ? db_query_range($sql, $args, 0, $limit) : db_query($sql, $args);
   $references = array();
@@ -975,7 +975,7 @@ 
   $references = _nodereference_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'] ." [nid:$id]"] = '<div class="reference-autocomplete">'. $row['rendered'] . '</div>';
+    $matches[$row['title']." [nid:$id]"] = '<div class="reference-autocomplete">'.$row['rendered'].'</div>';
   }
   drupal_json($matches);
 }
@@ -1024,9 +1024,9 @@ 
     $node = $vars['node'];
     $field = $node->referencing_field;
     $vars['template_files'][] = 'node-nodereference';
-    $vars['template_files'][] = 'node-nodereference-'. $field['field_name'];
-    $vars['template_files'][] = 'node-nodereference-'. $node->type;
-    $vars['template_files'][] = 'node-nodereference-'. $field['field_name'] .'-'. $node->type;
+    $vars['template_files'][] = 'node-nodereference-'.$field['field_name'];
+    $vars['template_files'][] = 'node-nodereference-'.$node->type;
+    $vars['template_files'][] = 'node-nodereference-'.$field['field_name'].'-'.$node->type;
   }
 }
 

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

Spacing +21 added lines, -21 removed lines

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