From a7f7997f66c54215cb2d88b030038846954a7e60 Mon Sep 17 00:00:00 2001
From: sun <sun@unleashedmind.com>
Date: Fri, 29 Mar 2013 17:19:09 +0100
Subject: [PATCH 1/3] - #1938768 by sun: Fixed text analysis is incompatible
 with enabled page cache/reverse proxy.

---
 mollom.admin.inc                |   2 +
 mollom.module                   | 259 ++++++++++++++++++++++++----------------
 tests/mollom.test               | 182 +++++++++++++++++++++-------
 tests/mollom_test.install       |   2 +-
 tests/mollom_test.module        |  77 ++++++++----
 tests/mollom_test_server.module |   3 +
 6 files changed, 357 insertions(+), 168 deletions(-)

diff --git a/mollom.admin.inc b/mollom.admin.inc
index 5f194b7..c1f984e 100644
--- a/mollom.admin.inc
+++ b/mollom.admin.inc
@@ -348,6 +348,8 @@ function mollom_admin_configure_form(&$form_state, $mollom_form = NULL) {
  * #after_build callback for mollom_admin_configure_form().
  */
 function mollom_admin_configure_form_after_build($form, &$form_state) {
+  $form['mollom']['mode'][MOLLOM_MODE_CAPTCHA]['#description'] = t('Only choose CAPTCHA if text analysis is not suitable. Page caching is disabled on all pages containing CAPTCHA-only protected forms.');
+
   // Conditionally make text analysis form elements required.
   // Accounts for different add and edit form builds and rebuilds.
   $required = ($form_state['values']['mollom']['mode'] == MOLLOM_MODE_ANALYSIS);
diff --git a/mollom.module b/mollom.module
index 90ef43e..40723d9 100644
--- a/mollom.module
+++ b/mollom.module
@@ -584,8 +584,11 @@ function mollom_data_report_multiple($entity, array $ids, $feedback) {
 /**
  * Implements hook_form_alter().
  *
- * This function intercepts all forms in Drupal and Mollom-enables them if
- * necessary.
+ * Protects all configured forms with Mollom.
+ *
+ * @see mollom_element_info()
+ * @see mollom_process_mollom()
+ * @see mollom_pre_render_mollom()
  */
 function mollom_form_alter(&$form, &$form_state, $form_id) {
   // Skip installation and update forms.
@@ -663,6 +666,7 @@ function mollom_form_alter(&$form, &$form_state, $form_id) {
         '#weight' => $weight,
         '#tree' => TRUE,
       );
+
       // Add Mollom form validation handlers.
       // Form-level validation handlers are required, since we need access to
       // all validated and submitted form values. _form_validate() invokes
@@ -1436,6 +1440,11 @@ function _mollom_testing_mode_warning() {
   if (isset($warned)) {
     return;
   }
+  // drupal_set_message() starts a session and disables page caching, which
+  // breaks cache-related tests. Thus, tests set the verbose variable to TRUE.
+  if ($warned = variable_get('mollom_testing_mode_omit_warning', NULL)) {
+    return;
+  }
   $warned = TRUE;
 
   if (variable_get('mollom_testing_mode', 0) && empty($_POST)) {
@@ -1561,11 +1570,39 @@ function theme_mollom($element) {
 }
 
 /**
- * Form element #process callback for the 'mollom' element.
+ * #process callback for #type 'mollom'.
+ *
+ * Mollom supports two fundamentally different protection modes:
+ * - For text analysis, the state of a post is essentially tracked by the Mollom
+ *   API/backend:
+ *   - Every form submission attempt (re-)sends the post data to Mollom, and the
+ *     API ensures to return the correct spamClassification each time.
+ *   - The client-side logic fully relies on the returned spamClassification
+ *     value to trigger the corresponding actions and does not track the state
+ *     of the form submission attempt locally.
+ *   - For example, when Mollom is "unsure" and the user solved the CAPTCHA,
+ *     then subsequent Content API responses will return "ham" instead of
+ *     "unsure", so the user is not asked to solve more than one CAPTCHA.
+ * - For CAPTCHA-only, the solution state of a CAPTCHA has to be tracked locally:
+ *   - Unlike text analysis, a CAPTCHA can only be solved or not. Additionally,
+ *     a CAPTCHA cannot be solved more than once. The Mollom API only returns
+ *     (once) whether a CAPTCHA has been solved correctly. A previous state
+ *     cannot be queried from Mollom.
+ *   - State-tracking would not be necessary, if there could not be other form
+ *     validation errors preventing the form from submitting directly, as well as
+ *     "Preview" buttons that may rebuild the entire form from scratch (if there
+ *     are no validation errors).
+ *   - To track state, the Form API cache is enabled, which allows to store and
+ *     retrieve the entire $form_state of a previous submission (attempt).
+ *   - Furthermore, page caching is force-disabled, so as to ensure that cached
+ *     form data is not re-used by different users/visitors.
+ *   - In combination with the Form API cache, this is essentially equal to
+ *     force-starting a session for all users that try to submit a CAPTCHA-only
+ *     protected form. However, a session would persist across other pages.
  *
- * The 'mollom' form element is stateful. The Mollom session ID that is exchanged
- * between Drupal, the Mollom back-end, and the user allows us to keep track of
- * the form validation state.
+ * @see mollom_form_alter()
+ * @see mollom_element_info()
+ * @see mollom_pre_render_mollom()
  *
  * The session ID is valid for a given $form_id only. We expire it as soon as
  * the form is submitted, to avoid it being replayed.
@@ -1587,18 +1624,23 @@ function mollom_process_mollom($element, $input, &$form_state, $complete_form) {
     // state is merely lost and the form submission needs to go through Mollom
     // validation from scratch.
     'mollom_build_id' => md5(uniqid(mt_rand(), TRUE)),
+    // Only TRUE if the form is protected by text analysis.
     'require_analysis' => $element['#mollom_form']['mode'] == MOLLOM_MODE_ANALYSIS,
+    // Becomes TRUE whenever a CAPTCHA needs to be solved.
     'require_captcha' => $element['#mollom_form']['mode'] == MOLLOM_MODE_CAPTCHA,
+    // Becomes TRUE when the CAPTCHA has been solved.
+    // Only applies to CAPTCHA-only protected forms. Not necessarily TRUE for
+    // text analysis, even if a CAPTCHA has been solved previously.
     'passed_captcha' => FALSE,
+    // The type of CAPTCHA to show; 'image' or 'audio'.
     'captcha_type' => 'image',
+    // Becomes TRUE if the form is protected by text analysis and the submitted
+    // entity should be unpublished.
     'require_moderation' => FALSE,
+    // Internally used bag for last Mollom API responses.
     'response' => array(
     ),
   );
-  // Instantiate a new Mollom class, unless there is not a cached one.
-  if (!isset($form_state['mollom']['class'])) {
-    $form_state['mollom']['class'] = mollom();
-  }
   // Add remaining information about the registered form.
   $form_state['mollom'] += $element['#mollom_form'];
 
@@ -1633,11 +1675,16 @@ function mollom_process_mollom($element, $input, &$form_state, $complete_form) {
   );
   $element['contentId'] = array(
     '#type' => 'hidden',
-    '#default_value' => isset($form_state['mollom']['response']['content']['id']) ? $form_state['mollom']['response']['content']['id'] : '',
+    // There is no default value; Form API will always use the value that was
+    // submitted last (including rebuild scenarios).
     '#attributes' => array('class' => 'mollom-content-id'),
   );
   $element['captchaId'] = array(
     '#type' => 'hidden',
+    // For CAPTCHA-only protected forms, the most recent CAPTCHA ID is tracked
+    // in $form_state. A new CAPTCHA ID may be injected by mollom_get_captcha().
+    // Furthermore, the CAPTCHA type can be switched between image and audio,
+    // and for each switch, there is a new CAPTCHA ID.
     '#default_value' => isset($form_state['mollom']['response']['captcha']['id']) ? $form_state['mollom']['response']['captcha']['id'] : '',
     '#attributes' => array('class' => 'mollom-captcha-id'),
   );
@@ -1655,13 +1702,20 @@ function mollom_process_mollom($element, $input, &$form_state, $complete_form) {
   );
   $element['spamScore'] = $data_spec;
   $element['spamClassification'] = $data_spec;
-  $element['solved'] = $data_spec;
   $element['qualityScore'] = $data_spec;
   $element['profanityScore'] = $data_spec;
-  $element['reason'] = $data_spec;
   $element['languages'] = $data_spec;
+  $element['reason'] = $data_spec;
+  $element['solved'] = $data_spec;
 
   // Add the CAPTCHA element.
+  // - Cannot be #required, since that would cause _form_validate() to output a
+  //   validation error in situations in which the CAPTCHA is not required.
+  // - #access can also not start with FALSE, since the form structure may be
+  //   cached, and Form API ignores all user input for inaccessible elements.
+  // Since this element needs to be hidden by the #pre_render callback, but that
+  // callback does not have access to $form_state, the 'passed_captcha' state is
+  // assigned as Boolean #solved = TRUE element property when solved correctly.
   $element['captcha'] = array(
     '#type' => 'textfield',
     '#title' => t('Word verification'),
@@ -1674,16 +1728,21 @@ function mollom_process_mollom($element, $input, &$form_state, $complete_form) {
   if (!variable_get('mollom_testing_mode', 0)) {
     $element['captcha']['#attributes']['autocomplete'] = 'off';
   }
-
-  // Request and inject an initial CAPTCHA.
-  // If there is a CAPTCHA ID already, then it needs to be validated in
-  // mollom_validate_captcha() first.
-  if ($form_state['mollom']['require_captcha'] && !$form_state['mollom']['passed_captcha'] && empty($form_state['mollom']['response']['captcha']['id'])) {
-    mollom_form_add_captcha($element, $form_state);
-  }
-  // If no CAPTCHA is required or it was solved already, hide the element.
-  elseif (!$form_state['mollom']['require_captcha'] || $form_state['mollom']['passed_captcha']) {
-    $element['captcha']['#access'] = FALSE;
+  // For CAPTCHA-only protected forms, retrieve and show an initial CAPTCHA.
+  if (!$form_state['mollom']['require_analysis'] && $form_state['mollom']['require_captcha']) {
+    // Unless the CAPTCHA was solved, display the CAPTCHA.
+    if (!$form_state['mollom']['passed_captcha']) {
+      // Enable Form API caching, in order to track the state of the CAPTCHA.
+      $form_state['cache'] = TRUE;
+      // mollom_form_add_captcha() adds the CAPTCHA and disables page caching.
+      mollom_form_add_captcha($element, $form_state);
+    }
+    // Otherwise, resemble mollom_validate_captcha(). This case is only reached
+    // in case the form 1) is not cached, 2) fully validated, 3) was submitted,
+    // and 4) is getting rebuilt; e.g., "Preview" on comment and node forms.
+    else {
+      $element['captcha']['#solved'] = TRUE;
+    }
   }
 
   // Add a spambot trap. Purposively use 'homepage' as field name.
@@ -1768,9 +1827,6 @@ function mollom_process_mollom_form_state($element, $input, &$form_state) {
  *   The current state of the form. Passed by reference.
  */
 function mollom_form_add_captcha(&$element, &$form_state) {
-  // UX: Empty the CAPTCHA field value, as the user has to re-enter a new one.
-  $element['captcha']['#value'] = '';
-
   // Prevent the page cache from storing a form containing a CAPTCHA element.
   $GLOBALS['conf']['cache'] = CACHE_DISABLED;
   // Pressflow in CACHE_EXTERNAL caching mode additionally requires to mark
@@ -1784,9 +1840,9 @@ function mollom_form_add_captcha(&$element, &$form_state) {
   // If we get a response, add the image CAPTCHA to the form element.
   if (!empty($captcha)) {
     $element['captcha']['#access'] = TRUE;
-    $element['captcha']['#required'] = TRUE;
     $element['captcha']['#field_prefix'] = $captcha;
-    // Assign the session ID returned by Mollom.
+
+    // Ensure that the latest CAPTCHA ID is output as value.
     $element['captchaId']['#value'] = $form_state['mollom']['response']['captcha']['id'];
     $form_state['values']['mollom']['captchaId'] = $form_state['mollom']['response']['captcha']['id'];
   }
@@ -1799,18 +1855,9 @@ function mollom_form_add_captcha(&$element, &$form_state) {
 }
 
 /**
- * Form validation handler to perform textual analysis of submitted form values.
- *
- * Validation needs to re-run in case of a form validation error (elsewhere in
- * the form). In case Mollom's textual analysis returns no definite result, we
- * must trigger a CAPTCHA, but text analysis is always performed, even if the
- * CAPTCHA was solved correctly.
+ * Form validation handler to perform textual analysis on submitted form values.
  */
 function mollom_validate_analysis(&$form, &$form_state) {
-  // Text analysis may only ever be skipped, if we do not require it in the
-  // first place. With regard to that, $form_state['mollom']['require_analysis']
-  // is only set once during initialization of $form_state['mollom'] in
-  // mollom_process_form() and must not be updated elsewhere.
   if (!$form_state['mollom']['require_analysis']) {
     return;
   }
@@ -1826,8 +1873,8 @@ function mollom_validate_analysis(&$form, &$form_state) {
   if (isset($data['postId'])) {
     unset($data['postId']);
   }
-  if (isset($form_state['mollom']['response']['content']['id'])) {
-    $data['id'] = $form_state['mollom']['response']['content']['id'];
+  if (!empty($form_state['values']['mollom']['contentId'])) {
+    $data['id'] = $form_state['values']['mollom']['contentId'];
   }
   $data['checks'] = $form_state['mollom']['checks'];
   $data['strictness'] = $form_state['mollom']['strictness'];
@@ -1837,7 +1884,7 @@ function mollom_validate_analysis(&$form, &$form_state) {
   if (in_array('spam', $data['checks']) && $form_state['mollom']['unsure'] == 'binary') {
     $data['unsure'] = 0;
   }
-  $result = $form_state['mollom']['class']->checkContent($data);
+  $result = mollom()->checkContent($data);
 
   // Use all available data properties for log messages below.
   $data += $all_data;
@@ -1849,13 +1896,15 @@ function mollom_validate_analysis(&$form, &$form_state) {
 
   // Store the response returned by Mollom.
   $form_state['mollom']['response']['content'] = $result;
-  // Set form element values accordingly. Do not overwrite the entity ID with
-  // the contentId, nor a possibly existing captchaId.
+  // Set form values accordingly. Do not overwrite the entity ID.
+  // @todo Rename 'id' to 'entity_id'.
   $result['contentId'] = $result['id'];
   unset($result['id']);
   $form_state['values']['mollom'] = array_merge($form_state['values']['mollom'], $result);
-  // #value has to be set manually to output it in case of a validation error,
-  // since this is not a element-level but a form-level validation handler.
+
+  // Ensure the latest content ID is output as value.
+  // form_set_value() is effectless, as this is not a element-level but a
+  // form-level validation handler.
   $form['mollom']['contentId']['#value'] = $result['contentId'];
 
   // Prepare watchdog message teaser text.
@@ -1881,14 +1930,12 @@ function mollom_validate_analysis(&$form, &$form_state) {
     ));
   }
 
-  // Handle the final spam classification result.
-  // The Mollom backend is remembering results of previous mollom.checkContent
-  // invocations for a single user/post session. When content is re-checked
-  // during form validation, the result may change according to the values that
-  // have been submitted (which e.g. can change during previews). Only in case
-  // the spam check led to a 'unsure' result, and the user solved the CAPTCHA
-  // correctly, subsequent spam check results will likely be 'ham' (though not
-  // guaranteed).
+  // Handle the spam check result.
+  // The Mollom API takes over state tracking for each content ID/session. The
+  // spamClassification will usually turn into 'ham' after solving a CAPTCHA.
+  // It may also change to 'spam', if the user replaced the values with very
+  // spammy content. In any case, we always do what we are told to do.
+  // Note: The returned spamScore may diverge from the spamClassification.
   if (isset($result['spamClassification'])) {
     switch ($result['spamClassification']) {
       case 'ham':
@@ -1914,26 +1961,16 @@ function mollom_validate_analysis(&$form, &$form_state) {
         break;
 
       case 'unsure':
-        mollom_log(array(
-          'message' => 'Unsure: %teaser',
-          'arguments' => array('%teaser' => $teaser),
-        ), WATCHDOG_INFO);
-
         if ($form_state['mollom']['unsure'] == 'moderate') {
           $form_state['mollom']['require_moderation'] = TRUE;
         }
         else {
-          // Only throw a validation error and retrieve a CAPTCHA, if we check
-          // this post for the first time. Otherwise, mollom_validate_captcha()
-          // issued the CAPTCHA and needs to validate it prior to throwing any
-          // errors.
-          if (!$form_state['mollom']['require_captcha']) {
-            $form_state['mollom']['require_captcha'] = TRUE;
-            form_set_error('mollom][captcha', t('To complete this form, please complete the word verification below.'));
-            // D6: Not possible here; deferred to mollom_pre_render_mollom().
-            //mollom_form_add_captcha($form['mollom'], $form_state);
-          }
+          $form_state['mollom']['require_captcha'] = TRUE;
         }
+        mollom_log(array(
+          'message' => 'Unsure: %teaser',
+          'arguments' => array('%teaser' => $teaser),
+        ), WATCHDOG_INFO);
         break;
 
       case MOLLOM_ANALYSIS_UNKNOWN:
@@ -1959,28 +1996,27 @@ function mollom_validate_analysis(&$form, &$form_state) {
  * text analysis result is "unsure".
  */
 function mollom_validate_captcha(&$form, &$form_state) {
-  // CAPTCHA validation may only be skipped, if we do not require it in the
-  // first place, or if the user already solved a CAPTCHA correctly. We need to
-  // validate, if $form_state['mollom']['require_captcha'] is TRUE, which is
-  // either set during initialization of $form_state['mollom'] in
-  // mollom_process_form(), or after performing text analysis. The second
-  // return condition, $form_state['mollom']['passed_captcha'], may only ever be
-  // set by this validation handler and must not be changed elsewhere.
- if (!$form_state['mollom']['require_captcha'] || $form_state['mollom']['passed_captcha']) {
-    $form['mollom']['captcha']['#access'] = FALSE;
+  if (!$form_state['mollom']['require_captcha']) {
     return;
   }
 
-  // If the form is protected via text analysis and the result was "unsure",
-  // then this validation handler also runs when the CAPTCHA is initially
-  // requested by mollom_validate_analysis(), is about to be rendered, and
-  // before the user had a chance to solve it. In that case, there is no value
-  // that could be validated yet; i.e., the CAPTCHA value is empty. However, in
-  // all other cases, an empty value must be validated and sent to Mollom. The
-  // initial case has a special condition: mollom_validate_analysis() has set
-  // a form error on the CAPTCHA element asking the user to solve it in order to
-  // submit the form.
-  if ($form_state['values']['mollom']['captcha'] === '' && form_get_error($form['mollom']['captcha'])) {
+  // If there is no CAPTCHA ID yet, retrieve one and throw an error.
+  if (empty($form_state['values']['mollom']['captchaId'])) {
+    // D6: Not possible here; deferred to mollom_pre_render_mollom().
+    //mollom_form_add_captcha($form['mollom'], $form_state);
+    form_error($form['mollom']['captcha'], t('To complete this form, please complete the word verification below.'));
+    return;
+  }
+
+  // $form_state['mollom']['passed_captcha'] may only ever be set by this
+  // validation handler and must not be changed elsewhere.
+  // This only becomes TRUE for CAPTCHA-only protected forms, for which the
+  // CAPTCHA state is locally tracked in $form_state. For text analysis, the
+  // primary 'require_captcha' condition will not be TRUE unless needed in the
+  // first place.
+  if ($form_state['mollom']['passed_captcha']) {
+    $form['mollom']['captcha']['#access'] = FALSE;
+    $form['mollom']['captcha']['#solved'] = TRUE;
     return;
   }
 
@@ -1994,7 +2030,7 @@ function mollom_validate_captcha(&$form, &$form_state) {
     return;
   }
   $data = array(
-    'id' => $form_state['mollom']['response']['captcha']['id'],
+    'id' => $form_state['values']['mollom']['captchaId'],
     'solution' => $form_state['values']['mollom']['captcha'],
     'authorIp' => $all_data['authorIp'],
   );
@@ -2004,7 +2040,7 @@ function mollom_validate_captcha(&$form, &$form_state) {
   if (isset($all_data['honeypot'])) {
     $data['honeypot'] = $all_data['honeypot'];
   }
-  $result = $form_state['mollom']['class']->checkCaptcha($data);
+  $result = mollom()->checkCaptcha($data);
   // Use all available data properties for log messages below.
   $data += $all_data;
 
@@ -2015,18 +2051,21 @@ function mollom_validate_captcha(&$form, &$form_state) {
 
   // Store the response for #submit handlers.
   $form_state['mollom']['response']['captcha'] = $result;
-  // Set form element values accordingly. Do not overwrite the entity ID with
-  // the contentId, nor a possibly existing captchaId.
+  // Set form values accordingly. Do not overwrite the entity ID.
+  // @todo Rename 'id' to 'entity_id'.
   $result['captchaId'] = $result['id'];
   unset($result['id']);
   $form_state['values']['mollom'] = array_merge($form_state['values']['mollom'], $result);
-  // #value has to be set manually to output it in case of a validation error,
-  // since this is not a element-level but a form-level validation handler.
+
+  // Ensure the latest CAPTCHA ID is output as value.
+  // form_set_value() is effectless, as this is not a element-level but a
+  // form-level validation handler.
   $form['mollom']['captchaId']['#value'] = $result['captchaId'];
 
   if (!empty($result['solved'])) {
     $form_state['mollom']['passed_captcha'] = TRUE;
     $form['mollom']['captcha']['#access'] = FALSE;
+    $form['mollom']['captcha']['#solved'] = TRUE;
 
     mollom_log(array(
       'message' => 'Correct CAPTCHA',
@@ -2045,11 +2084,10 @@ function mollom_validate_captcha(&$form, &$form_state) {
 }
 
 /**
- * Form element #pre_render callback for CAPTCHA element.
+ * #pre_render callback for #type 'mollom'.
  *
- * Conditionally alters the #type of the CAPTCHA form element into a 'hidden'
- * element if the response was correct. If it was not, then we empty the value
- * of the textfield to allow the user to re-enter a new one.
+ * - Hides the CAPTCHA if it is not required or the solution was correct.
+ * - Marks the CAPTCHA as required.
  *
  * This #pre_render trick is required, because form API validation does not
  * allow form validation handlers to alter the actual form structure. Both the
@@ -2096,6 +2134,23 @@ function mollom_pre_render_mollom($element) {
   // Store the Mollom form state.
   cache_set($form_state['mollom']['mollom_build_id'], $form_state['mollom'], 'cache_mollom', time() + 21600);
 
+  // If there is no CAPTCHA ID, then there is no CAPTCHA that can be displayed.
+  // If a CAPTCHA was solved, then the widget makes no sense either.
+  if (empty($element['captchaId']['#value']) || !empty($element['captcha']['#solved'])) {
+    $element['captcha']['#access'] = FALSE;
+  }
+  else {
+    // The form element cannot be marked as #required, since _form_validate()
+    // would throw an element validation error on an empty value otherwise,
+    // before the form-level validation handler is executed.
+    // #access cannot default to FALSE, since the $form may be cached, and
+    // Form API ignores user input for all elements that are not accessible.
+    $element['captcha']['#required'] = TRUE;
+  }
+
+  // UX: Empty the CAPTCHA field value, as the user has to re-enter a new one.
+  $element['captcha']['#value'] = '';
+
   return $element;
 }
 
@@ -2176,10 +2231,6 @@ function mollom_form_submit($form, &$form_state) {
 }
 
 /**
- * @} End of "defgroup mollom_form_api".
- */
-
-/**
  * Instantiates a new Mollom client.
  *
  * @param $class
@@ -2599,10 +2650,7 @@ function mollom_get_captcha(&$form_state) {
     if (!empty($form_state['mollom']['response']['content']['id'])) {
       $data['contentId'] = $form_state['mollom']['response']['content']['id'];
     }
-    // @todo $form_state may not contain a Mollom class when being called from
-    //   mollom_captcha_js() until that gets converted to #ajax framework.
-    $mollom = (isset($form_state['mollom']['class']) ? $form_state['mollom']['class'] : mollom());
-    $result = $mollom->createCaptcha($data);
+    $result = mollom()->createCaptcha($data);
 
     // Add a log message to prevent the request log from appearing without a
     // message on CAPTCHA-only protected forms.
@@ -2612,6 +2660,7 @@ function mollom_get_captcha(&$form_state) {
 
     if (is_array($result) && isset($result['url'])) {
       $url = $result['url'];
+      $form_state['mollom']['response'][$key] = $url;
       $form_state['mollom']['response']['captcha']['id'] = $result['id'];
     }
     else {
diff --git a/tests/mollom.test b/tests/mollom.test
index 1104ac2..af5a198 100644
--- a/tests/mollom.test
+++ b/tests/mollom.test
@@ -123,6 +123,9 @@ class MollomWebTestCase extends DrupalWebTestCase {
     // automatically create testing API keys.
     variable_set('mollom_testing_create_keys', $this->createKeys);
 
+    // Disable testing mode warnings.
+    variable_set('mollom_testing_mode_omit_warning', TRUE);
+
     // If not explicitly disabled by a test, setup and validate testing keys,
     // and create a default admin user.
     if (empty($this->disableDefaultSetup)) {
@@ -374,6 +377,34 @@ class MollomWebTestCase extends DrupalWebTestCase {
   }
 
   /**
+   * Saves a mollom_form entity to protect a given form with Mollom.
+   *
+   * @param string $form_id
+   *   The form id to protect.
+   * @param int $mode
+   *   The protection mode. Defaults to MOLLOM_MODE_ANALYSIS.
+   * @param array $values
+   *   (optional) An associative array of properties to additionally set on the
+   *   mollom_form entity.
+   *
+   * @return int
+   *   The save status, as returned by mollom_form_save().
+   */
+  protected function setProtection($form_id, $mode = MOLLOM_MODE_ANALYSIS, $values = array()) {
+    if (!$mollom_form = mollom_form_load($form_id)) {
+      $mollom_form = mollom_form_new($form_id);
+    }
+    $mollom_form['mode'] = $mode;
+    if ($values) {
+      foreach ($values as $property => $value) {
+        $mollom_form[$property] = $value;
+      }
+    }
+    $status = mollom_form_save($mollom_form);
+    return $status;
+  }
+
+  /**
    * Configure Mollom protection for a given form.
    *
    * @param $form_id
@@ -388,7 +419,7 @@ class MollomWebTestCase extends DrupalWebTestCase {
    *   (optional) An array of POST data to pass through to drupalPost() when
    *   configuring the form's protection.
    */
-  protected function setProtection($form_id, $mode = MOLLOM_MODE_ANALYSIS, $fields = NULL, $edit = array()) {
+  protected function setProtectionUI($form_id, $mode = MOLLOM_MODE_ANALYSIS, $fields = NULL, $edit = array()) {
     // Always start from overview page, also to make debugging easier.
     $this->drupalGet('admin/settings/mollom');
     // Determine whether the form is already protected.
@@ -919,6 +950,17 @@ class MollomWebTestCase extends DrupalWebTestCase {
       $rid,
     ));
   }
+
+  /**
+   * Enables aggressive page caching options to resemble reverse-proxies.
+   */
+  protected function enablePageCache() {
+    variable_set('cache', 1);
+    variable_set('page_cache_maximum_age', 180);
+    // A minimum cache lifetime causes cache_clear_all() to start a session.
+    //variable_set('cache_lifetime', 60);
+  }
+
 }
 
 /**
@@ -949,6 +991,9 @@ class MollomTestingModeTestCase extends MollomWebTestCase {
   function setUp() {
     parent::setUp(array('mollom', 'mollom_test'));
 
+    // Enable testing mode warnings.
+    variable_del('mollom_testing_mode_omit_warning');
+
     $this->admin_user = $this->drupalCreateUser(array(
       'access administration pages',
       'administer mollom',
@@ -962,7 +1007,7 @@ class MollomTestingModeTestCase extends MollomWebTestCase {
     $this->drupalLogin($this->admin_user);
 
     // Protect mollom_test_form.
-    $this->setProtection('mollom_test_form', MOLLOM_MODE_ANALYSIS);
+    $this->setProtectionUI('mollom_test_form', MOLLOM_MODE_ANALYSIS);
 
     // Setup production API keys. They must be retained.
     $publicKey = 'the-invalid-mollom-api-key-value';
@@ -1687,7 +1732,7 @@ class MollomBypassAccessTestCase extends MollomWebTestCase {
    */
   function testBypassAccess() {
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('comment_form');
+    $this->setProtectionUI('comment_form');
     $this->drupalLogout();
 
     $node = $this->drupalCreateNode(array('body' => 'node body', 'type' => 'story'));
@@ -1774,7 +1819,7 @@ class MollomFallbackModeTestCase extends MollomWebTestCase {
   function testBlock() {
     // Enable Mollom for the request password form.
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('user_pass', MOLLOM_MODE_CAPTCHA);
+    $this->setProtectionUI('user_pass', MOLLOM_MODE_CAPTCHA);
     $this->drupalLogout();
 
     // Set the fallback strategy to 'blocking mode'.
@@ -1802,7 +1847,7 @@ class MollomFallbackModeTestCase extends MollomWebTestCase {
   function testAccept() {
     // Enable Mollom for the request password form.
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('user_pass', MOLLOM_MODE_CAPTCHA);
+    $this->setProtectionUI('user_pass', MOLLOM_MODE_CAPTCHA);
     $this->drupalLogout();
 
     // Set the fallback strategy to 'accept mode'.
@@ -1822,7 +1867,7 @@ class MollomFallbackModeTestCase extends MollomWebTestCase {
    */
   function testFailover() {
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('user_pass', MOLLOM_MODE_CAPTCHA);
+    $this->setProtectionUI('user_pass', MOLLOM_MODE_CAPTCHA);
     $this->drupalLogout();
 
     // Set the fallback strategy to 'blocking mode', so that if the failover
@@ -2088,7 +2133,7 @@ class MollomProfanityTestCase extends MollomWebTestCase {
       'mollom[checks][spam]' => TRUE,
       'mollom[checks][profanity]' => FALSE,
     );
-    $this->setProtection('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, $edit_config);
+    $this->setProtectionUI('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, $edit_config);
     $this->drupalLogout();
 
     // Assert that the profanity filter is disabled.
@@ -2106,7 +2151,7 @@ class MollomProfanityTestCase extends MollomWebTestCase {
       'mollom[checks][spam]' => FALSE,
       'mollom[checks][profanity]' => TRUE,
     );
-    $this->setProtection('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, $edit_config);
+    $this->setProtectionUI('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, $edit_config);
     $this->drupalLogout();
 
     // Verify that the profanity filter now blocks this content.
@@ -2132,7 +2177,7 @@ class MollomProfanityTestCase extends MollomWebTestCase {
       'mollom[checks][profanity]' => TRUE,
       'mollom[checks][spam]' => TRUE,
     );
-    $this->setProtection('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, $edit_config);
+    $this->setProtectionUI('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, $edit_config);
     $this->drupalLogout();
 
     // Sequence: Post profanity (ham), remove profanity (still ham), and expect
@@ -2464,7 +2509,7 @@ class MollomFormConfigurationTestCase extends MollomWebTestCase {
   function testFormAlter() {
     // Enable CAPTCHA-only protection for request user password form.
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('user_pass', MOLLOM_MODE_CAPTCHA);
+    $this->setProtectionUI('user_pass', MOLLOM_MODE_CAPTCHA);
     $this->drupalLogout();
 
     // Verify regular form protection.
@@ -2504,7 +2549,7 @@ class MollomUserFormsTestCase extends MollomWebTestCase {
     // Verify that the protection mode defaults to CAPTCHA.
     $this->drupalGet('admin/settings/mollom/add/user_pass');
     $this->assertFieldByName('mollom[mode]', MOLLOM_MODE_CAPTCHA);
-    $this->setProtection('user_pass', MOLLOM_MODE_CAPTCHA);
+    $this->setProtectionUI('user_pass', MOLLOM_MODE_CAPTCHA);
     $this->drupalLogout();
 
     // Create a new user.
@@ -2532,7 +2577,7 @@ class MollomUserFormsTestCase extends MollomWebTestCase {
     // Verify that the protection mode defaults to CAPTCHA.
     $this->drupalGet('admin/settings/mollom/add/user_register');
     $this->assertFieldByName('mollom[mode]', MOLLOM_MODE_CAPTCHA);
-    $this->setProtection('user_register', MOLLOM_MODE_CAPTCHA);
+    $this->setProtectionUI('user_register', MOLLOM_MODE_CAPTCHA);
     $this->drupalLogout();
 
     // Retrieve initial count of registered users.
@@ -2590,7 +2635,7 @@ class MollomUserFormsTestCase extends MollomWebTestCase {
     variable_set('user_register', 1);
 
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('user_register', MOLLOM_MODE_ANALYSIS);
+    $this->setProtectionUI('user_register', MOLLOM_MODE_ANALYSIS);
     $this->drupalLogout();
 
     // Retrieve initial count of registered users.
@@ -2706,7 +2751,7 @@ class MollomProfileFormsTestCase extends MollomWebTestCase {
     }
 
     // Enable text analysis protection for user registration form.
-    $this->setProtection('user_register', MOLLOM_MODE_ANALYSIS);
+    $this->setProtectionUI('user_register', MOLLOM_MODE_ANALYSIS);
     $this->drupalLogout();
 
     // Test each supported field separately.
@@ -2763,7 +2808,7 @@ class MollomNodeFormTestCase extends MollomWebTestCase {
   function testData() {
     // Enable Mollom CAPTCHA protection for Article nodes.
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('story_node_form', MOLLOM_MODE_CAPTCHA);
+    $this->setProtectionUI('story_node_form', MOLLOM_MODE_CAPTCHA);
     $this->drupalLogout();
 
     // Login and submit a node.
@@ -2785,7 +2830,7 @@ class MollomNodeFormTestCase extends MollomWebTestCase {
    */
   function testRetain() {
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('story_node_form', MOLLOM_MODE_ANALYSIS, NULL, array(
+    $this->setProtectionUI('story_node_form', MOLLOM_MODE_ANALYSIS, NULL, array(
       'mollom[checks][profanity]' => TRUE,
       'mollom[discard]' => 0,
     ));
@@ -2849,7 +2894,7 @@ class MollomCommentFormTestCase extends MollomWebTestCase {
   function testCaptchaProtectedCommentForm() {
     // Enable Mollom CAPTCHA protection for comments.
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('comment_form', MOLLOM_MODE_CAPTCHA);
+    $this->setProtectionUI('comment_form', MOLLOM_MODE_CAPTCHA);
     $this->drupalLogout();
 
     // Request the comment reply form. There should be a CAPTCHA form.
@@ -2863,7 +2908,7 @@ class MollomCommentFormTestCase extends MollomWebTestCase {
     // required field.
     $this->postIncorrectCaptcha(NULL, array(), t('Preview'));
     $this->assertText(t('Comment field is required.'));
-    $this->assertResponseIDInForm('captchaId', TRUE);
+    $this->assertResponseIDInForm('captchaId');
     $this->assertNoPrivacyLink();
 
     // Try to submit a correct answer for the CAPTCHA, still without required
@@ -2886,7 +2931,7 @@ class MollomCommentFormTestCase extends MollomWebTestCase {
   function testTextAnalysisProtectedCommentForm() {
     // Enable Mollom text-classification for comments.
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('comment_form');
+    $this->setProtectionUI('comment_form');
     $this->drupalLogout();
 
     // Request the comment reply form.  Initially, there should be no CAPTCHA.
@@ -3008,7 +3053,7 @@ class MollomContactFormTestCase extends MollomWebTestCase {
   function testProtectContactUserForm() {
     // Enable Mollom for the contact form.
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('contact_mail_user');
+    $this->setProtectionUI('contact_mail_user');
     $this->drupalLogout();
 
     $this->drupalLogin($this->web_user);
@@ -3038,7 +3083,7 @@ class MollomContactFormTestCase extends MollomWebTestCase {
   function testProtectContactSiteForm() {
     // Enable Mollom for the contact form.
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('contact_mail_page');
+    $this->setProtectionUI('contact_mail_page');
     $this->drupalLogout();
 
     // Add some fields to the contact form so that it is active.
@@ -3313,7 +3358,7 @@ class MollomDataTestCase extends MollomWebTestCase {
    */
   function testFormButtonValues() {
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('mollom_test_form');
+    $this->setProtectionUI('mollom_test_form');
     $this->drupalLogout();
 
     // Verify that neither the "Submit" nor the "Add" button value is contained
@@ -3332,7 +3377,7 @@ class MollomDataTestCase extends MollomWebTestCase {
    */
   function testAnalysis() {
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('comment_form');
+    $this->setProtectionUI('comment_form');
 
     // Make comment preview optional.
     $edit = array(
@@ -3442,7 +3487,7 @@ class MollomDataTestCase extends MollomWebTestCase {
   function testHoneypot() {
     // Enable protection for mollom_test_form.
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('mollom_test_form');
+    $this->setProtectionUI('mollom_test_form');
     $this->drupalLogout();
 
     // Verify that the hidden honeypot field is output.
@@ -3472,7 +3517,7 @@ class MollomDataTestCase extends MollomWebTestCase {
 
     // Change form protection to CAPTCHA only.
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('mollom_test_form', MOLLOM_MODE_CAPTCHA);
+    $this->setProtectionUI('mollom_test_form', MOLLOM_MODE_CAPTCHA);
     $this->drupalLogout();
     $this->resetServerRecords();
 
@@ -3508,7 +3553,7 @@ class MollomDataTestCase extends MollomWebTestCase {
   function testPostIdMapping() {
     // Enable protection for mollom_test_form.
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('mollom_test_form');
+    $this->setProtectionUI('mollom_test_form');
     $this->drupalLogout();
 
     // Submit a mollom_test thingy.
@@ -3690,7 +3735,7 @@ class MollomAnalysisTestCase extends MollomWebTestCase {
    */
   function testUnsureBinary() {
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, array(
+    $this->setProtectionUI('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, array(
       'mollom[unsure]' => 'binary',
     ));
     $this->drupalLogout();
@@ -3739,12 +3784,12 @@ class MollomAnalysisTestCase extends MollomWebTestCase {
     $this->drupalLogin($this->admin_user);
     // Verify that mollom_basic_elements_test_form cannot be configured to put
     // posts into moderation queue.
-    $this->setProtection('mollom_basic_elements_test_form');
+    $this->setProtectionUI('mollom_basic_elements_test_form');
     $this->drupalGet('admin/settings/mollom/manage/mollom_basic_elements_test_form');
     $this->assertNoFieldByName('mollom[unsure]');
 
     // Configure mollom_test_form to retain unsure posts.
-    $this->setProtection('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, array(
+    $this->setProtectionUI('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, array(
       'mollom[unsure]' => 'moderate',
     ));
     $this->drupalLogout();
@@ -3800,12 +3845,12 @@ class MollomAnalysisTestCase extends MollomWebTestCase {
     $this->drupalLogin($this->admin_user);
     // Verify that mollom_basic_test_form cannot be configured to put posts into
     // moderation queue.
-    $this->setProtection('mollom_basic_elements_test_form');
+    $this->setProtectionUI('mollom_basic_elements_test_form');
     $this->drupalGet('admin/settings/mollom/manage/mollom_basic_elements_test_form');
     $this->assertNoFieldByName('mollom[discard]');
 
     // Configure mollom_test_form to accept bad posts.
-    $this->setProtection('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, array(
+    $this->setProtectionUI('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, array(
       'mollom[checks][profanity]' => TRUE,
       'mollom[discard]' => 0,
     ));
@@ -3905,6 +3950,63 @@ class MollomAnalysisTestCase extends MollomWebTestCase {
 }
 
 /**
+ * Tests basic text analysis functionality with enabled caching.
+ */
+class MollomAnalysisPageCacheTestCase extends MollomWebTestCase {
+
+  protected $disableDefaultSetup = TRUE;
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Text analysis with caching',
+      'description' => 'Tests basic text analysis functionality with enabled caching.',
+      'group' => 'Mollom',
+    );
+  }
+
+  function setUp() {
+    parent::setUp(array('mollom', 'mollom_test'));
+    $this->setKeys();
+    $this->assertValidKeys();
+    $this->enablePageCache();
+  }
+
+  /**
+   * Tests text analysis.
+   */
+  function testAnalysis() {
+    $this->setProtection('mollom_test_form');
+    // Prime the form + page cache.
+    $this->drupalGet('mollom-test/form');
+    $this->assertText('Views: 1');
+    $this->drupalGet('mollom-test/form');
+    $this->assertText('Views: 1');
+    $this->assertUnsureSubmit(NULL, array('title'), array(), 'Submit');
+
+    $this->drupalGet('mollom-test/form');
+    $this->assertText('Views: 1');
+    $this->assertUnsureSubmit(NULL, array('title'), array(), 'Submit');
+
+    $this->drupalGet('mollom-test/form');
+    $this->assertText('Views: 1');
+    $this->assertSpamSubmit(NULL, array('title'), array(), 'Submit');
+
+    $this->drupalGet('mollom-test/form');
+    $this->assertText('Views: 1');
+    $this->assertHamSubmit(NULL, array('title'), array(), 'Submit');
+  }
+
+  /**
+   * Tests text analysis with additionally enabled Form API cache.
+   */
+  function testAnalysisFormCache() {
+    variable_set('mollom_test.form.cache', TRUE);
+    $this->testAnalysis();
+  }
+
+}
+
+/**
  * Tests CAPTCHA functionality.
  */
 class MollomCaptchaTestCase extends MollomWebTestCase {
@@ -3933,7 +4035,7 @@ class MollomCaptchaTestCase extends MollomWebTestCase {
     $this->web_user = $this->drupalCreateUser(array('access content'));
 
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('mollom_test_form', MOLLOM_MODE_CAPTCHA);
+    $this->setProtectionUI('mollom_test_form', MOLLOM_MODE_CAPTCHA);
     $this->drupalLogout();
   }
 
@@ -4073,7 +4175,7 @@ class MollomReportTestCase extends MollomWebTestCase {
    */
   function testReportComment() {
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('comment_form');
+    $this->setProtectionUI('comment_form');
     $this->drupalLogout();
 
     $this->node = $this->drupalCreateNode(array('type' => 'story'));
@@ -4111,7 +4213,7 @@ class MollomReportTestCase extends MollomWebTestCase {
    */
   function testMassReportComments() {
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('comment_form');
+    $this->setProtectionUI('comment_form');
     $this->drupalLogout();
 
     $this->node = $this->drupalCreateNode(array('type' => 'story'));
@@ -4179,7 +4281,7 @@ class MollomModerateUserTestCase extends MollomWebTestCase {
     parent::setUp();
 
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('user_register', MOLLOM_MODE_CAPTCHA);
+    $this->setProtectionUI('user_register', MOLLOM_MODE_CAPTCHA);
     $this->drupalLogout();
 
     // Allow visitors to register.
@@ -4262,7 +4364,7 @@ class MollomModerationIntegrationTestCase extends MollomWebTestCase {
     parent::setUp(array('mollom_test'));
 
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, array(
+    $this->setProtectionUI('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, array(
       'mollom[discard]' => 0,
       'mollom[moderation]' => 1,
     ));
@@ -4431,7 +4533,7 @@ class MollomModerationIntegrationTestCase extends MollomWebTestCase {
 
     // Test no Mollom moderation access with disabled integration.
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, array(
+    $this->setProtectionUI('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, array(
       'mollom[moderation]' => FALSE,
     ));
 
@@ -4441,7 +4543,7 @@ class MollomModerationIntegrationTestCase extends MollomWebTestCase {
     $record = mollom_test_load($data->id);
     $this->assertTrue(!empty($record) && $record->status == 0, 'Test post still exists.');
 
-    $this->setProtection('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, array(
+    $this->setProtectionUI('mollom_test_form', MOLLOM_MODE_ANALYSIS, NULL, array(
       'mollom[moderation]' => 1,
     ));
     $this->drupalLogout();
@@ -4564,12 +4666,12 @@ class MollomModerationIntegrationTestCase extends MollomWebTestCase {
     $this->userRoleGrantPermissions(DRUPAL_AUTHENTICATED_RID, array('create article content', 'view own unpublished content', 'access content'));
 
     $this->drupalLogin($this->admin_user);
-    $this->setProtection('user_register', MOLLOM_MODE_ANALYSIS, NULL, array(
+    $this->setProtectionUI('user_register', MOLLOM_MODE_ANALYSIS, NULL, array(
       //'mollom[unsure]' => 'moderate',
       //'mollom[discard]' => 0,
       'mollom[moderation]' => 1,
     ));
-    $this->setProtection('article_node_form', MOLLOM_MODE_ANALYSIS, NULL, array(
+    $this->setProtectionUI('article_node_form', MOLLOM_MODE_ANALYSIS, NULL, array(
       'mollom[unsure]' => 'moderate',
       'mollom[discard]' => 0,
       'mollom[moderation]' => 1,
diff --git a/tests/mollom_test.install b/tests/mollom_test.install
index 6222088..0903e05 100644
--- a/tests/mollom_test.install
+++ b/tests/mollom_test.install
@@ -54,6 +54,6 @@ function mollom_test_install() {
  */
 function mollom_test_uninstall() {
   drupal_uninstall_schema('mollom_test');
-  db_query("DELETE FROM {variables} WHERE name LIKE 'mollom_test.%'");
+  db_query("DELETE FROM {variable} WHERE name LIKE 'mollom_test.%'");
 }
 
diff --git a/tests/mollom_test.module b/tests/mollom_test.module
index 2954ff1..6838317 100644
--- a/tests/mollom_test.module
+++ b/tests/mollom_test.module
@@ -21,6 +21,11 @@ function mollom_test_menu() {
     'page arguments' => array('mollom_test_delete_form', 2),
     'access callback' => TRUE,
   );
+  $items['mollom-test/form/views/reset'] = array(
+    'page callback' => 'mollom_test_views_reset',
+    'access callback' => TRUE,
+    'type' => MENU_CALLBACK,
+  );
   return $items;
 }
 
@@ -90,53 +95,81 @@ function mollom_test_mollom_form_info($form_id) {
 }
 
 /**
+ * Page callback; Resets the mollom_test_form() [page] view counter.
+ */
+function mollom_test_views_reset() {
+  variable_del('mollom_test.form.views');
+  cache_clear_all();
+  drupal_goto();
+}
+
+/**
  * Form builder for Mollom test form.
  */
 function mollom_test_form(&$form_state, $mid = NULL) {
-  // Drupal 6 defaults 'storage' to NULL.
-  if (!isset($form_state['storage'])) {
-    $form_state['storage'] = array();
+  if (!empty($form_state['storage'])) {
+    $values = $form_state['storage'];
   }
-  if (isset($mid) && ($record = mollom_test_load($mid))) {
-    $form_state['storage'] = (array) $record;
+  else {
+    $values = array();
+    if (isset($mid) && ($record = mollom_test_load($mid))) {
+      $values = (array) $record;
+    }
+    $values += array(
+      'mid' => $mid,
+      'title' => '',
+      'body' => '',
+      'exclude' => '',
+      'parent' => array('child' => ''),
+      'field' => array(),
+      'status' => 1,
+    );
   }
-  $form_state['storage'] += array(
-    'mid' => $mid,
-    'title' => '',
-    'body' => '',
-    'exclude' => '',
-    'parent' => array('child' => ''),
-    'field' => array(),
-    'status' => 1,
-  );
   // Always add an empty field the user can submit.
-  $form_state['storage']['field']['new'] = '';
+  $values['field']['new'] = '';
+
+  // Output a page view counter for page/form cache testing purposes.
+  $count = variable_get('mollom_test.form.views', 1);
+  $reset_link = l('Reset', 'mollom-test/form/views/reset', array('query' => drupal_get_destination()));
+  $form['views'] = array(
+    '#value' => '<p>' . 'Views: ' . $count++ . ' ' . $reset_link . '</p>',
+  );
+  variable_set('mollom_test.form.views', $count);
+
+  // Conditionally enable form caching.
+  if (variable_get('mollom_test.form.cache', FALSE)) {
+    // D6 auto-enables form caching and rebuilding if 'storage' is non-empty.
+    if (!isset($form_state['storage'])) {
+      $form_state['storage'] = $values;
+    }
+    $form_state['cache'] = TRUE;
+  }
 
   $form['#tree'] = TRUE;
   $form['mid'] = array(
     '#type' => 'hidden',
-    '#value' => $form_state['storage']['mid'],
+    '#value' => $values['mid'],
   );
   $form['title'] = array(
     '#type' => 'textfield',
     '#title' => 'Title',
-    '#default_value' => $form_state['storage']['title'],
+    '#default_value' => $values['title'],
     '#required' => TRUE,
   );
   $form['body'] = array(
     '#type' => 'textfield',
     '#title' => 'Body',
-    '#default_value' => $form_state['storage']['body'],
+    '#default_value' => $values['body'],
   );
   $form['exclude'] = array(
     '#type' => 'textfield',
     '#title' => 'Some other field',
-    '#default_value' => $form_state['storage']['exclude'],
+    '#default_value' => $values['exclude'],
   );
   $form['parent']['child'] = array(
     '#type' => 'textfield',
     '#title' => 'Nested element',
-    '#default_value' => $form_state['storage']['parent']['child'],
+    '#default_value' => $values['parent']['child'],
   );
 
   $form['field'] = array(
@@ -144,7 +177,7 @@ function mollom_test_form(&$form_state, $mid = NULL) {
     '#title' => 'Field',
   );
   $weight = 0;
-  foreach ($form_state['storage']['field'] as $delta => $value) {
+  foreach ($values['field'] as $delta => $value) {
     $form['field'][$delta] = array(
       '#type' => 'textfield',
       '#title' => 'Field ' . $delta,
@@ -163,7 +196,7 @@ function mollom_test_form(&$form_state, $mid = NULL) {
   $form['status'] = array(
     '#type' => 'checkbox',
     '#title' => 'Published',
-    '#default_value' => $form_state['storage']['status'],
+    '#default_value' => $values['status'],
     // For simplicity, re-use Mollom module's administration permission.
     '#access' => user_access('administer mollom'),
   );
diff --git a/tests/mollom_test_server.module b/tests/mollom_test_server.module
index fa217ec..de38363 100644
--- a/tests/mollom_test_server.module
+++ b/tests/mollom_test_server.module
@@ -108,6 +108,9 @@ function mollom_test_server_rest_deliver($callback) {
   array_shift($args);
   $page_callback_result = call_user_func_array($callback, $args);
 
+  // All fake-server responses are not cached.
+  $GLOBALS['conf']['cache'] = FALSE;
+
   drupal_set_header('Content-Type: application/xml; charset=utf-8');
 
   $xml = new DOMDocument('1.0', 'utf-8');
-- 
1.7.11.msysgit.1


From 1145218ad6870e0aac674e5b4ae5a3d6f6203a48 Mon Sep 17 00:00:00 2001
From: sun <sun@unleashedmind.com>
Date: Sat, 30 Mar 2013 23:47:58 +0100
Subject: [PATCH 2/3] Fixed audio CAPTCHAs cannot always be solved.

---
 mollom.js        | 4 ++--
 mollom.pages.inc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mollom.js b/mollom.js
index 7c150ac..01032a9 100644
--- a/mollom.js
+++ b/mollom.js
@@ -28,7 +28,7 @@ function getMollomCaptcha() {
   var context = $(this).parents('form');
 
   // Extract the form build ID and Mollom content ID from the form.
-  var formBuildId = $('input[name="form_build_id"]', context).val();
+  var formBuildId = $('input[name="mollom[mollom_build_id]"]', context).val();
   var mollomContentId = $('input.mollom-content-id', context).val();
 
   var path = 'mollom/captcha/' + newCaptchaType + '/' + formBuildId;
@@ -48,7 +48,7 @@ function getMollomCaptcha() {
       // Inject new CAPTCHA.
       $('.mollom-captcha-content', context).parent().html(data.content);
       // Update CAPTCHA ID.
-      $('input.mollom-captcha-id', context).val(data.captchaId);
+      $('input[name="mollom[captchaId]"]', context).val(data.captchaId);
       // Add an onclick-event handler for the new link.
       Drupal.attachBehaviors(context);
       // Focus on the CAPTCHA input.
diff --git a/mollom.pages.inc b/mollom.pages.inc
index 01af4e6..f733f1f 100644
--- a/mollom.pages.inc
+++ b/mollom.pages.inc
@@ -50,12 +50,12 @@ function mollom_captcha_js($type, $mollom_build_id, $contentId = NULL) {
   if (!empty($form_state['mollom']['response']['captcha']['id'])) {
     // Update cached session id in the cached $form_state.
     if ($cache) {
-      cache_set($mollom_build_id, $form_state['mollom'], 'cache_mollom', time() + 21600);
+      cache_set($mollom_build_id, $form_state['mollom'], 'cache_mollom', $cache->expire);
     }
     // Return new content and CAPTCHA ID via JSON.
     $data = array(
-      'content' => $captcha,
       'captchaId' => $form_state['mollom']['response']['captcha']['id'],
+      'content' => $captcha,
     );
     drupal_json($data);
   }
-- 
1.7.11.msysgit.1


From 19c4fcc60bcade6e93bc4e66e3ababe3e577928a Mon Sep 17 00:00:00 2001
From: sun <sun@unleashedmind.com>
Date: Sat, 30 Mar 2013 23:48:47 +0100
Subject: [PATCH 3/3] Fixed {cache_mollom} records are only expired on cron
 runs.

---
 mollom.module | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mollom.module b/mollom.module
index 40723d9..e91a6d1 100644
--- a/mollom.module
+++ b/mollom.module
@@ -2228,6 +2228,8 @@ function mollom_form_submit($form, &$form_state) {
       $form_state['mollom']['data'] = mollom_data_save($data);
     }
   }
+  // Prune expired {cache_mollom} records on every successful form submission.
+  cache_clear_all(NULL, 'cache_mollom');
 }
 
 /**
-- 
1.7.11.msysgit.1