diff -urp filefield.old/field_file.inc filefield/field_file.inc
--- filefield.old/field_file.inc	2008-09-07 17:42:46.000000000 +0200
+++ filefield/field_file.inc	2008-09-07 17:45:42.000000000 +0200
@@ -322,7 +322,7 @@ function field_file_check_directory(&$di
   }
 
   // create the directory if it is missing.
-  if (!is_dir($directory) && $mode & FILE_CREATE_DIRECTORY && !@mkdir($directory, 0775, true)) {
+  if (!is_dir($directory) && $mode & FILE_CREATE_DIRECTORY && !@mkdir($directory, 0775, TRUE)) {
     watchdog('file system', 'The directory %directory does not exist.', array('%directory' => $directory), WATCHDOG_ERROR);
     if ($form_item) form_set_error($form_item, t('The directory %directory does not exist.', array('%directory' => $directory)));
     return FALSE;
diff -urp filefield.old/filefield.install filefield/filefield.install
--- filefield.old/filefield.install	2008-09-07 17:42:46.000000000 +0200
+++ filefield/filefield.install	2008-09-07 17:46:33.000000000 +0200
@@ -123,7 +123,7 @@ function filefield_update_3() {
 
 function filefield_update_6001() {
   $ret = array();
-  include_once(drupal_get_path('module','content') .'/includes/content.admin.inc');
+  include_once(drupal_get_path('module', 'content') .'/includes/content.admin.inc');
 
   // rename the field type from file to filefield. adhere to module namespace.
   $ret[] = update_sql("UPDATE {content_node_field} SET type='filefield' WHERE type='file'");
@@ -133,18 +133,18 @@ function filefield_update_6001() {
   // update list default value and force list settings.
   $result = db_query("SELECT * FROM {content_node_field} WHERE type = 'filefield'");
   while ($field = db_fetch_object($result)) {
-    $updated = false;
+    $updated = FALSE;
     $field_settings = unserialize($field->global_settings);
     if (!isset($field_settings['list_default']) || !is_numeric($field_settings['list_default'])) {
       $field_settings['list_default'] = 1;
-      $updated = true;
+      $updated = TRUE;
 
     }
     // set behavior to match old force_list behavior.
     if (!empty($field_settings['force_list'])) {
       $field_settings['list_default'] = 1;
       $field_settings['force_list_default'] = 1;
-      $updated = true;
+      $updated = TRUE;
     }
     if ($updated) {
       $ret[] = update_sql("UPDATE {content_node_field} SET global_settings = '". serialize($field_settings) ."' WHERE field_name = '$field->field_name'");
@@ -154,7 +154,7 @@ function filefield_update_6001() {
 
   // add data column to filefields.
   $fields = content_fields();
-  foreach($fields as $field) {
+  foreach ($fields as $field) {
     if ($field['type'] != 'filefield') continue;
     $new_field = $field;
     $new_field['columns']['data'] =  array('type' => 'text');
@@ -180,8 +180,8 @@ function filefield_update_6001() {
 
 
   // clear them caches.
-  cache_clear_all('*', content_cache_tablename(), true);
-  cache_clear_all('*', 'cache', true);
+  cache_clear_all('*', content_cache_tablename(), TRUE);
+  cache_clear_all('*', 'cache', TRUE);
   return $ret;
 }
 
diff -urp filefield.old/filefield.module filefield/filefield.module
--- filefield.old/filefield.module	2008-09-07 17:42:46.000000000 +0200
+++ filefield/filefield.module	2008-09-07 17:45:26.000000000 +0200
@@ -32,7 +32,7 @@ function filefield_menu() {
 
   $items['filefield/ahah/%/%/%'] = array(
     'page callback' => 'filefield_js',
-    'page arguments' => array(2,3,4),
+    'page arguments' => array(2, 3, 4),
     'access callback' => 'filefield_edit_access',
     'access arguments' => array(3),
     'type' => MENU_CALLBACK,
@@ -213,7 +213,7 @@ function filefield_field_info() {
 function filefield_field_settings($op, $field) {
   $return = array();
 
-  module_load_include('inc','filefield','filefield_field');
+  module_load_include('inc', 'filefield', 'filefield_field');
   $op = str_replace(' ', '_', $op);
   // add filefield specific handlers...
   $function = 'filefield_field_settings_'. $op;
@@ -237,7 +237,7 @@ function filefield_field_settings($op, $
  * Implementtation of CCK's hook_field().
  */
 function filefield_field($op, $node, $field, &$items, $teaser, $page) {
-  module_load_include('inc','filefield','filefield_field');
+  module_load_include('inc', 'filefield', 'filefield_field');
   $op = str_replace(' ', '_', $op);
   // add filefield specific handlers...
   $function = 'filefield_field_'. $op;
@@ -252,7 +252,7 @@ function filefield_field($op, $node, $fi
 function filefield_widget_settings($op, $widget) {
   $return = array();
   // load our widget settings callbacks..
-  module_load_include('inc','filefield','filefield_widget');
+  module_load_include('inc', 'filefield', 'filefield_widget');
   $op =  str_replace(' ', '_', $op);
   $function = 'filefield_widget_settings_'. $op;
   if (function_exists($function)) {
@@ -373,7 +373,7 @@ function filefield_field_formatter_info(
     'default' => array(
       'label' => t('Generic files'),
       'suitability callback' => TRUE,
-      'field types' => array('filefield','image'),
+      'field types' => array('filefield', 'image'),
       'multiple values' => CONTENT_HANDLE_CORE,
       'description' => t('Displays all kinds of files with an icon and a linked file description.'),
     ),
@@ -503,7 +503,7 @@ function filefield_js($type_name, $field
 
   // For some reason, file uploads don't like drupal_json() with its manual
   // setting of the text/javascript HTTP header. So use this one instead.
-  $GLOBALS['devel_shutdown'] = false;
+  $GLOBALS['devel_shutdown'] = FALSE;
   print drupal_to_js(array('status' => TRUE, 'data' => $output));
   exit;
 }
diff -urp filefield.old/filefield_field.inc filefield/filefield_field.inc
--- filefield.old/filefield_field.inc	2008-09-07 17:42:46.000000000 +0200
+++ filefield/filefield_field.inc	2008-09-07 17:49:38.000000000 +0200
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 /**
  * @file
@@ -13,7 +14,7 @@ function filefield_field_settings_form($
     '#title' => t('Default list value'),
     '#options' => array(1 => t('Listed'), 0 => t('Hidden')),
     '#default_value' => $field['list_default'] == '' ? 1 : (int) $field['list_default'],
-    '#required' => true,
+    '#required' => TRUE,
     '#description' => t('The list option determines whether files are visible on node views. This will be used as the default value for the list option.'),
   );
   $form['force_list_default'] = array(
@@ -21,7 +22,7 @@ function filefield_field_settings_form($
     '#title' => t('How should the list value be handled?'),
     '#options' => array(0 => t('User Configurable. (Users will be able to set the list value per file.)'), 1 => t('Enforce Default. (The default list value will be used for all files, and the list checkbox will not be displayed to users.)')),
     '#default_value' => $field['force_list_default'] == '' ? 0 : (int) $field['force_list_default'],
-    '#required' => true,
+    '#required' => TRUE,
   );
   $form['show_description'] = array(
     '#type' => 'radios',
@@ -45,7 +46,7 @@ function filefield_field_settings_databa
   return array(
     'fid' => array('type' => 'int', 'not null' => FALSE),
     'list' => array('type' => 'int', 'size' => 'tiny', 'not null' => FALSE),
-    'data' => array('type' => 'text', 'serialize' => true),
+    'data' => array('type' => 'text', 'serialize' => TRUE),
   );
 }
 
diff -urp filefield.old/filefield_file.inc filefield/filefield_file.inc
--- filefield.old/filefield_file.inc	2008-09-07 17:42:46.000000000 +0200
+++ filefield/filefield_file.inc	2008-09-08 12:49:45.000000000 +0200
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 /**
  * @file
@@ -7,7 +8,7 @@
 
 function filefield_file_references($file) {
   $references = 0;
-  foreach(content_fields() as $field) {
+  foreach (content_fields() as $field) {
     if ($field['type'] != 'file') {
       continue;
     }
diff -urp filefield.old/filefield_widget.inc filefield/filefield_widget.inc
--- filefield.old/filefield_widget.inc	2008-09-07 17:42:46.000000000 +0200
+++ filefield/filefield_widget.inc	2008-09-08 12:52:19.000000000 +0200
@@ -31,8 +31,8 @@ function filefield_widget_settings_form(
   $form['path_settings'] = array(
     '#type' => 'fieldset',
     '#title' => t('Path settings'),
-    '#collapsible' => true,
-    '#collapsed' => true,
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
     '#weight' => 6,
   );
 
@@ -315,10 +315,10 @@ function theme_filefield_widget_preview(
 
 function theme_filefield_widget_item($element) {
   return '<div class="filefield-row clear-block">'.
-              '<div class="filefield-filename clear-block">'. drupal_render($element['preview']) . '</div>'.
+              '<div class="filefield-filename clear-block">'. drupal_render($element['preview']) .'</div>'.
               '<div class="fielfield-edit clear-block">'.
-                '<div class="filefield-list">'. drupal_render($element['list']) . '</div>' .
-                '<div class="filefield-description">'. drupal_render($element['description']) . '</div>' .
+                '<div class="filefield-list">'. drupal_render($element['list']) .'</div>'.
+                '<div class="filefield-description">'. drupal_render($element['description']) .'</div>'.
                 '<div class="filefield-stuff">'. drupal_render($element) .'</div>'.
               '</div>'.
          '</div>';
@@ -333,11 +333,11 @@ function filefield_node_form_validate($f
   foreach ($type['fields'] as $field_name => $field) {
     if (!(in_array($field['module'], array('imagefield', 'filefield'))) || !$field['required']) continue;
     $empty = $field['module'] .'_content_is_empty';
-    $valid = false;
+    $valid = FALSE;
     $total_filesize = 0;
-    foreach($form_state['values'][$field_name] as $delta => $item) {
+    foreach ($form_state['values'][$field_name] as $delta => $item) {
       if ($empty($item, $field)) continue;
-      $valid = true;
+      $valid = TRUE;
       $total_filesize += (int)$item['filesize'];
     }