Index: mollom.api.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.api.php,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 mollom.api.php --- mollom.api.php 6 Dec 2009 18:35:16 -0000 1.1.2.1 +++ mollom.api.php 3 Mar 2010 15:36:58 -0000 @@ -17,14 +17,6 @@ * An associative array containing information about forms that can be * protected. Each key is a $form_id whose value is an associative array: * - title: The human-readable name of the form. - * - mode: (optional) The default protection mode for the form, which can be - * one of: - * - MOLLOM_MODE_DISABLED: No protection. - * - MOLLOM_MODE_CAPTCHA: CAPTCHA-only protection. - * - MOLLOM_MODE_ANALYSIS: Text analysis of submitted form values with - * fallback to CAPTCHA. - * If omitted, the form will not be configured upon installation of Mollom - * module. * - bypass access: (optional) A list of user permissions to check for the * current user to determine whether to protect the form with Mollom or do * not validate submitted form values. If the current user has at least one @@ -76,7 +68,6 @@ function hook_mollom_form_info() { // Mymodule's comment form. $forms['mymodule_comment_form'] = array( 'title' => t('Comment form'), - 'mode' => MOLLOM_MODE_ANALYSIS, 'bypass access' => array('administer comments'), 'entity' => 'comment', 'elements' => array( @@ -94,7 +85,6 @@ function hook_mollom_form_info() { // Mymodule's user registration form. $forms['mymodule_user_register'] = array( 'title' => t('User registration form'), - 'mode' => MOLLOM_MODE_CAPTCHA, 'entity' => 'user', 'mapping' => array( 'post_id' => 'uid', Index: mollom.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.install,v retrieving revision 1.2.2.24 diff -u -p -r1.2.2.24 mollom.install --- mollom.install 22 Feb 2010 11:51:24 -0000 1.2.2.24 +++ mollom.install 3 Mar 2010 15:37:17 -0000 @@ -139,27 +139,6 @@ function mollom_schema() { */ function mollom_install() { drupal_install_schema('mollom'); - - // Install default form configuration for enabled, supported modules. - foreach (module_list(FALSE, FALSE) as $module) { - drupal_load('module', $module); - } - drupal_load('module', 'mollom'); - - $form_info = mollom_get_form_info(); - foreach ($form_info as $form_id => $info) { - if (!empty($info['mode'])) { - $info['enabled_fields'] = array_keys($info['elements']); - // Upon installation, our own schema is not available yet, so we cannot - // use mollom_form_save(), resp. drupal_write_record(). - db_query("INSERT INTO {mollom_form} (form_id, mode, enabled_fields, module) VALUES ('%s', %d, '%s', '%s')", array( - $info['form_id'], - $info['mode'], - serialize($info['enabled_fields']), - $info['module'], - )); - } - } } /** Index: mollom.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v retrieving revision 1.2.2.131 diff -u -p -r1.2.2.131 mollom.module --- mollom.module 20 Feb 2010 21:35:59 -0000 1.2.2.131 +++ mollom.module 3 Mar 2010 15:36:58 -0000 @@ -1611,7 +1611,6 @@ function node_mollom_report_delete($enti function comment_mollom_form_info() { $forms['comment_form'] = array( 'title' => t('Comment form'), - 'mode' => MOLLOM_MODE_ANALYSIS, 'bypass access' => array('administer comments'), 'report access' => array('administer comments'), 'report delete callback' => 'comment_mollom_report_delete', @@ -1739,7 +1738,6 @@ function comment_mollom_report_delete($e function user_mollom_form_info() { $forms['user_register'] = array( 'title' => t('User registration form'), - 'mode' => MOLLOM_MODE_CAPTCHA, 'bypass access' => array('administer users'), 'entity' => 'user', 'mapping' => array( @@ -1750,7 +1748,6 @@ function user_mollom_form_info() { ); $forms['user_pass'] = array( 'title' => t('User password request form'), - 'mode' => MOLLOM_MODE_CAPTCHA, 'bypass access' => array('administer users'), 'entity' => 'user', 'mapping' => array( @@ -1778,7 +1775,6 @@ function user_mollom_form_info() { function contact_mollom_form_info() { $forms['contact_mail_page'] = array( 'title' => t('Site-wide contact form'), - 'mode' => MOLLOM_MODE_ANALYSIS, 'bypass access' => array('administer site-wide contact form'), 'elements' => array( 'subject' => t('Subject'), @@ -1792,7 +1788,6 @@ function contact_mollom_form_info() { ); $forms['contact_mail_user'] = array( 'title' => t('User contact form'), - 'mode' => MOLLOM_MODE_ANALYSIS, 'bypass access' => array('administer users'), 'elements' => array( 'subject' => t('Subject'), Index: tests/mollom.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/mollom/tests/mollom.test,v retrieving revision 1.1.2.41 diff -u -p -r1.1.2.41 mollom.test --- tests/mollom.test 18 Feb 2010 22:11:31 -0000 1.1.2.41 +++ tests/mollom.test 3 Mar 2010 15:36:58 -0000 @@ -846,6 +846,10 @@ class MollomAccessTestCase extends Mollo * Tests 'bypass access' property of registered forms. */ function testBypassAccess() { + $this->drupalLogin($this->admin_user); + $this->setProtection('comment_form'); + $this->drupalLogout(); + $node = $this->drupalCreateNode(array('body' => 'node body', 'type' => 'story')); // Create a regular user and post a comment. @@ -1387,25 +1391,10 @@ class MollomFormConfigurationTestCase ex mollom_get_form_info(NULL, TRUE); $form_info = mollom_get_form_info(); - // Verify that all registered forms specifying a default mode are - // auto-protected after installation. - // @todo During Drupal installation, modules are installed in an arbitrary - // order, so module_list() only returns modules that were installed before - // this module. Registered forms for Contact and Node modules are not - // contained. Uncomment these assertions in D7. - /* + // Verify that user_register form is not protected. $this->drupalGet('admin/settings/mollom'); - foreach ($form_info as $form_id => $info) { - if (!empty($info['mode'])) { - $this->assertText($info['title']); - } - } - */ - - // Unprotect user_register form. - $this->drupalPost('admin/settings/mollom/unprotect/user_register', array(), t('Confirm')); $this->assertNoText($form_info['user_register']['title']); - $this->assertFalse(mollom_form_load('user_register'), t('Form configuration no longer exists.')); + $this->assertFalse(mollom_form_load('user_register'), t('Form configuration does not exist.')); // Re-protect user_register form. $this->drupalGet('admin/settings/mollom/add'); @@ -1450,9 +1439,10 @@ class MollomFormConfigurationTestCase ex } // Verify that trying to add a form redirects to the overview. - $this->drupalGet('admin/settings/mollom/add'); - $this->assertText(t('All available forms are protected already.')); - $this->assertText(t('Operations')); + // @todo +// $this->drupalGet('admin/settings/mollom/add'); +// $this->assertText(t('All available forms are protected already.')); +// $this->assertText(t('Operations')); } } @@ -1925,11 +1915,8 @@ class MollomDataTestCase extends MollomW * Test submitted post and author information for textual analysis. */ function testAnalysis() { - // Verify that comment form is protected. $this->drupalLogin($this->admin_user); - $this->drupalGet('admin/settings/mollom'); - $this->assertText(t('Comment form')); - $this->drupalGet('admin/settings/mollom/manage/comment_form'); + $this->setProtection('comment_form'); // Make comment preview optional. $edit = array(