Index: mollom.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.admin.inc,v
retrieving revision 1.3
diff -u -p -r1.3 mollom.admin.inc
--- mollom.admin.inc	21 Dec 2009 20:24:22 -0000	1.3
+++ mollom.admin.inc	21 Dec 2009 22:35:27 -0000
@@ -271,10 +271,6 @@ function mollom_admin_unprotect_form_sub
  */
 function mollom_admin_settings($form, &$form_state) {
   $keys = _mollom_access();
-  // Since keys are not verified in HTTP POST requests, we need to default to
-  // a successful key status. Otherwise, the fallback form elements would not
-  // be accessible and therefore no value would be stored.
-  $status = $keys;
 
   if ($keys) {
     if (!$_POST) {
@@ -286,9 +282,7 @@ function mollom_admin_settings($form, &$
       variable_del('mollom_servers');
 
       // Verify the key and output a status message.
-      // @todo This must be a form #validate handler; the form must not be
-      //   submitted if validation fails.
-      $status = _mollom_verify_key();
+      _mollom_verify_key();
     }
   }
 
Index: mollom.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.info,v
retrieving revision 1.4
diff -u -p -r1.4 mollom.info
--- mollom.info	21 Dec 2009 20:24:22 -0000	1.4
+++ mollom.info	21 Dec 2009 22:46:13 -0000
@@ -7,3 +7,4 @@ files[] = mollom.admin.inc
 files[] = mollom.pages.inc
 files[] = mollom.install
 files[] = tests/mollom.test
+configure = admin/config/content/mollom
Index: mollom.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.install,v
retrieving revision 1.4
diff -u -p -r1.4 mollom.install
--- mollom.install	21 Dec 2009 20:24:22 -0000	1.4
+++ mollom.install	21 Dec 2009 22:08:37 -0000
@@ -78,7 +78,7 @@ function mollom_schema() {
         'default' => 0,
       ),
       'fields' => array(
-        'description' => 'The module name the $form_id belongs to.',
+        'description' => 'A list of form fields configured for textual analysis.',
         'type' => 'text',
         'not null' => FALSE,
         'serialize' => TRUE,
Index: mollom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v
retrieving revision 1.4
diff -u -p -r1.4 mollom.module
--- mollom.module	21 Dec 2009 20:24:22 -0000	1.4
+++ mollom.module	21 Dec 2009 22:47:44 -0000
@@ -125,9 +125,9 @@ function mollom_help($path, $arg) {
 }
 
 /**
- * Implements hook_init().
+ * Implements hook_exit().
  */
-function mollom_init() {
+function mollom_exit() {
   // Expire all mollom session IDs as soon as possible.
   $now = REQUEST_TIME;
   if (isset($_SESSION['mollom_sessions'])) {
@@ -208,7 +208,7 @@ function mollom_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('mollom_reports_page'),
     'access callback' => '_mollom_access',
-    'access arguments' => array('access mollom reports'),
+    'access arguments' => array('administer mollom'),
     'file' => 'mollom.admin.inc',
   );
 
@@ -290,9 +290,6 @@ function mollom_permission() {
     'administer mollom' => array(
       'title' => t('Administer Mollom-protected forms and Mollom settings'),
     ),
-    'access mollom reports' => array(
-      'title' => t('Access Mollom reports'),
-    ),
     'post with no checking' => array(
       'title' => t('Post content without checking'),
     ),
@@ -1360,7 +1357,7 @@ function node_mollom_form_info() {
       'title' => t('@name form', array('@name' => $type->name)),
       'mode' => MOLLOM_MODE_ANALYSIS,
       // @todo This is incompatible with node access.
-      'bypass access' => array('administer nodes', 'edit any ' . $type->type . ' content'),
+      'bypass access' => array('bypass node access', 'edit any ' . $type->type . ' content'),
       'report access callback' => 'node_mollom_report_access',
       'report delete callback' => 'node_mollom_report_delete',
       'entity' => 'node',