Index: mollom.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.admin.inc,v
retrieving revision 1.1.2.36
diff -u -p -r1.1.2.36 mollom.admin.inc
--- mollom.admin.inc	12 Sep 2010 23:44:14 -0000	1.1.2.36
+++ mollom.admin.inc	14 Sep 2010 19:23:41 -0000
@@ -313,17 +313,12 @@ function mollom_admin_unprotect_form_sub
 }
 
 /**
- * Menu callback; The blacklist administration page.
- */
-function mollom_admin_blacklist() {
-  drupal_set_title(t('Mollom blacklist'));
-  return drupal_get_form('mollom_admin_blacklist_form');
-}
-
-/**
- * Form builder; Declares the text blacklist form.
+ * Form constructor to configure the blacklist.
+ *
+ * @param $type
+ *   The type of blacklist; i.e., 'spam', 'profanity', or 'unwanted'.
  */
-function mollom_admin_blacklist_form(&$form_state) {
+function mollom_admin_blacklist_form(&$form_state, $type = 'spam') {
   $form['#tree'] = TRUE;
 
   // Select options and translation of internal values for rendering.
@@ -343,6 +338,9 @@ function mollom_admin_blacklist_form(&$f
   $blacklist = (empty($form_state['input']) ? mollom('mollom.listBlacklistText') : array());
   if (is_array($blacklist)) {
     foreach ($blacklist as $id => $entry) {
+      if ($entry['reason'] != $type) {
+        continue;
+      }
       $row = array(
         'context' => array('#value' => check_plain($contexts[$entry['context']])),
         'text' => array('#value' => check_plain($entry['text'])),
@@ -350,7 +348,7 @@ function mollom_admin_blacklist_form(&$f
         'text' => array('#value' => check_plain($entry['text'])),
       );
       $row['actions']['delete'] = array(
-        '#value' => l(t('delete'), 'admin/settings/mollom/blacklist/delete/' .  base64_encode($entry['text'])),
+        '#value' => l(t('delete'), 'admin/settings/mollom/blacklist/delete/' .  base64_encode($entry['text']), array('query' => drupal_get_destination())),
       );
       $form['blacklist'][$id] = $row;
     }
@@ -371,7 +369,7 @@ function mollom_admin_blacklist_form(&$f
   $form['entry']['reason'] = array(
     '#type' => 'select',
     '#options' => $reasons,
-    '#default_value' => 'spam',
+    '#default_value' => $type,
     '#required' => TRUE,
   );
   $form['entry']['actions'] = array(
Index: mollom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v
retrieving revision 1.2.2.162
diff -u -p -r1.2.2.162 mollom.module
--- mollom.module	13 Sep 2010 18:05:25 -0000	1.2.2.162
+++ mollom.module	14 Sep 2010 19:25:11 -0000
@@ -252,8 +252,33 @@ function mollom_menu() {
   );
   $items['admin/settings/mollom/blacklist'] = array(
     'title' => 'Blacklist',
-    'description' => 'Configure blacklist.',
-    'page callback' => 'mollom_admin_blacklist',
+    'description' => 'Configure blacklists.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('mollom_admin_blacklist_form'),
+    'access arguments' => array('administer mollom'),
+    'type' => MENU_LOCAL_TASK,
+    'file' => 'mollom.admin.inc',
+  );
+  $items['admin/settings/mollom/blacklist/spam'] = array(
+    'title' => 'Spam',
+    'description' => 'Configure spam blacklist entries.',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => -10,
+  );
+  $items['admin/settings/mollom/blacklist/profanity'] = array(
+    'title' => 'Profanity',
+    'description' => 'Configure profanity blacklist entries.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('mollom_admin_blacklist_form', 5),
+    'access arguments' => array('administer mollom'),
+    'type' => MENU_LOCAL_TASK,
+    'file' => 'mollom.admin.inc',
+  );
+  $items['admin/settings/mollom/blacklist/unwanted'] = array(
+    'title' => 'Unwanted',
+    'description' => 'Configure unwanted blacklist entries.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('mollom_admin_blacklist_form', 5),
     'access arguments' => array('administer mollom'),
     'type' => MENU_LOCAL_TASK,
     'file' => 'mollom.admin.inc',