_mollom_retrieve_server_list() error handling is broken

Here is an alternative -- not tested, just prototype code but I think it might work.

The advantage is that is keeps mollom() clean. mollom() is already quite complex and the proposed patch in #1 makes it even harder to grok.

+++ mollom.inc	13 Sep 2010 18:09:53 -0000
@@ -68,24 +68,49 @@ function _mollom_authentication($public_
+    // The mollom.getServerList call can only have one valid error condition:
+    // MOLLOM_REDIRECT, directing us to try the next server in the list. All
+    // other errors are either invalid in this context (i.e., MOLLOM_REFRESH),
+    // or real errors (e.g., invalid API keys).
+    if ($result === FALSE && ($error = xmlrpc_error())) {

If we get a MOLLOM_REFRESH it is better to move to the next server instead of aborting, IMO.

+++ mollom.inc	13 Sep 2010 18:09:53 -0000
@@ -68,24 +68,49 @@ function _mollom_authentication($public_
+      // Any other error is a hard error and we need to stop trying.
+      else {
+        $messages[] = array(
+          'Error @errno from %server for %method: %message' => array(
+            '@errno' => $error->code,
+            '%server' => $server,
+            '%method' => $method,
+            '%message' => $error->message,
+          ),
+        );
+        break;
+      }

If we get an error, we need to try the next server in the list. The error might be a network error (i.e. timeout because the server is down) so we should try the next server.

Certainly makes me happy. :)

Committed to CVS HEAD.