From 44ce5471b346ce6ae78bd4adea4df1d0568e9fb4 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 24 Feb 2024 13:18:44 +0100 Subject: [PATCH] Onepoll: Prevent errors with invalid mails (#13934) --- src/Worker/OnePoll.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index a379c1a371..8544f3e783 100644 --- 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 = [