git subrepo pull (merge) mailcow/src/mailcow-dockerized
Among other things, this updates Dovecot to 2.3.13, which is a
critical security update.
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "376574d9"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "6f14955b"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: Idf4859ddaaebf6997afbb0cebffc8bf3f5b902a0
diff --git a/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/ddeboer/imap/src/Message.php b/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/ddeboer/imap/src/Message.php
index 7b50777..843ce61 100644
--- a/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/ddeboer/imap/src/Message.php
+++ b/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/ddeboer/imap/src/Message.php
@@ -109,7 +109,15 @@
}
$this->messageNumberVerified = true;
+ $msgno = null;
+ \set_error_handler(static function (): bool {
+ return true;
+ });
+
$msgno = \imap_msgno($this->resource->getStream(), $messageNumber);
+
+ \restore_error_handler();
+
if (\is_numeric($msgno) && $msgno > 0) {
$this->imapMsgNo = $msgno;
@@ -306,7 +314,7 @@
// 'deleted' header changed, force to reload headers, would be better to set deleted flag to true on header
$this->clearHeaders();
- if (!\imap_delete($this->resource->getStream(), $this->getNumber(), \FT_UID)) {
+ if (!\imap_delete($this->resource->getStream(), (string) $this->getNumber(), \FT_UID)) {
throw new MessageDeleteException(\sprintf('Message "%s" cannot be deleted', $this->getNumber()));
}
}
@@ -320,7 +328,7 @@
{
// 'deleted' header changed, force to reload headers, would be better to set deleted flag to false on header
$this->clearHeaders();
- if (!\imap_undelete($this->resource->getStream(), $this->getNumber(), \FT_UID)) {
+ if (!\imap_undelete($this->resource->getStream(), (string) $this->getNumber(), \FT_UID)) {
throw new MessageUndeleteException(\sprintf('Message "%s" cannot be undeleted', $this->getNumber()));
}
}