--- buddylist.php.updated_settings	2005-11-25 11:13:15.000000000 -0600
+++ buddylist.module.old	2005-11-23 15:18:23.000000000 -0600
@@ -72,66 +72,16 @@
  * Implementation of hook_settings
  */
 function buddylist_settings() {
-  /* ** $group .= form_select(t('Number of buddies to list in the user\'s buddy block'), 'buddylist_blocklisting_size', variable_get('buddylist_blocklisting_size', 5), drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)), t('This setting controls the maximum number of buddies displayed in a user\'s "buddylist block" given that the "buddylist block" is enabled in the %link.', array('%link' => l(t('block settings'), 'admin/block')) ));
-  ** $group .= form_select(t('Number of posts to list in the buddies\' recent posts block'), 'buddylist_posts_block', variable_get('buddylist_posts_block', 7), drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)), t('This setting controls the maximum number of posts to display in a user\'s "buddy recent posts" block given that the "buddies\' recent posts" block is enabled in the %link.', array('%link' => l(t('block settings'), 'admin/block'))  ));
+  $group .= form_select(t('Number of buddies to list in the user\'s buddy block'), 'buddylist_blocklisting_size', variable_get('buddylist_blocklisting_size', 5), drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)), t('This setting controls the maximum number of buddies displayed in a user\'s "buddylist block" given that the "buddylist block" is enabled in the %link.', array('%link' => l(t('block settings'), 'admin/block')) ));
+  $group .= form_select(t('Number of posts to list in the buddies\' recent posts block'), 'buddylist_posts_block', variable_get('buddylist_posts_block', 7), drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)), t('This setting controls the maximum number of posts to display in a user\'s "buddy recent posts" block given that the "buddies\' recent posts" block is enabled in the %link.', array('%link' => l(t('block settings'), 'admin/block'))  ));
   $group .= form_textfield(t('Block title'), 'buddylist_block_title', variable_get('buddylist_block_title', t('My buddies\' recent posts')), 70, 128, t('This will be the title for the recent buddies post block. If none is specified, the default will be used.'));
- ** $output .= form_group(t('Buddylist block options'), $group);
+  $output .= form_group(t('Buddylist block options'), $group);
 
   // User profile page settings
   $group = form_select(t('Number of buddies and users who\'ve added me'), 'buddylist_prof_buddies', variable_get('buddylist_prof_buddies', 5), drupal_map_assoc(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10)), t('The default maximum number of buddies and users who\'ve added me as a buddy to display on a user\'s profile page.'));
   $output .= form_group(t('Profile page options'), $group);
 
-  return $output; */
-  
-  /* Buddylist block settings group */
-  $form['block'] = array(
-    '#type' => 'fieldset', 
-    '#title' => t('Buddylist block options'), 
-    //'#tree' => TRUE,
-  );
-  
-  $form['block']['buddylist_blocklisting_size'] = array(
-    '#type' => 'select',
-    '#title' => t('Number of buddies to list in the user\'s buddy block'),
-    '#default_value' => variable_get('buddylist_blocklisting_size', 5),
-    '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
-    '#description' => t('This setting controls the maximum number of buddies displayed in a user\'s "buddylist block" given that the "buddylist block" is enabled in the %link.', 
-                        array('%link' => l(t('block settings'), 'admin/block')) ),
-  );
-  
-  $form['block']['buddylist_posts_block'] = array(
-    '#type' => 'select',
-    '#title' => t('Number of posts to list in the buddies\' recent posts block'),
-    '#default_value' => variable_get('buddylist_posts_block', 7),
-    '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
-    '#description' => t('This setting controls the maximum number of posts to display in a user\'s "buddy recent posts" block given that the "buddies\' recent posts" block is enabled in the %link.', 
-                        array('%link' => l(t('block settings'), 'admin/block'))  ),
-  );
-  
-  $form['block']['buddylist_block_title'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Block title'),
-    '#default_value' => variable_get('buddylist_block_title', t('My buddies\' recent posts')),
-    '#size' => 70,
-    '#maxlength' => 128,
-    '#description' => t('This will be the title for the recent buddies post block. If none is specified, the default will be used.'),
-  );
-  
-  /* profile page settings group */
-  $form['profile'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Profile page options'),
-  );
-  
-  $form['profile']['buddylist_prof_buddies'] = array(
-    '#type' => 'select',
-    '#title' => t('Number of buddies and users who\'ve added me'),
-    '#default_value' => variable_get('buddylist_prof_buddies', 5),
-    '#options' => drupal_map_assoc(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10)),
-    '#description' => t('The default maximum number of buddies and users who\'ve added me as a buddy to display on a user\'s profile page.'),
-  );
-  
-  return $form;
+  return $output;
 }
 
 
@@ -171,7 +121,7 @@
           break;
         }
       }
-      $fields['Buddy List']['Buddies'] = theme('user_list', $listbuddies);
+      $output .= form_item(t('Buddies'), theme('user_list', $listbuddies));
     }
 
     // This portion of code is used to see if this $thisuser is a buddy of others and, if s/he is, returns a list
@@ -183,7 +133,7 @@
       $listbuddiesof[] = format_name($row);
     }
     if ($listbuddiesof) {
-      $fields['Buddy List']['Buddy of'] = theme('item_list', $listbuddiesof);
+      $output .= form_item(t('Buddy of'), theme('item_list', $listbuddiesof));
     }
 
     // Check to see whether or not $thisuser is in global $user's buddy list
@@ -200,10 +150,9 @@
       }
     }
     if ($actions) {
-      $fields['Buddy List']['Buddy Actions'] = theme('item_list', $actions);
+      $output .= form_item(t('Buddy actions'), theme('item_list', $actions));
     }
-    
-    return $fields;
+    return array ('Buddy List' => $output);
   }
 }