Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some IMAP RFC updates

Browse source
This commit is contained in:
the-djmaze 2022-01-13 16:37:55 +01:00
parent 33967c2319
commit 0b767bb373
3 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php
View file

@ -118,16 +118,25 @@ trait Messages
* @throws \MailSo\Net\Exceptions\Exception * @throws \MailSo\Net\Exceptions\Exception
* @throws \MailSo\Imap\Exceptions\Exception * @throws \MailSo\Imap\Exceptions\Exception
*/ */
public function MessageAppendStream(string $sFolderName, $rMessageAppendStream, int $iStreamSize, array $aAppendFlags = null, int &$iUid = null, int $iDateTime = 0) : ?int public function MessageAppendStream(string $sFolderName, $rMessageAppendStream, int $iStreamSize, array $aFlagsList = null, int &$iUid = null, int $iDateTime = 0) : ?int
{ {
$aData = array($this->EscapeFolderName($sFolderName), $aAppendFlags); $aParams = array(
$this->EscapeFolderName($sFolderName),
$aFlagsList
);
if (0 < $iDateTime) { if (0 < $iDateTime) {
$aData[] = $this->EscapeString(\gmdate('d-M-Y H:i:s', $iDateTime).' +0000'); $aParams[] = $this->EscapeString(\gmdate('d-M-Y H:i:s', $iDateTime).' +0000');
} }
$aData[] = '{'.$iStreamSize.'}'; /*
// RFC 3516 || RFC 6855 section-4
if ($this->IsSupported('BINARY') || $this->IsSupported('UTF8=ACCEPT')) {
$aParams[] = '~{'.$iStreamSize.'}';
}
*/
$aParams[] = '{'.$iStreamSize.'}';
$this->SendRequestGetResponse('APPEND', $aData); $this->SendRequestGetResponse('APPEND', $aParams);
$this->writeLog('Write to connection stream', LogType::NOTE); $this->writeLog('Write to connection stream', LogType::NOTE);
@ -154,7 +163,7 @@ trait Messages
/** /**
* RFC 3502 MULTIAPPEND * RFC 3502 MULTIAPPEND
public function MessageAppendStreams(string $sFolderName, $rMessageAppendStream, int $iStreamSize, array $aAppendFlags = null, int &$iUid = null, int $iDateTime = 0) : ?int public function MessageAppendStreams(string $sFolderName, $rMessageAppendStream, int $iStreamSize, array $aFlagsList = null, int &$iUid = null, int $iDateTime = 0) : ?int
*/ */
/** /**

8
snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/ESEARCH.php
View file

@ -68,6 +68,14 @@ class ESEARCH extends Request
$sCmd = 'SEARCH'; $sCmd = 'SEARCH';
$aRequest = array(); $aRequest = array();
/* // RFC 6203
if (false !== \stripos($this->sCriterias, 'FUZZY') && !$this->oImapClient->IsSupported('SEARCH=FUZZY')) {
$this->oImapClient->writeLogException(
new RuntimeException('SEARCH=FUZZY is not supported'),
Type::ERROR, true);
}
*/
$aFolders = []; $aFolders = [];
if ($this->aMailboxes) { if ($this->aMailboxes) {
$aFolders[] = 'mailboxes'; $aFolders[] = 'mailboxes';

1
snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
View file

@ -261,6 +261,7 @@ class MailClient
); );
// RFC 3516 // RFC 3516
// Should mailserver decode or PHP?
if ($sMailEncoding && $this->oImapClient->IsSupported('BINARY')) { if ($sMailEncoding && $this->oImapClient->IsSupported('BINARY')) {
$sMailEncoding = ''; $sMailEncoding = '';
$sPeek = FetchType::BINARY_PEEK; $sPeek = FetchType::BINARY_PEEK;