? .spam.module.swp
? content/.spam_content_user.inc.swp
Index: content/spam_content_comment.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/spam/content/Attic/spam_content_comment.inc,v
retrieving revision 1.1.2.5
diff -U 3 -r1.1.2.5 spam_content_comment.inc
--- content/spam_content_comment.inc	28 Dec 2010 23:48:59 -0000	1.1.2.5
+++ content/spam_content_comment.inc	30 Dec 2010 00:21:06 -0000
@@ -11,7 +11,7 @@
 /**
  * Drupal _comment() hook.
  */
-function comment_comment(&$comment, $op) {
+function spam_comment(&$comment, $op) {
   switch ($op) {
     case 'update':
       spam_content_update($comment, 'comment');
Index: content/spam_content_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/spam/content/Attic/spam_content_node.inc,v
retrieving revision 1.1.2.3
diff -U 3 -r1.1.2.3 spam_content_node.inc
--- content/spam_content_node.inc	28 Dec 2010 06:08:22 -0000	1.1.2.3
+++ content/spam_content_node.inc	30 Dec 2010 00:21:06 -0000
@@ -9,7 +9,7 @@
 /**
  * Drupal _nodeapi() hook.
  */
-function node_nodeapi(&$node, $op) {
+function spam_nodeapi(&$node, $op) {
   switch ($op) {
     case 'update':
       spam_content_update($node, 'node');
Index: content/spam_content_user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/spam/content/Attic/spam_content_user.inc,v
retrieving revision 1.1.2.3
diff -U 3 -r1.1.2.3 spam_content_user.inc
--- content/spam_content_user.inc	28 Dec 2010 06:08:22 -0000	1.1.2.3
+++ content/spam_content_user.inc	30 Dec 2010 00:21:06 -0000
@@ -9,7 +9,7 @@
 /**
  *
  */
-function spam_content_user($type, &$edit, &$user, $category = NULL) {
+function spam_user($type, &$edit, &$user, $category = NULL) {
   switch ($type) {
     case 'update':
       $user = spam_content_user_profile_update($user);
@@ -21,7 +21,7 @@
       return spam_content_delete($user, 'user');
     case 'view':
       $links = '';
-      if (user_spamapi('filter_content_type', $user)) {
+      if (user_spamapi('filter_content_type', $user) && user_access('administer spam')) {
         foreach (spam_links('user', $user->uid, $user) as $link) {
           if ($link['href']) {
             $links .= l($link['title'], $link['href']) .' ';
@@ -30,17 +30,15 @@
             $links .= $link['title'] .' ';
           }
         }
-        $items['spam_links'] = array(
-          'value' => $links,
-          'class' => 'spam',
+        // Spam/not spam status is displayed in $links -- is this necessary?
+        //$status = db_result(db_query('SELECT status FROM {users} WHERE uid = %d', $user->uid));
+        //$status_text = t('User status: %status', array('%status' => $status ? t('not blocked') : t('blocked')));
+        $user->content['summary']['spam_status'] = array(
+          '#type' => 'user_profile_item',
+          '#weight' => '10',
+          '#title' => 'Spam status',
+          '#value' => $links,
         );
-        $status = db_result(db_query('SELECT status FROM {users} WHERE uid = %d', $user->uid));
-        $status_text = t('User status: %status', array('%status' => $status ? t('not blocked') : t('blocked')));
-        $items['spam_status'] = array(
-          'value' => $status_text,
-          'class' => 'spam',
-        );
-        return array(t('Spam status') => $items);
       }
       break;
   }