--- spam/filters/custom/custom.module.OLD	2008-12-25 06:42:10.000000000 +0100
+++ spam/filters/custom/custom.module		2009-02-18 14:02:59.000000000 +0100
@@ -67,6 +67,7 @@ function custom_menu() {
     'title' => 'Custom',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('custom_admin_settings'),
+    'access arguments' => array('administer spam'),
     'description' => 'Configure the custom spam filter module.',
     'type' => MENU_LOCAL_TASK,
   );
@@ -75,20 +76,25 @@ function custom_menu() {
     'title' => 'List',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('custom_admin_settings'),
+    'access arguments' => array('administer spam'),
     'description' => 'Configure the custom spam filter module.',
     'type' => MENU_DEFAULT_LOCAL_TASK,
   );
+
   $items['admin/settings/spam/filters/custom/create'] = array(
     'title' => 'Create',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('custom_admin_filter'),
+    'access arguments' => array('administer spam'),
     'description' => 'Create a custom spam filter.',
     'type' => MENU_LOCAL_TASK,
   );
+
   $items["admin/settings/spam/filters/custom/%/edit"] = array(
     'title' => 'Create',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('custom_admin_filter', 5),
+    'access arguments' => array('administer spam'),
     'description' => 'Edit a custom spam filter.',
     'type' => MENU_LOCAL_TASK,
   );
@@ -228,7 +234,6 @@ function custom_theme() {
  * Format the custom filter admin page.
  */
 function theme_custom_admin_settings($form) {
-  _custom_upgrade();
   $header = array(theme('table_select_header_cell'), t('Filter'), t('Style'), t('Scan'), t('Status'), t('Matches'), t('Last'), '');
 
   $output = drupal_render($form['options']);
@@ -284,12 +289,12 @@ function custom_spam_custom_operations()
 /**
  * Create or edit a custom spam filter.
  */
-function custom_admin_filter($cid = NULL) {
+function custom_admin_filter(&$form_state, $cid = NULL) {
   if ($cid) {
     drupal_set_title('Edit');
     $custom = db_fetch_object(db_query('SELECT * FROM {spam_custom} WHERE cid = %d', $cid));
     if (!isset($custom->cid)) {
-      drupal_set_message(t('Failed to load custom filter.'));
+      drupal_set_message(t('Failed to load custom filter.'), 'error');
       drupal_goto('admin/settings/spam/filters/custom');
     }
   }
@@ -443,19 +448,19 @@ function custom_admin_settings_submit($f
  * Perform custom operations.
  * TODO: Confirmation would be nice.
  */
-function custom_spam_filter_operations(&$form_state, $op, $cid) {
+function custom_spam_filter_operations($op, $cid) {
   $filter = db_fetch_object(db_query('SELECT cid, status, filter FROM {spam_custom} WHERE cid = %d', $cid));
   switch ($op) {
     case 'delete':
       if ($filter->cid) {
         db_query('DELETE FROM {spam_custom} WHERE cid = %d', $cid);
-        drupal_set_message(t('Deleted custom filter %filter.', array('%filter' => $filter->filter)));
+        drupal_set_message(t('Custom filter %filter deleted.', array('%filter' => $filter->filter)));
       }
       break;
     case 'disable':
       if ($filter->cid && $filter->status != SPAM_CUSTOM_STATUS_DISABLED) {
         db_query('UPDATE {spam_custom} SET status = %d WHERE cid = %d', SPAM_CUSTOM_STATUS_DISABLED, $cid);
-        drupal_set_message(t('Disabled custom filter %filter.', array('%filter' => $filter->filter)));
+        drupal_set_message(t('Custom filter %filter disabled.', array('%filter' => $filter->filter)));
       }
       break;
   }