@data' => array('@data' => $data), + 'Result:
@result' => array('@result' => $result), + ), WATCHDOG_INFO); + break; + + case MOLLOM_ANALYSIS_SPAM: + $form_state['mollom']['require_captcha'] = FALSE; + form_set_error('mollom', t('Your submission has triggered the spam filter and will not be accepted.')); + _mollom_watchdog(array( + 'Spam: %teaser' => array('%teaser' => $teaser), + 'Data:
@data' => array('@data' => $data), + 'Result:
@result' => array('@result' => $result), + )); + break; - switch ($result['spam']) { - case MOLLOM_ANALYSIS_HAM: - $form_state['mollom']['require_captcha'] = FALSE; - _mollom_watchdog(array( - 'Ham: %teaser' => array('%teaser' => $teaser), - 'Data:
@data' => array('@data' => $data), - 'Result:
@result' => array('@result' => $result), - ), WATCHDOG_INFO); - break; - - case MOLLOM_ANALYSIS_SPAM: - $form_state['mollom']['require_captcha'] = FALSE; - form_set_error('mollom', t('Your submission has triggered the spam filter and will not be accepted.')); - _mollom_watchdog(array( - 'Spam: %teaser' => array('%teaser' => $teaser), - 'Data:
@data' => array('@data' => $data), - 'Result:
@result' => array('@result' => $result), - )); - break; + case MOLLOM_ANALYSIS_UNSURE: + _mollom_watchdog(array( + 'Unsure: %teaser' => array('%teaser' => $teaser), + 'Data:
@data' => array('@data' => $data), + 'Result:
@result' => array('@result' => $result), + ), WATCHDOG_INFO); + + // 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.')); + } + break; - case MOLLOM_ANALYSIS_UNSURE: - $form_state['mollom']['require_captcha'] = TRUE; - form_set_error('mollom][captcha', t('To complete this form, please complete the word verification below.')); - _mollom_watchdog(array( - 'Unsure: %teaser' => array('%teaser' => $teaser), - 'Data:
@data' => array('@data' => $data), - 'Result:
@result' => array('@result' => $result), - ), WATCHDOG_INFO); - break; + case MOLLOM_ANALYSIS_UNKNOWN: + default: + // If we end up here, something went totally wrong. + _mollom_fallback(); + break; + } } } /** - * Form validation handler for CAPTCHA form element. + * Form validation handler for Mollom's CAPTCHA form element. + * + * Validates whether a CAPTCHA was solved correctly. A form may contain a + * CAPTCHA, if it was configured to be protected by a CAPTCHA only, or when the + * text analysis result is "unsure". */ function mollom_validate_captcha(&$form, &$form_state) { - if (!$form_state['mollom']['require_captcha']) { - return; - } - - // When re-validating a form that already passed a CAPTCHA in a previous - // request, we need to re-populate our global variable for mollom_data_save(). - if ($form_state['mollom']['passed_captcha']) { + // 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']) { return; } // Nothing to validate if there is no value. + // @todo The field is #required, so Form API should already handle this. Add a + // test to be sure and remove this code. if (empty($form_state['values']['mollom']['captcha'])) { form_set_error('mollom][captcha', t('The word verification field is required.')); return; @@ -1444,11 +1512,16 @@ function mollom_validate_captcha(&$form, // Use all available data properties for log messages below. $data += $all_data; + // Invoke fallback behavior upon a server error; communication errors are + // handled by mollom() already. A server error may happen in case of an + // expired or invalid session_id. + if ($result === MOLLOM_ERROR) { + return _mollom_fallback(); + } + // Store the response for #submit handlers. $form_state['mollom']['response']['captcha'] = $result; - // Explictly check for TRUE, since mollom.checkCaptcha() can also return an - // error message (e.g. expired or invalid session_id). if ($result === TRUE) { $form_state['mollom']['passed_captcha'] = TRUE; @@ -1556,8 +1629,9 @@ function mollom_form_submit($form, &$for if (!empty($form_state['mollom']['entity']) && isset($form_state['mollom']['mapping']['post_id'])) { // For new entities, the entity's form submit handler will have added the // new entity id value into $form_state['values'], so we need to rebuild the - // data mapping. - $data = mollom_form_get_values($form_state['values'], $form_state['mollom']['enabled_fields'], $form_state['mollom']['mapping']); + // data mapping. We do not care for the actual fields, only for the value of + // the mapped post_id. + $data = mollom_form_get_values($form_state['values'], array(), $form_state['mollom']['mapping']); // We only consider non-empty and non-zero values as valid entity ids. if (!empty($data['post_id'])) { mollom_data_save($form_state['mollom']['entity'], $data['post_id']); @@ -2031,8 +2105,7 @@ function mollom_mail_add_report_link(&$m */ function node_mollom_form_list() { $forms = array(); - $types = node_get_types('types'); - foreach ($types as $type) { + foreach (node_get_types('types') as $type) { $form_id = $type->type . '_node_form'; $forms[$form_id] = array( 'title' => t('@name form', array('@name' => $type->name)), @@ -2053,10 +2126,8 @@ function node_mollom_form_info($form_id) $type = node_get_types('type', $nodetype); $form_info = array( - 'title' => t('@name form', array('@name' => $type->name)), // @todo This is incompatible with node access. 'bypass access' => array('administer nodes', 'edit any ' . $type->type . ' content'), - 'entity' => 'node', 'bundle' => $type->type, 'elements' => array(), 'mapping' => array( @@ -2073,11 +2144,10 @@ function node_mollom_form_info($form_id) $form_info['elements']['body'] = check_plain($type->body_label); } - // Add CCK fields by default. + // Add text fields. if (module_exists('content')) { $content_info = content_types($type->type); foreach ($content_info['fields'] as $field_name => $field) { - // We only consider text fields for text analysis. if ($field['type'] == 'text') { $form_info['elements'][$field_name] = check_plain(t($field['widget']['label'])); } @@ -2156,10 +2226,8 @@ function comment_mollom_form_list() { */ function comment_mollom_form_info($form_id) { $form_info = array( - 'title' => t('Comment form'), 'mode' => MOLLOM_MODE_ANALYSIS, 'bypass access' => array('administer comments'), - 'entity' => 'comment', 'elements' => array( 'subject' => t('Subject'), 'comment' => t('Comment'), @@ -2299,10 +2367,8 @@ function user_mollom_form_info($form_id) switch ($form_id) { case 'user_register': $form_info = array( - 'title' => t('User registration form'), 'mode' => MOLLOM_MODE_CAPTCHA, 'bypass access' => array('administer users'), - 'entity' => 'user', 'mapping' => array( 'post_id' => 'uid', 'author_name' => 'name', @@ -2313,10 +2379,8 @@ function user_mollom_form_info($form_id) case 'user_pass': $form_info = array( - 'title' => t('User password request form'), 'mode' => MOLLOM_MODE_CAPTCHA, 'bypass access' => array('administer users'), - 'entity' => 'user', 'mapping' => array( 'post_id' => 'uid', 'author_name' => 'name', @@ -2357,7 +2421,6 @@ function contact_mollom_form_info($form_ switch ($form_id) { case 'contact_mail_page': $form_info = array( - 'title' => t('Site-wide contact form'), 'mode' => MOLLOM_MODE_ANALYSIS, 'bypass access' => array('administer site-wide contact form'), 'mail ids' => array('contact_page_mail'), @@ -2375,7 +2438,6 @@ function contact_mollom_form_info($form_ case 'contact_mail_user': $form_info = array( - 'title' => t('User contact form'), 'mode' => MOLLOM_MODE_ANALYSIS, 'bypass access' => array('administer users'), 'mail ids' => array('contact_user_mail'), Index: tests/mollom.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/mollom/tests/mollom.test,v retrieving revision 1.1.2.57 diff -u -p -r1.1.2.57 mollom.test --- tests/mollom.test 12 Sep 2010 18:08:04 -0000 1.1.2.57 +++ tests/mollom.test 12 Sep 2010 20:19:00 -0000 @@ -264,9 +264,14 @@ class MollomWebTestCase extends DrupalWe * @param $mode * The Mollom protection mode for the form. * @param $fields - * (optional) A list of form elements to enable for text analysis. + * (optional) A list of form elements to enable for text analysis. If + * omitted and the form registers individual elements, all fields are + * enabled by default. + * @param $edit + * (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) { + protected function setProtection($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. @@ -274,40 +279,37 @@ class MollomWebTestCase extends DrupalWe // Add a new form. if (!$exists) { $this->clickLink(t('Add form')); - $edit = array( + $add_form_edit = array( 'mollom[form_id]' => $form_id, ); - $this->drupalPost(NULL, $edit, t('Next')); + $this->drupalPost(NULL, $add_form_edit, t('Next')); } // Edit an existing form. else { $this->drupalGet('admin/settings/mollom/manage/' . $form_id); } - $edit = array( + $edit += array( 'mollom[mode]' => $mode, ); - // Explicitly enable the passed fields, if $fields were passed. - if (isset($fields)) { - foreach ($fields as $field) { - $edit['mollom[enabled_fields][' . rawurlencode($field) . ']'] = TRUE; - } - } + // Process the enabled fields. $form_list = mollom_form_list(); $form_info = mollom_form_info($form_id, $form_list[$form_id]['module']); + if (!empty($form_info['elements'])) { + $edit += array( + 'mollom[checks][spam]' => TRUE, + ); + } foreach (array_keys($form_info['elements']) as $field) { - // Due to SimpleTest's form handling of checkboxes, we need to disable all - // remaining checkboxes manually. - if (isset($fields)) { - if (!isset($edit[$field])) { - $edit['mollom[enabled_fields][' . rawurlencode($field) . ']'] = FALSE; - } + if (!isset($fields) || in_array($field, $fields)) { + // If the user specified all fields by default or to include this + // field, set its checkbox value to TRUE. + $edit['mollom[enabled_fields][' . rawurlencode($field) . ']'] = TRUE; } - // If no $fields were passed, enable all elements exposed by the - // implementation. else { - $edit['mollom[enabled_fields][' . rawurlencode($field) . ']'] = TRUE; + // Otherwise set the field's checkbox value to FALSE. + $edit['mollom[enabled_fields][' . rawurlencode($field) . ']'] = FALSE; } } $this->drupalPost(NULL, $edit, t('Save')); @@ -545,6 +547,7 @@ class MollomWebTestCase extends DrupalWe * (optional) The XML-RPC method name to retrieve submitted values from. * Defaults to 'mollom.checkContent'. * + * @see MollomWebTestCase::resetServerRecords() * @see mollom_test_xmlrpc() */ protected function getServerRecord($method = 'mollom.checkContent') { @@ -562,6 +565,26 @@ class MollomWebTestCase extends DrupalWe } /** + * Resets recorded XML-RPC values. + * + * @param $method + * (optional) The XML-RPC method name to reset records of. Defaults to + * 'mollom.checkContent'. + * + * @see MollomWebTestCase::getServerRecord() + * @see mollom_test_xmlrpc() + */ + protected function resetServerRecords($method = 'mollom.checkContent') { + // Map the XML-RPC method name to the corresponding function callback name. + drupal_load('module', 'mollom_test'); + $method_function_map = mollom_test_xmlrpc(); + $function = $method_function_map[$method]; + + // Delete the variable. + variable_del($function); + } + + /** * Wraps drupalGet() for additional watchdog message assertion. * * @param $options @@ -817,11 +840,14 @@ class MollomResponseTestCase extends Mol ); // Ensure proper response for 'ham' submissions. + // By default (i.e., omitting 'checks') we expect spam and quality checking + // only. $data['post_body'] = 'ham'; $result = mollom('mollom.checkContent', $data); $this->assertMollomWatchdogMessages(); $this->assertSame('spam', $result['spam'], MOLLOM_ANALYSIS_HAM); $this->assertSame('quality', $result['quality'], 1); + $this->assertTrue(!isset($result['profanity']), 'profanity not returned.'); $session_id = $this->assertSessionID($result['session_id']); // Ensure proper response for 'spam' submissions, re-using session_id. @@ -831,6 +857,7 @@ class MollomResponseTestCase extends Mol $this->assertMollomWatchdogMessages(); $this->assertSame('spam', $result['spam'], MOLLOM_ANALYSIS_SPAM); $this->assertSame('quality', $result['quality'], 0); + $this->assertTrue(!isset($result['profanity']), 'profanity not returned.'); $session_id = $this->assertSessionID($result['session_id']); // Ensure proper response for 'unsure' submissions, re-using session_id. @@ -840,10 +867,98 @@ class MollomResponseTestCase extends Mol $this->assertMollomWatchdogMessages(); $this->assertSame('spam', $result['spam'], MOLLOM_ANALYSIS_UNSURE); $this->assertSame('quality', $result['quality'], 0.5); + $this->assertTrue(!isset($result['profanity']), 'profanity not returned.'); + $session_id = $this->assertSessionID($result['session_id']); + + // Additionally enable profanity checking. + $data['post_body'] = 'spam profanity'; + $data['checks'] = 'spam,quality,profanity'; + $data['session_id'] = $session_id; + $result = mollom('mollom.checkContent', $data); + $this->assertMollomWatchdogMessages(); + $this->assertSame('spam', $result['spam'], MOLLOM_ANALYSIS_SPAM); + $this->assertSame('quality', $result['quality'], 0); + $this->assertSame('profanity', $result['profanity'], 1); + $session_id = $this->assertSessionID($result['session_id']); + + // Change the string to contain profanity only. + $data['post_body'] = 'profanity'; + $data['checks'] = 'spam,quality,profanity'; + $data['session_id'] = $session_id; + $result = mollom('mollom.checkContent', $data); + $this->assertMollomWatchdogMessages(); + $this->assertSame('spam', $result['spam'], MOLLOM_ANALYSIS_UNSURE); + $this->assertSame('quality', $result['quality'], 0); + $this->assertSame('profanity', $result['profanity'], 1); + $session_id = $this->assertSessionID($result['session_id']); + + // Disable spam checking, only do profanity checking. + $data['post_body'] = 'spam profanity'; + $data['checks'] = 'profanity'; + $data['session_id'] = $session_id; + $result = mollom('mollom.checkContent', $data); + $this->assertMollomWatchdogMessages(); + $this->assertTrue(!isset($result['spam']), 'spam not returned.'); + $this->assertTrue(!isset($result['quality']), 'quality not returned.'); + $this->assertSame('profanity', $result['profanity'], 1); + $session_id = $this->assertSessionID($result['session_id']); + + // Pass arbitrary string to profanity checking. + $data['post_body'] = $this->randomString(12); + $data['session_id'] = $session_id; + $result = mollom('mollom.checkContent', $data); + $this->assertMollomWatchdogMessages(); + $this->assertTrue(!isset($result['spam']), 'spam not returned.'); + $this->assertTrue(!isset($result['quality']), 'quality not returned.'); + $this->assertSame('profanity', $result['profanity'], 0); $session_id = $this->assertSessionID($result['session_id']); } /** + * Tests results of mollom.checkContent() across requests for a single session. + */ + function testCheckContentSession() { + $data = array( + 'author_name' => $this->admin_user->name, + 'author_mail' => $this->admin_user->mail, + 'author_id' => $this->admin_user->uid, + 'author_ip' => ip_address(), + ); + + // Sequence: Post unsure spam, correct CAPTCHA, change post into spam, + // expect it to be ham (due to correct CAPTCHA). + $data['post_body'] = 'unsure'; + $result = mollom('mollom.checkContent', $data); + $this->assertMollomWatchdogMessages(); + $this->assertSame('spam', $result['spam'], MOLLOM_ANALYSIS_UNSURE); + $data['session_id'] = $this->assertSessionID($result['session_id']); + + $captcha_data = array( + 'session_id' => $data['session_id'], + 'author_ip' => $data['author_ip'], + ); + $result = mollom('mollom.getImageCaptcha', $captcha_data); + $this->assertMollomWatchdogMessages(); + $data['session_id'] = $this->assertSessionID($result['session_id']); + + $captcha_data = array( + 'session_id' => $data['session_id'], + 'author_ip' => $data['author_ip'], + 'author_id' => $data['author_id'], + 'captcha_result' => 'correct', + ); + $result = mollom('mollom.checkCaptcha', $captcha_data); + $this->assertMollomWatchdogMessages(); + $this->assertIdentical($result, TRUE, t('CAPTCHA response was correct.')); + + $data['post_body'] = 'spam'; + $result = mollom('mollom.checkContent', $data); + $this->assertMollomWatchdogMessages(); + $this->assertSame('spam', $result['spam'], MOLLOM_ANALYSIS_HAM); + $data['session_id'] = $this->assertSessionID($result['session_id']); + } + + /** * Tests mollom.getImageCaptcha(). */ function testGetImageCaptcha() { @@ -1499,7 +1614,7 @@ class MollomFormConfigurationTestCase ex ); $this->drupalPost(NULL, $edit, t('Next')); $this->assertText($form_info['user_register']['title']); - $this->assertNoText(t('Fields to analyze')); + $this->assertNoText(t('Text fields to analyze')); $this->drupalPost(NULL, array(), t('Save')); // Verify that user registration form was protected. @@ -1517,6 +1632,7 @@ class MollomFormConfigurationTestCase ex $this->assertText($info['title']); // Verify that forms specifying elements have all possible elements // preselected for textual analysis. + $edit = array(); if (!empty($info['elements'])) { foreach ($info['elements'] as $field => $label) { $field = rawurlencode($field); @@ -1525,9 +1641,10 @@ class MollomFormConfigurationTestCase ex } // Verify that CAPTCHA-only forms contain no configurable fields. else { - $this->assertNoText(t('Fields to analyze')); + $this->assertNoText(t('Analyze text for')); + $this->assertNoText(t('Text fields to analyze')); } - $this->drupalPost(NULL, array(), t('Save')); + $this->drupalPost(NULL, $edit, t('Save')); $this->assertText(t('The form protection has been added.')); } } @@ -1716,23 +1833,26 @@ class MollomCommentFormTestCase extends $this->assertPrivacyLink(); // Try to save a comment that is 'unsure' and make sure there is a CAPTCHA. - $this->drupalPost(NULL, array('comment' => 'unsure'), t('Save')); + $edit = array( + 'comment' => 'unsure', + ); + $this->drupalPost(NULL, $edit, t('Save')); $this->assertCaptchaField(); $session_id = $this->assertSessionIDInForm(); $this->assertPrivacyLink(); - // Try to submit the form by using an invalid CAPTCHA. At this point, - // the submission should be rejected and a new CAPTCHA generated (even - // if the text of the comment is changed to ham). - $this->postIncorrectCaptcha(NULL, array('comment' => 'ham'), t('Save')); + // Try to submit the form by solving the CAPTCHA incorrectly. At this point, + // the submission should be blocked and a new CAPTCHA generated, but only if + // the comment is still neither ham or spam. + $this->postIncorrectCaptcha(NULL, array(), t('Save')); + $this->assertCaptchaField(); $session_id = $this->assertSessionIDInForm(); $this->assertPrivacyLink(); - // Now try using a valid CAPTCHA. The CAPTCHA form should no longer - // be present. + // Correctly solving the CAPTCHA should accept the form submission. $this->postCorrectCaptcha(NULL, array(), t('Save')); - $this->assertRaw('
ham
', t('A comment that is known to be ham appears on the screen after it is submitted.')); - $cid = db_result(db_query("SELECT cid FROM {comments} WHERE comment = '%s' ORDER BY timestamp DESC", array('ham'))); + $this->assertRaw('' . $edit['comment'] . '
', t('A comment that may contain spam was found.')); + $cid = db_result(db_query("SELECT cid FROM {comments} WHERE comment = '%s' ORDER BY timestamp DESC", array($edit['comment']))); $this->assertMollomData('comment', $cid, $session_id); // Try to save a new 'spam' comment; it should be rejected, with no CAPTCHA @@ -2134,6 +2254,7 @@ class MollomDataTestCase extends MollomW $this->drupalPost('admin/content/node-type/story', $edit, t('Save content type')); // Log out and post a comment as anonymous user. + $this->resetServerRecords(); $this->drupalLogout(); $this->drupalGet('node/' . $node->nid); $this->clickLink(t('Add new comment')); @@ -2166,6 +2287,7 @@ class MollomDataTestCase extends MollomW $this->assertSame('author_id', $data['author_id'], NULL); // Log in admin user and edit comment containing spam. + $this->resetServerRecords(); $this->drupalLogin($this->admin_user); $this->drupalGet('comment/edit/' . $comment->cid); // Post without modification. @@ -2216,7 +2338,7 @@ class MollomDataTestCase extends MollomW $this->assertSame('entity', $data->entity, $new_data->entity); $this->assertSame('id', $data->did, $new_data->did); $this->assertNotSame('session_id', $data->session, $new_data->session); - $this->assertNotSame('quality', $data->quality, $new_data->quality); + $this->assertSame('quality', $data->quality, $new_data->quality); $count = db_result(db_query("SELECT COUNT(1) FROM {mollom}")); $this->assertEqual($count, 1, t('Stored data in {mollom} was updated.')); } Index: tests/mollom_test.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/mollom/tests/mollom_test.module,v retrieving revision 1.1.2.9 diff -u -p -r1.1.2.9 mollom_test.module --- tests/mollom_test.module 7 Aug 2010 02:49:44 -0000 1.1.2.9 +++ tests/mollom_test.module 12 Sep 2010 20:20:11 -0000 @@ -13,6 +13,7 @@ function mollom_test_xmlrpc() { return array( // $data contains a variable amount of properties, so we cannot specify a // signature. + 'mollom.getServerList' => 'mollom_test_get_server_list', 'mollom.verifyKey' => 'mollom_test_verify_key', 'mollom.checkContent' => 'mollom_test_check_content', 'mollom.getImageCaptcha' => 'mollom_test_get_captcha', @@ -21,6 +22,17 @@ function mollom_test_xmlrpc() { } /** + * XML-RPC callback for mollom.getServerList to retrieve new server list. + */ +function mollom_test_get_server_list($data) { + $storage = variable_get(__FUNCTION__, array()); + $storage[] = $data; + variable_set(__FUNCTION__, $storage); + + return array($GLOBALS['base_url'] . '/xmlrpc.php?version='); +} + +/** * XML-RPC callback for mollom.verifyKey to validate API keys. */ function mollom_test_verify_key($data) { @@ -48,55 +60,81 @@ function mollom_test_check_content($data $storage[] = $data; variable_set(__FUNCTION__, $storage); - // Check post_title and post_body to determine whether to return ham, spam, or - // unsure as response. - $spam = FALSE; - $ham = FALSE; - - foreach (array('post_title', 'post_body') as $key) { - if (!isset($data[$key])) { - continue; + $response = array(); + + // Spam filter: Check post_title and post_body for ham, spam, or unsure. + if (!isset($data['checks']) || strpos($data['checks'], 'spam') !== FALSE) { + $spam = FALSE; + $ham = FALSE; + foreach (array('post_title', 'post_body') as $key) { + if (!isset($data[$key])) { + continue; + } + // 'spam' always has precedence. + if (strpos($data[$key], 'spam') !== FALSE) { + $spam = TRUE; + } + // Otherwise, check for 'ham'. + elseif (strpos($data[$key], 'ham') !== FALSE) { + $ham = TRUE; + } + // Lastly, take a forced 'unsure' into account. + elseif (strpos($data[$key], 'unsure') !== FALSE) { + $spam = TRUE; + $ham = TRUE; + } + } + if ($spam && $ham) { + $response['spam'] = MOLLOM_ANALYSIS_UNSURE; + $quality = 0.5; + } + elseif ($spam) { + $response['spam'] = MOLLOM_ANALYSIS_SPAM; + $quality = 0; } - // 'spam' always has precedence. - if (strpos($data[$key], 'spam') !== FALSE) { - $spam = TRUE; + elseif ($ham) { + $response['spam'] = MOLLOM_ANALYSIS_HAM; + $quality = 1; } - // Otherwise, check for 'ham'. - elseif (strpos($data[$key], 'ham') !== FALSE) { - $ham = TRUE; + else { + $response['spam'] = MOLLOM_ANALYSIS_UNKNOWN; + $quality = NULL; } - // Lastly, take a forced 'unsure' into account. - elseif (strpos($data[$key], 'unsure') !== FALSE) { - $spam = TRUE; - $ham = TRUE; + } + + // Quality filter. + if (!isset($data['checks']) || strpos($data['checks'], 'quality') !== FALSE) { + if (isset($quality)) { + $response['quality'] = $quality; + } + // @todo No idea how quality is calculated during testing without spam + // results above. + else { + $response['quality'] = 0; } } - if ($spam && $ham) { - $response = MOLLOM_ANALYSIS_UNSURE; - $quality = 0.5; - } - elseif ($spam) { - $response = MOLLOM_ANALYSIS_SPAM; - $quality = 0; - } - elseif ($ham) { - $response = MOLLOM_ANALYSIS_HAM; - $quality = 1; - } - else { - $response = MOLLOM_ANALYSIS_UNKNOWN; - $quality = NULL; + + // Profanity filter. + if (isset($data['checks']) && strpos($data['checks'], 'profanity') !== FALSE) { + $profanity = 0.0; + foreach (array('post_title', 'post_body') as $key) { + if (isset($data[$key]) && strpos($data[$key], 'profanity') !== FALSE) { + $profanity = 1.0; + } + } + $response['profanity'] = $profanity; } + if (!empty($data['session_id'])) { + $response['session_id'] = $data['session_id']; + } // Drupal 6 Pressflow support. - if (function_exists('drupal_session_start')) { + elseif (function_exists('drupal_session_start')) { drupal_session_start(); + $response['session_id'] = session_id(); } - return array( - 'session_id' => !empty($data['session_id']) ? $data['session_id'] : session_id(), - 'spam' => $response, - 'quality' => $quality, - ); + + return $response; } /**