Index: cck_fullname.module
===================================================================
--- cck_fullname.module	(revision 1679)
+++ cck_fullname.module	(working copy)
@@ -107,14 +107,6 @@
       );
       //end borrowed section
 
-      $form['middle_initial'] = array(//TODO remove this because with the ability to specify the field length, this is redundant
-        '#type' => 'checkbox',
-        '#title' => t('Use middle initial only?'),
-        '#default_value' => isset($field['middle_initial']) ? $field['middle_initial'] : 1,
-        '#return_value' => 1,
-        '#description' => t('Do you want to store only middle initials? This is not simply a display option and should be set only once. Changing it has unpredictable results.'),
-      );
-
       //-------------specify maximum lengths for each field------------------------
       $form['max_lengths_legal'] = array(
         '#type' => 'fieldset',
@@ -143,15 +135,10 @@
         '#type' => 'textfield',
         '#title' => t('Middle name maximum length'),
         '#size' => 6,
+        '#default_value' => isset($field['max_length_middle_legal']) ? $field['max_length_middle_legal'] : '',
         '#required' => FALSE,
-        '#description' => t('The maximum length of the field in characters (unless Middle Initial is used instead). Leave blank for an unlimited size.'),
+        '#description' => t('The maximum length of the field in characters - one for just the initial. Leave blank for an unlimited size.'),
       );
-      if ($field['middle_initial'] == 1) {
-        $form['max_lengths_legal']['max_length_middle_legal']['#default_value'] = 1;
-      }
-      else {
-        $form['max_lengths_legal']['max_length_middle_legal']['#default_value'] = isset($field['max_length_middle_legal']) ? $field['max_length_middle_legal'] : '';
-      }
       $form['max_lengths_legal']['max_length_last_legal'] = array(
         '#type' => 'textfield',
         '#title' => t('Last name maximum length'),
@@ -175,7 +162,6 @@
       return array(
         'required_parts',
         'legalname',
-        'middle_initial',
         'max_length_prefix_legal',
         'max_length_first_legal',
         'max_length_middle_legal',
@@ -350,13 +336,13 @@
 
   if (!empty($field['legalname']['middle'])) {
     $element['middle'] = array(
-      '#title' => (isset($field['middle_initial']) && $field['middle_initial'] != 1) ? t('Middle') : t('M.I.'),
+      '#title' => t('Middle'),
       '#type' => 'textfield',
       '#default_value' => !empty($defaults['middle']) ? $defaults['middle'] : '',
-      '#size' => (!empty($field['max_length_middle_legal']) && $field['middle_initial'] != 1) ? $field['max_length_middle_legal'] : (!empty($field['middle_initial']) && $field['middle_initial'] == 1 ? 1 : 25),
-      '#maxlength' => (!empty($field['max_length_middle_legal']) && $field['middle_initial'] != 1) ? $field['max_length_middle_legal'] : (!empty($field['middle_initial']) && $field['middle_initial'] == 1 ? 1 : 25),
+      '#size' => $field['max_length_middle_legal'] ? $field['max_length_middle_legal'] : NULL,
+      '#maxlength' => $field['max_length_middle_legal'] ? $field['max_length_middle_legal'] : NULL,
       '#weight' => 4,
-      '#attributes' => (!empty($field['max_length_middle_legal']) && $field['middle_initial'] != 1) ? array('class' => 'cck_fullname_middle', 'style' => "width:". $field['max_length_middle_legal']*0.7 ."em;") : (!empty($field['middle_initial']) && $field['middle_initial'] == 1 ? array('class' => 'cck_fullname_middle', 'style' => "width: 1em;") : 25),
+      '#attributes' => !empty($field['max_length_middle_legal']) ? array('class' => 'cck_fullname_middle', 'style' => "width:". $field['max_length_middle_legal']*0.7 ."em;") : array('class' => 'cck_fullname_middle'),
       '#prefix' => '<div class="cck_fullname_middle_wrapper">',
       '#suffix' => '</div>',
     );