Onepoll: Prevent errors with invalid mails (#13934)

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index a379c1a37146292ffc540538af5b291cc20e875d..8544f3e7836ab49a08c153be8abf01c80c7df40f 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -213,7 +213,7 @@ class OnePoll
                $mbox = null;
                $user = DBA::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]);
 
-               $condition = ["`server` != '' AND `uid` = ?", $importer_uid];
+               $condition = ["`server` != ? AND `user` != ? AND `port` != ? AND `uid` = ?", '', '', 0, $importer_uid];
                $mailconf = DBA::selectFirst('mailacct', [], $condition);
                if (DBA::isResult($user) && DBA::isResult($mailconf)) {
                        $mailbox = Email::constructMailboxName($mailconf);
@@ -249,6 +249,10 @@ class OnePoll
                                $msgs = array_combine($msgs, $metas);
 
                                foreach ($msgs as $msg_uid => $meta) {
+                                       if (empty($meta->message_id)) {
+                                               continue;
+                                       }
+
                                        Logger::info('Parsing mail', ['message-uid' => $msg_uid]);
 
                                        $datarray = [