Move term and user validation into a validate() method.

CHANGELOG.txt

@@ -3,6 +3,7 @@
 Feeds 7.x 2.0 XXXXXXXXXXXXXXXXXXX
 ---------------------------------
 
+- Move term and user validation into a validate() method.
 - Remove check for present name and mail. Needs to be solved on a more pluggable
   level.
 - FeedsTermProcessor: Do not filter taxonomy_term_data table by vid when

plugins/FeedsTermProcessor.inc

@@ -40,6 +40,9 @@ class FeedsTermProcessor extends FeedsProcessor {
         // Save the term.
         $term->feeds_importer_id = $this->id;
         $term->feed_nid = $source->feed_nid;
+        if (!$this->validateTerm($term)) {
+          continue;
+        }
         taxonomy_term_save($term);
         if ($tid) {
           $state->updated++;
@@ -250,4 +253,14 @@ class FeedsTermProcessor extends FeedsProcessor {
     }
     return $term;
   }
+
+  /**
+   * Validates a term.
+   */
+  protected function validateTerm($term) {
+    if (!isset($term->name)) {
+      return FALSE;
+    }
+    return TRUE;
+  }
 }

plugins/FeedsUserProcessor.inc

@@ -41,6 +41,9 @@ class FeedsUserProcessor extends FeedsProcessor {
         $account = $this->map($source, $parser_result, $account);
 
         // Save the user.
+        if (!$this->validateUser($account)) {
+          continue;
+        }
         user_save($account, (array) $account);
         if ($account->uid && $account->openid) {
           $authmap = array(
@@ -229,4 +232,14 @@ class FeedsUserProcessor extends FeedsProcessor {
     }
     return $account;
   }
+
+  /**
+   * Validates a user account.
+   */
+  protected function validateUser($account) {
+    if (empty($account->name) || empty($account->mail) || !valid_email_address($account->mail)) {
+      return FALSE;
+    }
+    return TRUE;
+  }
 }