? mollom-client-api.pdf
? mollom.temp.inc.txt
? mollom.token.inc
? mollom.token.inc.txt
? molstats
? xmlrpc calls.txt
? translations/th.po
Index: mollom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v
retrieving revision 1.2.2.64
diff -u -p -r1.2.2.64 mollom.module
--- mollom.module	18 Jun 2009 10:04:46 -0000	1.2.2.64
+++ mollom.module	30 Jun 2009 19:05:59 -0000
@@ -43,26 +43,25 @@ function mollom_help($path, $arg) {
  * Implementation of hook_link().
  */
 function mollom_link($type, $object = NULL) {
-  // We extend the comment links so people can send feedback:
-  if ($type == 'comment' && user_access('administer comments') && _mollom_get_mode('comment_form')) {
-    $links['comment_spam'] = array(
-      'title' => t('mark as abuse'),
-      'href' => "mollom/comment/$object->cid",
-      'html' => TRUE,
-    );
-
-    return $links;
-  }
-
-  if ($type == 'node' && user_access('administer nodes') && _mollom_get_mode($object->type .'_node_form')) {
-    $links['node_spam'] = array(
-      'title' => t('Delete post'),
-      'href' => "mollom/node/$object->nid",
-      'html' => TRUE,
-    );
-
-    return $links;
+  $links = array();
+  // Only show the links if the module is configured.
+  if (variable_get('mollom_public_key', '') && variable_get('mollom_private_key', '')) {
+    if ($type == 'comment' && user_access('administer comments') && _mollom_get_mode('comment_form')) {
+      $links['mollom_comment_spam'] = array(
+        'title' => t('Report to Mollom'),
+        'href' => "mollom/comment/$object->cid",
+        'html' => TRUE,
+      );
+    }
+    if ($type == 'node' && user_access('administer nodes') && _mollom_get_mode($object->type .'_node_form')) {
+      $links['mollom_node_spam'] = array(
+        'title' => t('Report to Mollom'),
+        'href' => "mollom/node/$object->nid",
+        'html' => TRUE,
+      );
+    }
   }
+  return $links;
 }
 
 /**
@@ -84,7 +83,7 @@ function mollom_menu() {
     'type' => MENU_CALLBACK,
   );
   $items['mollom/contact'] = array(
-    'title' => 'Report and delete',
+    'title' => 'Report',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('mollom_report_contact'),
     'access callback' => TRUE, // Everyone can report contact form feedback.
@@ -276,8 +275,8 @@ function mollom_report_node_submit($form
 function mollom_mail_alter(&$message) {
   if (isset($GLOBALS['mollom_response']) && isset($GLOBALS['mollom_response']['session_id'])) {
     $report_link = t('Report as inappropriate: @link', array('@link' => url('mollom/contact/'. $GLOBALS['mollom_response']['session_id'], array('absolute' => TRUE))));
-    // The _mail_alter hook seems to accept both arrays as strings so we 
-    // need to handle both. TODO: it seems like something we want to clean 
+    // The _mail_alter hook seems to accept both arrays as strings so we
+    // need to handle both. TODO: it seems like something we want to clean
     // up upstream.
     if (is_array($message['body'])) {
       $message['body'][] = $report_link;
@@ -1092,9 +1091,9 @@ function _mollom_retrieve_server_list() 
  * Call a remote procedure at the Mollom server.  This function
  * automatically adds the information required to authenticate against
  * Mollom.
- * 
+ *
  * TODO: currently this function's return value mixes actual values and
- * error values. We should rewrite the error handling so that calling 
+ * error values. We should rewrite the error handling so that calling
  * functions can properly handle error situations.
  */
 function mollom($method, $data = array()) {
@@ -1181,7 +1180,7 @@ function mollom($method, $data = array()
 
   // Report this error:
   watchdog('mollom', 'No Mollom servers could be reached or all servers returned an error -- the server list was emptied.', NULL, WATCHDOG_ERROR);
-  
+
   return NETWORK_ERROR;
 }