' . t("Mollom can be used to block all types of spam received on your website's protected forms. Each form can be set to one of the following options:") . '
'; - $description .= ''; - $description .= t("Data is processsed and stored as explained in our Web Service Privacy Policy. It is your responsibility to provide any necessary notices and obtain the appropriate consent regarding Mollom's use of your data. For more information, see How Mollom Works and the Mollom FAQ.", array( - '@mollom-privacy' => 'http://mollom.com/service-agreement-free-subscriptions', - '@mollom-works' => 'http://mollom.com/how-mollom-works', - '@mollom-faq' => 'http://mollom.com/faq')); - $description .= '
'; - - $form['spam'] = array( - '#type' => 'fieldset', - '#title' => t('Spam protection settings'), - '#description' => $description, - '#collapsible' => TRUE, - ); - - $modes = array( - MOLLOM_MODE_DISABLED => t('No protection'), - MOLLOM_MODE_CAPTCHA => t('CAPTCHA only'), - MOLLOM_MODE_ANALYSIS => t('Text analysis and CAPTCHA backup'), - ); - - $forms = _mollom_protectable_forms(); - foreach ($forms as $form_id => $details) { - $mode = _mollom_get_mode($form_id); - // @todo Use #tree instead. - $name = 'mollom_' . $form_id; - - // @todo What's happening here? - $options = array_slice($modes, 0, $details['mode'] + 1); - - $form['spam'][$name] = array( - '#type' => 'select', - '#title' => t('Protect @name', array('@name' => $details['name'])), - '#options' => $options, - '#default_value' => $mode, - ); - } - - $form['server'] = array( - '#type' => 'fieldset', - '#title' => t('Server settings'), - '#collapsible' => TRUE, - '#collapsed' => $keys, - ); - $form['server']['mollom_fallback'] = array( - '#type' => 'radios', - '#title' => t('Fallback strategy'), - // Default to treating everything as inappropriate. - '#default_value' => variable_get('mollom_fallback', MOLLOM_FALLBACK_BLOCK), - '#options' => array( - MOLLOM_FALLBACK_BLOCK => t('Block all submissions of protected forms until the server problems are resolved'), - MOLLOM_FALLBACK_ACCEPT => t('Leave all forms unprotected and accept all submissions'), - ), - '#description' => t('When the Mollom servers are down or otherwise unreachable, no text analysis is performed and no CAPTCHAs are generated. If this occurs, your Drupal site will use the configured fallback strategy, and will either accept all submissions without spam checking, or block all submissions until the server or connection problems are resolved. Subscribers to Mollom Plus receive access to Mollom\'s high-availability backend infrastructure, not available to free users, reducing potential downtime.', array( - '@pricing' => 'http://mollom.com/pricing', - '@sla' => 'http://mollom.com/standard-service-level-agreement', - )), - ); } + $form['server'] = array( + '#type' => 'fieldset', + '#title' => t('Server settings'), + '#access' => !empty($status), + ); + $form['server']['mollom_fallback'] = array( + '#type' => 'radios', + '#title' => t('Fallback strategy'), + // Default to treating everything as inappropriate. + '#default_value' => variable_get('mollom_fallback', MOLLOM_FALLBACK_BLOCK), + '#options' => array( + MOLLOM_FALLBACK_BLOCK => t('Block all submissions of protected forms until the server problems are resolved'), + MOLLOM_FALLBACK_ACCEPT => t('Leave all forms unprotected and accept all submissions'), + ), + '#description' => t('When the Mollom servers are down or otherwise unreachable, no text analysis is performed and no CAPTCHAs are generated. If this occurs, your Drupal site will use the configured fallback strategy, and will either accept all submissions without spam checking, or block all submissions until the server or connection problems are resolved. Subscribers to Mollom Plus receive access to Mollom\'s high-availability backend infrastructure, not available to free users, reducing potential downtime.', array( + '@pricing' => 'http://mollom.com/pricing', + '@sla' => 'http://mollom.com/standard-service-level-agreement', + )), + ); + $form['access-keys'] = array( '#type' => 'fieldset', '#title' => t('Mollom access keys'), @@ -95,7 +266,7 @@ function mollom_admin_settings() { '@mollom-manager-add' => 'http://mollom.com/site-manager/add', '@mollom-manager' => 'http://mollom.com/site-manager', )), - '#collapsible' => TRUE, + '#collapsible' => $keys, '#collapsed' => $keys, ); $form['access-keys']['mollom_public_key'] = array( @@ -124,12 +295,15 @@ function _mollom_verify_key() { if ($status === NETWORK_ERROR) { drupal_set_message(t('We tried to contact the Mollom servers but we encountered a network error. Please make sure that your web server can make outgoing HTTP requests.'), 'error'); + return FALSE; } elseif ($status === MOLLOM_ERROR) { drupal_set_message(t('We contacted the Mollom servers to verify your keys: your keys do not exist or are no longer valid. Please visit the Manage sites page on the Mollom website again: @mollom-user.', array('@mollom-user' => 'http://mollom.com/user')), 'error'); + return FALSE; } else { drupal_set_message(t('We contacted the Mollom servers to verify your keys: the Mollom services are operating correctly. We are now blocking spam.')); + return TRUE; } } Index: mollom.api.php =================================================================== RCS file: mollom.api.php diff -N mollom.api.php --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mollom.api.php 20 Nov 2009 11:33:59 -0000 @@ -0,0 +1,68 @@ + t('Comment form'), + 'mode' => MOLLOM_MODE_ANALYSIS, + 'parents' => array( + 'subject' => t('Subject'), + 'body' => t('Body'), + ), + ); + $forms['user_register'] = array( + 'title' => t('User registration form'), + 'mode' => MOLLOM_MODE_CAPTCHA, + ); + + return $forms; +} + +/** + * Alter registered information about forms that can be protected by Mollom. + * + * @param &$form_info + * An associative array containing protectable forms. See + * hook_mollom_form_info() for details. + */ +function hook_mollom_form_info_alter(&$form_info) { + if (isset($form_info['comment_form'])) { + $form_info['comment_form']['parents']['mymodule_field'] = t('My additional field'); + } +} + Index: mollom.form.inc =================================================================== RCS file: mollom.form.inc diff -N mollom.form.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ mollom.form.inc 20 Nov 2009 11:36:46 -0000 @@ -0,0 +1,121 @@ + t('Comment form'), + 'mode' => MOLLOM_MODE_ANALYSIS, + 'parents' => array( + 'subject' => t('Subject'), + 'body' => t('Body'), + ), + ); + + return $forms; +} + +/** + * Implements hook_mollom_form_info(). + */ +function contact_mollom_form_info() { + $forms['contact_mail_page'] = array( + 'title' => t('Site-wide contact form'), + 'mode' => MOLLOM_MODE_ANALYSIS, + 'parents' => array( + 'subject' => t('Subject'), + 'message' => t('Message'), + ), + ); + $forms['contact_mail_user'] = array( + 'title' => t('User contact form'), + 'mode' => MOLLOM_MODE_ANALYSIS, + 'parents' => array( + 'subject' => t('Subject'), + 'message' => t('Message'), + ), + ); + + return $forms; +} + +/** + * Implements hook_mollom_form_info(). + */ +function node_mollom_form_info() { + $types = node_get_types('types'); + $forms = array(); + foreach ($types as $type) { + $forms[$type->type . '_node_form'] = array( + 'title' => t('@name form', array('@name' => $type->name)), + 'mode' => MOLLOM_MODE_ANALYSIS, + ); + $parents = array(); + // @see node_content_form() + if ($type->has_title) { + $parents['title'] = check_plain($type->title_label); + } + if ($type->has_body) { + $parents['body'] = check_plain($type->body_label); + // @todo How do we get invisible & dependent 'format' support in here? + // $parents['format'] = t('Input format'), + } + // Add CCK fields by default. + 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') { + $parents[$field_name] = check_plain(t($field['widget']['label'])); + } + } + } + $forms[$type->type . '_node_form']['parents'] = $parents; + } + + return $forms; +} + +/** + * Implements hook_mollom_form_info(). + */ +function user_mollom_form_info() { + $forms['user_register'] = array( + 'title' => t('User registration form'), + 'mode' => MOLLOM_MODE_CAPTCHA, + ); + $forms['user_pass'] = array( + 'title' => t('User password request form'), + 'mode' => MOLLOM_MODE_CAPTCHA, + ); + + return $forms; +} + +/** + * Implements hook_mollom_form_info(). + * + * @todo Move this into Webform module. + */ +function webform_mollom_form_info() { + // @todo + $webforms = db_query("SELECT n.nid, n.title FROM {node} n WHERE n.type = 'webform' AND n.status = 1"); + while ($webform = db_fetch_object($webforms)) { + $forms['webform_client_form_'. $webform->nid] = array( + 'title' => $webform->title, + 'mode' => MOLLOM_MODE_ANALYSIS, + 'parents' => array( + ), + ); + } + + return $forms; +} + Index: mollom.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.install,v retrieving revision 1.2.2.11 diff -u -p -r1.2.2.11 mollom.install --- mollom.install 17 Nov 2009 17:01:49 -0000 1.2.2.11 +++ mollom.install 20 Nov 2009 00:20:55 -0000 @@ -53,6 +53,33 @@ function mollom_schema() { 'primary key' => array('did'), ); + $schema['mollom_form'] = array( + // @todo Add description. + 'description' => '', + 'fields' => array( + 'form_id' => array( + 'description' => 'The $form_id of the form being protected.', + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), + 'mode' => array( + 'description' => 'The configured protection mode to use for the form.', + 'type' => 'int', + 'size' => 'tiny', + 'not null' => TRUE, + 'default' => 0, + ), + 'fields' => array( + 'type' => 'text', + 'serialize' => TRUE, + ), + // @todo 'module' required for maintenance. + ), + 'primary key' => array('form_id'), + ); + $schema['cache_mollom'] = drupal_get_schema_unprocessed('system', 'cache'); $schema['cache_mollom']['description'] = 'Cache table for the Mollom module to store information for forms it protects.'; @@ -64,6 +91,19 @@ function mollom_schema() { */ function mollom_install() { drupal_install_schema('mollom'); + + // Install default form configuration for enabled, supported modules. + foreach (module_list() as $module) { + drupal_load('module', $module); + } + $form_info = mollom_get_form_info(); + foreach ($form_info as $form_id => $info) { + if (!empty($info['mode'])) { + $info['form_id'] = $form_id; + $info['fields'] = array_keys($info['parents']); + mollom_form_save($info); + } + } } /** @@ -97,10 +137,11 @@ function mollom_update_2() { * Upgrade form protection storage. */ function mollom_update_3() { - // Load the Drupal module so that _mollom_protectable_forms() is available. + // Load the module, so mollom_get_form_info() is available. drupal_load('module', 'mollom'); - foreach (_mollom_protectable_forms() as $form_id => $details) { + // @todo FIXME + foreach (mollom_get_form_info() as $form_id => $details) { $name = 'mollom_' . $form_id; $mode = variable_get($name, NULL); if ($mode && $details['mode'] == MOLLOM_MODE_ANALYSIS) { @@ -120,3 +161,54 @@ function mollom_update_4() { return $ret; } +/** + * Add the {mollom_form} table. + */ +function mollom_update_6105() { + $ret = array(); + $schema = array( + 'fields' => array( + 'form_id' => array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), + 'mode' => array( + 'description' => 'The configured protection mode to use for the form.', + 'type' => 'int', + 'size' => 'tiny', + 'not null' => TRUE, + 'default' => 0, + ), + 'fields' => array( + 'type' => 'text', + 'serialize' => TRUE, + ), + // @todo 'module' required for maintenance. + ), + 'primary key' => array('form_id'), + ); + db_create_table($ret, 'mollom_form', $schema); + + // Migrate form configuration for enabled, supported modules. + foreach (module_list() as $module) { + drupal_load('module', $module); + } + $form_info = mollom_get_form_info(); + $result = db_query("SELECT name, value FROM {variable} WHERE name LIKE 'mollom_%%' AND name NOT IN ('mollom_servers', 'mollom_fallback', 'mollom_public_key', 'mollom_private_key')"); + while ($row = db_fetch_object($result)) { + $form_id = substr($row->name, 7); + $mode = unserialize($row->value); + if (!empty($mode) && isset($form_info[$form_id])) { + $info = $form_info[$form_id]; + $info['form_id'] = $form_id; + $info['mode'] = $mode; + $info['fields'] = array_keys($info['parents']); + mollom_form_save($info); + } + variable_del($row->name); + } + return $ret; +} + Index: mollom.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.js,v retrieving revision 1.2.2.7 diff -u -p -r1.2.2.7 mollom.js --- mollom.js 17 Nov 2009 17:01:49 -0000 1.2.2.7 +++ mollom.js 19 Nov 2009 20:20:45 -0000 @@ -3,7 +3,7 @@ /** * Attach click event handlers for CAPTCHA links. */ -Drupal.behaviors.mollom = function(context) { +Drupal.behaviors.mollomCaptcha = function(context) { $('a.mollom-audio-captcha', context).click(getAudioCaptcha); $('a.mollom-image-captcha', context).click(getImageCaptcha); } @@ -45,3 +45,17 @@ function getImageCaptcha() { }); return false; } + +/** + * Toggle display of custom form ID element depending on select list value. + */ +Drupal.behaviors.mollomSettingsFormID = function() { + $('#edit-mollom-form-id').change(function() { + if ($(this).val() == 'form_id_custom') { + $('#edit-mollom-form-id-custom-wrapper').show(); + } + else { + $('#edit-mollom-form-id-custom-wrapper').hide(); + } + }).change(); +} Index: mollom.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v retrieving revision 1.2.2.101 diff -u -p -r1.2.2.101 mollom.module --- mollom.module 17 Nov 2009 23:39:49 -0000 1.2.2.101 +++ mollom.module 20 Nov 2009 11:20:55 -0000 @@ -91,12 +91,34 @@ define('MOLLOM_REDIRECT', 1200); */ function mollom_help($path, $arg) { if ($path == 'admin/settings/mollom') { - return t("Allowing users to react, participate and contribute while still keeping your site's content under control can be a huge challenge. Mollom is a web service that helps you identify content quality and, more importantly, helps you stop spam. When content moderation becomes easier, you have more time and energy to interact with your web community. More information about Mollom is available on the Mollom website or in the Mollom FAQ.", + return t('All listed forms below are protected by Mollom. You can add a form to protect, configure already protected forms, or remove the protection.', array( + '@add-form-url' => url('admin/settings/mollom/add'), + )); + } + if ($path == 'admin/help#mollom') { + $output = ''; + $output = t("Allowing users to react, participate and contribute while still keeping your site's content under control can be a huge challenge. Mollom is a web service that helps you identify content quality and, more importantly, helps you stop spam. When content moderation becomes easier, you have more time and energy to interact with your web community. More information about Mollom is available on the Mollom website or in the Mollom FAQ.", array( '@mollom-website' => 'http://mollom.com', '@mollom-faq' => 'http://mollom.com/faq', ) ); + $output .= '
'; + $output .= t("Mollom can be used to block all types of spam received on your website's protected forms. Each form can be set to one of the following options:"); + $output .= '
'; + $output .= t("Data is processsed and stored as explained in our Web Service Privacy Policy. It is your responsibility to provide any necessary notices and obtain the appropriate consent regarding Mollom's use of your data. For more information, see How Mollom Works and the Mollom FAQ.", array( + '@mollom-privacy' => 'http://mollom.com/service-agreement-free-subscriptions', + '@mollom-works' => 'http://mollom.com/how-mollom-works', + '@mollom-faq' => 'http://mollom.com/faq') + ); + $output .= '
'; + return $output; } } @@ -155,16 +177,54 @@ function mollom_menu() { 'file' => 'mollom.pages.inc', 'type' => MENU_CALLBACK, ); + $items['admin/settings/mollom'] = array( 'title' => 'Mollom', 'description' => 'Mollom is a web service that helps you manage your community.', + 'page callback' => 'mollom_admin_form_list', + 'access arguments' => array('administer mollom'), + 'file' => 'mollom.admin.inc', + ); + $items['admin/settings/mollom/list'] = array( + 'title' => 'List', + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -10, + ); + $items['admin/settings/mollom/add'] = array( + 'title' => 'Add form', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('mollom_admin_configure_form'), + 'access arguments' => array('administer mollom'), + 'type' => MENU_LOCAL_TASK, + 'file' => 'mollom.admin.inc', + ); + $items['admin/settings/mollom/manage/%mollom_admin_form'] = array( + 'title' => 'Configure', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('mollom_admin_configure_form', 4), + 'access arguments' => array('administer mollom'), + 'file' => 'mollom.admin.inc', + ); + $items['admin/settings/mollom/unprotect/%mollom_admin_form'] = array( + 'title' => 'Unprotect form', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('mollom_admin_unprotect_form', 4), + 'access arguments' => array('administer mollom'), + 'type' => MENU_CALLBACK, + 'file' => 'mollom.admin.inc', + ); + $items['admin/settings/mollom/settings'] = array( + 'title' => 'Settings', + 'description' => 'Configure Mollom keys and global settings.', 'page callback' => 'drupal_get_form', 'page arguments' => array('mollom_admin_settings'), 'access arguments' => array('administer mollom'), + 'type' => MENU_LOCAL_TASK, 'file' => 'mollom.admin.inc', ); + $items['admin/reports/mollom'] = array( - 'title' => 'Mollom', + 'title' => 'Mollom statistics', 'description' => 'Reports and usage statistics for the Mollom module.', 'page callback' => 'mollom_reports_page', 'access callback' => '_mollom_access', @@ -305,11 +365,11 @@ function mollom_comment($comment, $op) { * This function intercepts all forms in Drupal and Mollom-enables them if * necessary. */ -function mollom_form_alter(&$form, $form_state, $form_id) { +function mollom_form_alter(&$form, &$form_state, $form_id) { // Site administrators don't have their content checked with Mollom. if (!user_access('post with no checking')) { - // Retrieve the mode of protection required for this form. - if ($mode = _mollom_get_mode($form_id)) { + // Retrieve the protection mode for this form. + if ($mollom_form = mollom_form_load($form_id)) { // Compute the weight of the CAPTCHA so we can position it in the form. $weight = 99999; foreach (element_children($form) as $key) { @@ -332,7 +392,8 @@ function mollom_form_alter(&$form, $form // Add Mollom form protection widget. $form['mollom'] = array( '#type' => 'mollom', - '#mode' => $mode, + '#mode' => $mollom_form['mode'], + '#fields' => $mollom_form['fields'], '#weight' => $weight, ); // Add a submit handler that will clean the Mollom state as soon as the @@ -468,61 +529,154 @@ function mollom_data_node_form($form_sta * - MOLLOM_MODE_DISABLED: None. * - MOLLOM_MODE_CAPTCHA: CAPTCHA only. * - MOLLOM_MODE_ANALYSIS: Text analysis with CAPTCHA fallback. - * - * @todo Store form ids in a single variable. */ function _mollom_get_mode($form_id) { - $mode = variable_get('mollom_' . $form_id, NULL); - if (!isset($mode)) { - $forms = _mollom_protectable_forms(); - return isset($forms[$form_id]['mode']) ? $forms[$form_id]['mode'] : MOLLOM_MODE_DISABLED; + $mollom_form = mollom_form_load($form_id); + return isset($mollom_form['mode']) ? $mollom_form['mode'] : MOLLOM_MODE_DISABLED; +} + +/** + * Returns information about protectable forms registered via hook_mollom_form_info(). + * + * @param $form_id + * (optional) The form id to return information for. If omitted, information + * for all registered forms is returned. + */ +function mollom_get_form_info($form_id = NULL) { + static $form_info; + + if (!isset($form_info)) { + module_load_include('inc', 'mollom', 'mollom.form'); + $form_info = array(); + foreach (module_implements('mollom_form_info') as $module) { + $function = $module . '_mollom_form_info'; + $module_forms = $function(); + foreach ($module_forms as $id => $info) { + // Ensure basic properties for all forms. + $module_forms[$id] += array( + 'module' => $module, + 'form_id' => $id, + 'title' => $id, + 'parents' => array(), + ); + } + $form_info = array_merge_recursive($form_info, $module_forms); + } + + // Allow modules to alter the default form information. + drupal_alter('mollom_form_info', $form_info); } - return $mode; + + if (isset($form_id)) { + return isset($form_info[$form_id]) ? $form_info[$form_id] : array(); + } + return $form_info; } /** - * Returns a list of forms that can be protected with Mollom. + * Menu argument loader; Loads Mollom configuration for a given form id. */ -function _mollom_protectable_forms() { - static $forms = NULL; +function mollom_form_load($form_id) { + $mollom_form = db_fetch_array(db_query_range("SELECT * FROM {mollom_form} WHERE form_id = '%s'", $form_id, 0, 1)); + if ($mollom_form) { + $mollom_form['fields'] = unserialize($mollom_form['fields']); + } + return $mollom_form; +} - if (!isset($forms)) { - if (module_exists('comment')) { - $forms['comment_form'] = array( - 'name' => 'comment form', - 'mode' => MOLLOM_MODE_ANALYSIS, - ); - } - if (module_exists('contact')) { - $forms['contact_mail_page'] = array( - 'name' => 'site-wide contact form', - 'mode' => MOLLOM_MODE_ANALYSIS, - ); +/** + * Loads Mollom information and configuration for a given form id. + * + * This needs to live in mollom.module or the menu system won't recognize it. + */ +function mollom_admin_form_load($form_id) { + // Load form configuration. + $mollom_form = mollom_form_load($form_id); + if (!$mollom_form) { + $mollom_form = array(); + } - $forms['contact_mail_user'] = array( - 'name' => 'per-user contact forms', - 'mode' => MOLLOM_MODE_ANALYSIS, - ); + // Attach form registry information. + $mollom_form += mollom_get_form_info($form_id); + + // Ensure default values for administrative configuration. + $mollom_form += array( + 'form_id' => $form_id, + 'title' => $form_id, + 'parents' => array(), + 'fields' => array(), + ); + + return $mollom_form; +} + +/** + * Saves a Mollom form configuration. + */ +function mollom_form_save(&$mollom_form) { + $exists = db_result(db_query_range("SELECT 1 FROM {mollom_form} WHERE form_id = '%s'", $mollom_form['form_id'], 0, 1)); + if ($exists) { + $status = drupal_write_record('mollom_form', $mollom_form, 'form_id'); + } + else { + $status = drupal_write_record('mollom_form', $mollom_form); + } + // Allow modules to react on saved form configurations. + if (isset($status) && $status) { + if ($status === SAVED_NEW) { + module_invoke_all('mollom_form_insert', $mollom_form); } - $forms['user_register'] = array( - 'name' => 'user registration form', - 'mode' => MOLLOM_MODE_CAPTCHA, - ); - $forms['user_pass'] = array( - 'name' => 'user password request form', - 'mode' => MOLLOM_MODE_CAPTCHA, - ); - // Add all node forms. - $types = node_get_types('names'); - foreach ($types as $type => $name) { - $forms[$type . '_node_form'] = array( - 'name' => drupal_strtolower($name) . ' form', - 'mode' => MOLLOM_MODE_ANALYSIS, - ); + elseif ($status === SAVED_UPDATED) { + module_invoke_all('mollom_form_update', $mollom_form); } } + return $status; +} - return $forms; +/** + * Given an array of values and an array of fields, extract data for use. + * + * @param $values + * An array of data, usually $form_state['values']. + * @param $fields + * An array of strings representing fields to extract. Nested fields are in + * the form of 'parent[child]'. + */ +function mollom_form_get_values($values, $fields) { + global $user; + + $field_data = array(); + foreach ($fields as $field) { + // Nested field values use 'parent][child', so we need to recurse. + $parents = explode('][', $field); + $field_value = $values; + foreach ($parents as $key) { + $field_value = isset($field_value[$key]) ? $field_value[$key] : NULL; + } + // Only save values that are not empty. + if (isset($field_value) && strlen($field_value)) { + $field_data[$field] = $field_value; + } + } + + $data = array(); + // Add the data from the fields. + // @todo Allow hook_mollom_form_info() to specify a form element mapping. + $data['post_title'] = isset($values['title']) ? $values['title'] : (isset($values['subject']) ? $values['subject'] : NULL); + $data['post_body'] = !empty($fields_data) ? implode("\n", $fields_data) : NULL; + + // Add common data. + $data['author_name'] = isset($values['name']) ? $values['name'] : (isset($user->name) ? $user->name : NULL); + $data['author_mail'] = isset($values['mail']) ? $values['mail'] : (isset($user->mail) ? $user->mail : NULL); + $data['author_url'] = isset($values['homepage']) ? $values['homepage'] : NULL; + $data['author_openid'] = $user->uid ? _mollom_get_openid($user) : NULL; + $data['author_id'] = $user->uid ? $user->uid : NULL; + // @todo For any reason, the previous data collector functions used the + // content's internal system id (i.e. nid, cid, etc.) instead of the IP + // address...? + $data['author_ip'] = ip_address(); + + return $data; } /** @@ -637,6 +791,7 @@ function mollom_expand_element($element, '#require_captcha' => $element['#mode'] == MOLLOM_MODE_CAPTCHA, '#passed_captcha' => FALSE, '#user_session_id' => session_id(), + '#fields' => $element['#fields'], ); } @@ -726,6 +881,7 @@ function mollom_validate_analysis(&$moll $data = array(); $form_id = $form_state['values']['form_id']; + $data = mollom_form_get_values($form_state['values'], $mollom_state['#fields']); $pos = strpos($form_id, '_node_form'); if ($pos !== FALSE) { @@ -970,11 +1126,12 @@ function mollom($method, $data = array() /** * Helper function to debug the form API workflow. * - * Uncomment the function body to activate. + * Comment the return to enable. */ function _mollom_debug($message) { - // print $message .'spam
', t('A comment that is known to be ham appears on the screen after it is submitted.')); + $this->assertRaw('spam
', t('A comment that is known to be spam appears on the screen after it is submitted.')); } /** @@ -556,7 +567,12 @@ class MollomCommentFormTestCase extends */ function testCaptchaProtectedCommentForm() { // Enable Mollom CAPTCHA protection for comments. - variable_set('mollom_comment_form', MOLLOM_MODE_CAPTCHA); + $mollom_form = array( + 'form_id' => 'comment_form', + 'mode' => MOLLOM_MODE_CAPTCHA, + 'fields' => array(), + ); + mollom_form_save($mollom_form); // Request the comment reply form. There should be a CAPTCHA form. $this->drupalGet('comment/reply/'. $this->node->nid); @@ -584,7 +600,9 @@ class MollomCommentFormTestCase extends */ function testTextAnalysisProtectedCommentForm() { // Enable Mollom text-classification for comments. - variable_set('mollom_comment_form', MOLLOM_MODE_ANALYSIS); + $form_info = mollom_get_form_info('comment_form'); + $form_info['fields'] = array_keys($form_info['parents']); + mollom_form_save($form_info); // Request the comment reply form. Initially, there should be no CAPTCHA. $this->drupalGet('comment/reply/'. $this->node->nid); @@ -670,7 +688,7 @@ class MollomContactFormTestCase extends } function setUp() { - parent::setUp('mollom', 'contact'); + parent::setUp('contact', 'mollom'); $this->setUpMollom(); $this->web_user = $this->drupalCreateUser(array('access site-wide contact form', 'access user profiles')); $this->drupalLogin($this->web_user); @@ -683,7 +701,9 @@ class MollomContactFormTestCase extends */ function testProtectContactUserForm() { // Enable Mollom for the contact form. - variable_set('mollom_contact_mail_user', MOLLOM_MODE_ANALYSIS); + $form_info = mollom_get_form_info('contact_mail_user'); + $form_info['fields'] = array_keys($form_info['parents']); + mollom_form_save($form_info); $url = 'user/' . $this->admin_user->uid . '/contact'; $button = t('Send e-mail'); @@ -709,7 +729,9 @@ class MollomContactFormTestCase extends */ function testProtectContactSiteForm() { // Enable Mollom for the contact form. - variable_set('mollom_contact_mail_page', MOLLOM_MODE_ANALYSIS); + $form_info = mollom_get_form_info('contact_mail_page'); + $form_info['fields'] = array_keys($form_info['parents']); + mollom_form_save($form_info); // Add some fields to the contact form so that it is active. db_query("INSERT INTO {contact} (category, recipients, reply) VALUES ('%s', '%s', '%s')", 'test category', $this->web_user->mail, 'test auto-reply');