Remove "report to Mollom" links and integrate with entity delete confirmation forms instead

So this is what it will approx. look like. Already works to some extent (only tests are failing).

However, I searched the issue queue pretty extensively and tried to find the reason for why we have those "unpublish and report to Mollom" node/comment operations.

They make absolutely zero sense for me. And since they make things more complex than they need to be and also break my tests, I will go ahead and kill them.

I like.

#states flavor.

Doesn't work out though, since radio buttons cannot be deselected. Otherwise, quite cool. :)

Still lovely. That's what I had previously:

I also considered this, but when actually having to use it, it's much slower than a exposed radio list.

So let's go with this:

...

Yes, I shortened the options even more. And I also shortened the description. This widget was *far* too verbose. So the worst that can happen, happens: You are either confused, or you don't read it at all.

Remaining @todos:

+++ mollom.module	18 Feb 2010 02:49:34 -0000
@@ -367,15 +368,86 @@ function mollom_data_save($entity, $id) 
+function mollom_data_delete_form_submit($form, &$form_state) {
+  // @todo Only works for forms with configured enabled_fields currently.
+  $data = mollom_form_get_values($form_state['values'], $form_state['mollom']['enabled_fields'], $form_state['mollom']['mapping']);
+  // @todo This should not happen, but can.
+  if (!isset($data['post_id'])) {
+    return;
+  }

Didn't think of this use-case originally. This means we need to iterate over all "elements", not "enabled_fields".

Shouldn't hold up this patch, but should be a critical task in the queue.

+++ mollom.module	18 Feb 2010 02:49:34 -0000
@@ -438,6 +511,57 @@ function mollom_form_alter(&$form, &$for
+  // Integrate with delete confirmation forms to send feedback to Mollom.
...
+    // @todo Cache this info somehow.
+    $form_info = mollom_get_form_info();
+    foreach ($form_info as $mollom_form_id => $info) {
+      if (isset($info['delete form']) && $info['delete form'] == $form_id) {
+        if (mollom_get_mode($mollom_form_id)) {
+          $report = TRUE;
+          $mollom_form = mollom_form_load($mollom_form_id);
+        }
+        break;
+      }
+    }
+    if (isset($report) && isset($mollom_form['entity']) && isset($mollom_form['mapping']['post_id'])) {

1) We need to cache this in a suitable manner, i.e. using "delete form" as primary array key and the form id as value. Invalidate the cache whenever mollom_form_save() runs. Create the cache whenever mollom_get_form_info() runs.

Alternatively, consider to use a variable. Doesn't change invalidation/creation rules though.

2) We also need to cache mollom_get_form_info(). That is, because Webform needs to load entire nodes to build its form info for Mollom. mollom_get_form_info() is invoked for every form. Performance killer. Also applies to D6, unfortunately. :-/

+++ mollom.module	18 Feb 2010 02:49:34 -0000
@@ -847,6 +971,9 @@ function mollom_theme() {
+    'mollom_form_element' => array(
+      'render element' => 'element',
+    ),

Sorry, forgot to remove.

Powered by Dreditor.

Safety re-roll against HEAD. No changes since last patch. I'll try to come back to this issue after tackling the scaling problem.

Straight re-roll against HEAD. No other changes (yet).

New changes in this patch:

- Added {mollom}.changed column. It's not "created", because session data for a certain entity may be updated after editing. (TBD elsewhere)

- Fixed wrong/D6 links on status report page.

- Removed all hook_ENTITY_delete() hook implementations in favor of simplified integration and automated expiry via {mollom}.changed.

@todo:

- Implement lookup cache for "delete form".

I'm not 100% happy with this patch (the lookup cache), but it works and is a giant improvement over what we have currently.

Meaning: There is definitely room for improvement.

Yayayay! :)

Though: part of the goal was to backport the essentials of this patch, so modules like Webform can use it + actually send feedback to Mollom. (we cannot change the integration for node, comment, user modules in D6, as users would be confused)

So this patch:

- Adds {mollom}.changed column and expiration handling.

- Adds the mollom_data_report[_multiple]() and mollom_data_delete[_multiple]() helper functions + form alters for registered forms defining "delete form".

Additionally: A small clean-up patch for HEAD.

Fixed missing $ret in module update function.

Tested with revised Webform integration, and: WORKS! :)

Companion patch for Webform now over in #686136: Implement hook_mollom_form_info for submission protection by Mollom