? .DS_Store
? send-feedback-watchdogs-D6.patch
? send-feedback-watchdogs.patch
Index: mollom.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.admin.inc,v
retrieving revision 1.1.2.15
diff -u -r1.1.2.15 mollom.admin.inc
--- mollom.admin.inc	5 Jan 2010 15:35:58 -0000	1.1.2.15
+++ mollom.admin.inc	6 Jan 2010 10:42:06 -0000
@@ -350,9 +350,9 @@
     list($id, $operation) = explode('-', $form_state['values']['operation']);
     foreach ($form_state['values']['comments'] as $cid => $value) {
       if ($value) {
-        // First, send the proper information to the XML-RPC server:
+        // First, report the comments as spam to Mollom.com.
         if ($data = mollom_data_load('comment', $cid)) {
-          mollom('mollom.sendFeedback', array('session_id' => $data->session, 'feedback' => 'spam'));
+          _mollom_send_feedback($data->session);
         }
 
         // Second, perform the proper operation on the comments:
@@ -389,8 +389,9 @@
     list($id, $operation) = explode('-', $form_state['values']['operation']);
     foreach ($form_state['values']['nodes'] as $nid => $value) {
       if ($value) {
+        // First, report the nodes as spam to Mollom.com.
         if ($data = mollom_data_load('node', $nid)) {
-          mollom('mollom.sendFeedback', array('session_id' => $data->session, 'feedback' => 'spam'));
+           _mollom_send_feedback($data->session);
         }
 
         if ($node = node_load($nid)) {
Index: mollom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v
retrieving revision 1.2.2.112
diff -u -r1.2.2.112 mollom.module
--- mollom.module	5 Jan 2010 21:31:30 -0000	1.2.2.112
+++ mollom.module	6 Jan 2010 10:42:07 -0000
@@ -1283,6 +1283,22 @@
 }
 
 /**
+ * Send feedback to Mollom.
+ */
+function _mollom_send_feedback($session_id, $feedback = 'spam') {
+   mollom('mollom.sendFeedback', array(
+     'session_id' => $data->session, 
+     'feedback' => $feedback
+   ));
+  
+   watchdog('mollom', "Reported session id %session as @feedback.", array(
+     '@entity' => $entity,
+     '%session' => $session_id, 
+     '@feedback' => $feedback
+   ));
+}
+
+/**
  * Fetch the site's Mollom statistics from the API.
  *
  * @param $refresh
Index: mollom.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.pages.inc,v
retrieving revision 1.1.2.6
diff -u -r1.1.2.6 mollom.pages.inc
--- mollom.pages.inc	12 Dec 2009 20:57:18 -0000	1.1.2.6
+++ mollom.pages.inc	6 Jan 2010 10:42:07 -0000
@@ -83,10 +83,7 @@
     // Send feedback to Mollom, if we have session data.
     if (isset($data->session) && isset($form_state['values']['feedback']) && $form_state['values']['feedback'] != 'none') {
       // @todo Check the actual reponse.
-      mollom('mollom.sendFeedback', array(
-        'session_id' => $data->session,
-        'feedback' => $form_state['values']['feedback'],
-      ));
+      _mollom_send_feedback($data->session, $form_state['values']['feedback']);
       drupal_set_message(t('The content was successfully reported as inappropriate.'));
     }