--- spam3.module	2007-09-14 10:51:21.328125000 -0400
+++ spam.module	2007-09-14 12:02:17.203125000 -0400
@@ -1622,8 +1622,8 @@ function spam_logs_entry($id = NULL) {
   $entry = db_fetch_object(db_query('SELECT s.*, u.name, u.uid FROM {spam_log} s INNER JOIN {users} u ON s.uid = u.uid WHERE s.sid = %d', $id));
 
   return theme('table', NULL, array(
-    array( array('data' => t('Type'), 'header' => TRUE), array('data' => l(t($entry->source), "admin/content/spam/logs/$entry->source")) ),
-    array( array('data' => t('!type ID', array('!type' => ucfirst($entry->source))), 'header' => TRUE), array('data' => l(t($entry->id), "admin/content/spam/logs/$entry->source/$entry->id")) ),
+    array( array('data' => t('Type'), 'header' => TRUE), array('data' => l(t($entry->source), "admin/logs/spam/logs/$entry->source")) ),
+    array( array('data' => t('!type ID', array('!type' => ucfirst($entry->source))), 'header' => TRUE), array('data' => l(t($entry->id), "admin/logs/spam/logs/$entry->source/$entry->id")) ),
     array( array('data' => t('Date'), 'header' => TRUE), array('data' => format_date($entry->timestamp, 'large')) ),
     array( array('data' => t('User'), 'header' => TRUE), array('data' => theme('username', $entry)) ),
     array( array('data' => t('Message'), 'header' => TRUE), array('data' => $entry->entry) ),
@@ -1706,9 +1706,9 @@ function spam_custom_filter_overview($id
       htmlspecialchars($custom->filter), $custom->style == 0 ? t('text') : t('regex'), $scan,
       $spam_effects["$custom->effect"],  $action, $custom->matches == 0 ? "none" : $custom->matches,
       $custom->last ? format_date($custom->last, 'small') : t('none'),
-      l(t('scan'), "admin/content/spam/custom/$custom->scid/scan") . " " 
-        . l(t('edit'), "admin/content/spam/custom/$custom->scid/edit")
-        . " " . l(t('delete'), "admin/content/spam/custom/$custom->scid/delete")
+      l(t('scan'), "admin/settings/spam/custom/$custom->scid/scan") . " " 
+        . l(t('edit'), "admin/settings/spam/custom/$custom->scid/edit")
+        . " " . l(t('delete'), "admin/settings/spam/custom/$custom->scid/delete")
     ));
   }
 
@@ -1840,7 +1840,7 @@ function spam_custom_filter_edit_submit(
     drupal_set_message(t('Custom filter %filter added.', array('%filter' => $form_values['filter'])));
   }
 
-  return 'admin/content/spam/custom';
+  return 'admin/settings/spam/custom';
 }
 
 /**
@@ -1852,7 +1852,7 @@ function spam_custom_filter_edit_submit(
 function spam_custom_filter_delete($filter = NULL) {
   $form['scid'] = array( '#type' => 'hidden', '#value' => $filter->scid, );
   return confirm_form($form, t('Are you sure you want to delete the %filter filter?', array('%filter' => $filter->filter)),
-    'admin/content/spam/custom', t('This action can not be undone.'), t('Delete'), t('Cancel'));
+    'admin/settings/spam/custom', t('This action can not be undone.'), t('Delete'), t('Cancel'));
 }
 
 /**
@@ -1862,7 +1862,7 @@ function spam_custom_filter_delete_submi
   $filter = spam_custom_filter_load($form_values['scid']);
   db_query('DELETE FROM {spam_custom} WHERE scid = %d', $form_values['scid']);
   drupal_set_message(t('Filter %filter deleted.', array('%filter' => $filter->filter)));
-  return 'admin/content/spam/custom';
+  return 'admin/settings/spam/custom';
 }
 
 /**
@@ -1977,7 +1977,7 @@ function spam_custom_filter_scan_validat
   $form_values['comments'] = array_diff($form_values['comments'], array(0));
   if (count($form_values['comments']) == 0) {
     form_set_error(NULL, t('Please select one or more comments to perform the update on.'));
-    return 'admin/content/spam/custom/$form_values[scid]/scan';
+    return 'admin/settings/spam/custom/$form_values[scid]/scan';
   }
 }
 
@@ -1997,7 +1997,7 @@ function spam_custom_filter_scan_submit 
     drupal_set_message(t('Comments have been updated.'));
   }
 
-  return "admin/content/spam/custom/$scid/scan";
+  return "admin/settings/spam/custom/$scid/scan";
 }
 
 /**
@@ -2075,8 +2075,8 @@ function spam_url_filter_overview($id = 
       htmlspecialchars(preg_replace('/^URL\*/', '', $url->token)),
       $url->spam, $url->notspam, $url->probability .'%',
       $url->last ? format_date($url->last, 'small') : t('none'),
-      l(t('edit'), "admin/content/spam/url/$url->tid/edit") . ' ' 
-        . l(t('delete'), "admin/content/spam/url/$url->tid/delete")
+      l(t('edit'), "admin/settings/spam/url/$url->tid/edit") . ' ' 
+        . l(t('delete'), "admin/settings/spam/url/$url->tid/delete")
     ));
   }
 
@@ -2142,7 +2142,7 @@ function spam_url_filter_edit_submit($fo
     drupal_set_message(t('URL filter %filter added.', array('%filter' => $form_values['url'])));
   }
 
-  return 'admin/content/spam/url';
+  return 'admin/settings/spam/url';
 }
 
 /**
@@ -2151,7 +2151,7 @@ function spam_url_filter_edit_submit($fo
 function spam_url_filter_delete($filter = NULL) {
   $form['tid'] = array( '#type' => 'hidden', '#value' => $filter->tid, );
   return confirm_form($form, t('Are you sure you want to delete the %filter filter?', array('%filter' => str_replace('URL*', '', $filter->token))),
-    'admin/content/spam/url', t('This action can not be undone.'), t('Delete'), t('Cancel'));
+    'admin/settings/spam/url', t('This action can not be undone.'), t('Delete'), t('Cancel'));
 }
 
 /**
@@ -2161,7 +2161,7 @@ function spam_url_filter_delete_submit($
   $filter = spam_url_filter_load($form_values['tid']);
   db_query('DELETE FROM {spam_tokens} WHERE tid = %d', $filter->tid);
   drupal_set_message(t('URL filter %filter deleted.', array('%filter' => str_replace('URL*', '', $filter->token))));
-  return 'admin/content/spam/url';
+  return 'admin/settings/spam/url';
 }
 
 /**
@@ -2388,7 +2388,7 @@ function spam_reported_comments_overview
     $form['author'][$comment->cid] = array('#value' => theme('username', user_load(array('uid' => $comment->uid))));
     $form['hostname'][$comment->cid] = array('#value' => $comment->hostname);
     $form['status'][$comment->cid] = array('#value' => ($comment->status == 0 ? t('published') : t('not published')));
-    $form['operations'][$comment->cid] = array('#value' => l(t('View log'), "admin/content/spam/logs/comment/$comment->cid") . ' ' . l(t('Details'), "admin/content/spam/reported/comment/$comment->cid/details", array('title' => htmlspecialchars(substr($comment->feedback, 0, 128)))) . ' ' . l(t('Edit'), "comment/edit/$comment->cid"));
+    $form['operations'][$comment->cid] = array('#value' => l(t('View log'), "admin/logs/spam/logs/comment/$comment->cid") . ' ' . l(t('Details'), "admin/content/spam/reported/comment/$comment->cid/details", array('title' => htmlspecialchars(substr($comment->feedback, 0, 128)))) . ' ' . l(t('Edit'), "comment/edit/$comment->cid"));
   }
 
   $form['comments'] = array('#type' => 'checkboxes', '#options' => $comments);
@@ -2537,7 +2537,7 @@ function spam_reported_nodes_overview() 
     $form['hostname'][$node->nid] = array('#value' => $node->hostname);
     $form['status'][$node->nid] = array('#value' => ($node->status ? t('published') : t('not published')));
     $form['timestamp'][$node->nid] = array('#value' => format_date($node->changed, 'small'));
-    $form['operations'][$node->nid] = array('#value' => l(t('View log'), "admin/content/spam/logs/node/$node->nid") . ' ' . l(t('Details'), "admin/content/spam/reported/node/$node->nid/details", array('title' => htmlspecialchars(substr($node->feedback, 0, 128)))) . ' ' . l(t('Edit'), "node/$node->nid/edit"));
+    $form['operations'][$node->nid] = array('#value' => l(t('View log'), "admin/logs/spam/logs/node/$node->nid") . ' ' . l(t('Details'), "admin/content/spam/reported/node/$node->nid/details", array('title' => htmlspecialchars(substr($node->feedback, 0, 128)))) . ' ' . l(t('Edit'), "node/$node->nid/edit"));
   }
 
   $form['nodes'] = array('#type' => 'checkboxes', '#options' => $nodes);
@@ -2597,8 +2597,8 @@ function spam_reported_details() {
       else {
         $output .= '<table border="1" cellpadding="2" cellspacing="2">';
       }
-      $output .= ' <tr><th>'. t('Type') .'</th><td>' . l(t($entry->source), "admin/content/spam/logs/$entry->source") . '</td></tr>';
-      $output .= ' <tr><th>'. t('@type ID', array('@type' => ucfirst($entry->source))) .'</th><td>' . l(t($entry->id), "admin/content/spam/logs/$entry->source/$entry->id") . '</td></tr>';
+      $output .= ' <tr><th>'. t('Type') .'</th><td>' . l(t($entry->source), "admin/logs/spam/logs/$entry->source") . '</td></tr>';
+      $output .= ' <tr><th>'. t('@type ID', array('@type' => ucfirst($entry->source))) .'</th><td>' . l(t($entry->id), "admin/logs/spam/logs/$entry->source/$entry->id") . '</td></tr>';
       $output .= ' <tr><th>'. t('Date') .'</th><td>'. format_date($entry->timestamp, 'large') .'</td></tr>';
       $reported_user = user_load(array('uid' => $entry->uid));
       $output .= ' <tr><th>'. t('User') .'</th><td>'. theme('username', $reported_user) .'</td></tr>';
@@ -2684,7 +2684,7 @@ function spam_comment_overview() {
     $form['hostname'][$comment->cid] = array('#value' => $comment->hostname);
     $form['status'][$comment->cid] = array('#value' => ($comment->status == 0 ? t('published') : t('not published')));
     $form['timestamp'][$comment->cid] = array('#value' => format_date($comment->timestamp, 'small'));
-    $form['operations'][$comment->cid] = array('#value' => l(t('edit'), "comment/edit/$comment->cid", array(), 'destination=admin/content/comment/') . '&nbsp;' . l(t('details'), "admin/content/spam/logs/comment/$comment->cid"));
+    $form['operations'][$comment->cid] = array('#value' => l(t('edit'), "comment/edit/$comment->cid", array(), 'destination=admin/content/comment/') . '&nbsp;' . l(t('details'), "admin/logs/spam/logs/comment/$comment->cid"));
   }
 
   $form['comments'] = array('#type' => 'checkboxes', '#options' => $comments);
@@ -2933,7 +2933,7 @@ function spam_node_overview() {
     $form['hostname'][$node->nid] = array('#value' => $node->hostname);
     $form['status'][$node->nid] = array('#value' => ($node->status ? t('published') : t('not published')));    
     $form['timestamp'][$node->nid] = array('#value' => format_date($node->changed, 'small'));
-    $form['operations'][$node->nid] = array('#value' => l(t('View log'), "admin/content/spam/logs/node/$node->nid") . '&nbsp;' . l(t('Edit'), "node/$node->nid/edit") . '&nbsp;' . l(t('Delete'), "admin/content/node/delete/$node->nid"));
+    $form['operations'][$node->nid] = array('#value' => l(t('View log'), "admin/logs/spam/logs/node/$node->nid") . '&nbsp;' . l(t('Edit'), "node/$node->nid/edit") . '&nbsp;' . l(t('Delete'), "admin/content/node/delete/$node->nid"));
   }
 
   $form['nodes'] = array('#type' => 'checkboxes', '#options' => $nodes);