Issue #74: Better messaging for user account imports. (#75) by @jenla…

…mpton
backdrop-contrib · Jan 7, 2021 · e739ea6 · e739ea6
1 parent 6215f42
commit e739ea6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/plugins/FeedsUserProcessor.inc b/plugins/FeedsUserProcessor.inc
@@ -53,7 +53,7 @@ class FeedsUserProcessor extends FeedsProcessor {
    */
   protected function entityInfo() {
     $info = parent::entityInfo();
-    $info['label plural'] = t('Users');
+    $info['label plural'] = t('User Accounts');
     return $info;
   }
 
@@ -101,8 +101,11 @@ class FeedsUserProcessor extends FeedsProcessor {
    */
   protected function entityValidate($account, FeedsSource $source = NULL) {
     parent::entityValidate($account);
-    if (empty($account->name) || empty($account->mail) || !valid_email_address($account->mail)) {
-      throw new FeedsValidationException(t('User name missing or email not valid.'));
+    if (empty($account->name) || empty($account->mail)) {
+      throw new FeedsValidationException(t('User name or email missing.'));
+    }
+    if (!valid_email_address(trim($account->mail))) {
+      throw new FeedsValidationException(t('Email not valid.'));
     }
 
     // Check when an user ID gets set or changed during processing if that user