the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-11-09 14:51:35 +08:00
Code Issues Projects Releases Packages Wiki Activity

This might solve issue #179

Browse source
This commit is contained in:
djmaze 2022-01-03 23:50:26 +01:00
parent 30e9b89d9b
commit 5e4821fef8
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
View file

@ -1321,4 +1321,9 @@ class ImapClient extends \MailSo\Net\NetClient
return $this->UTF8 ? $sText : \MailSo\Base\Utils::Utf7ModifiedToUtf8($sText); return $this->UTF8 ? $sText : \MailSo\Base\Utils::Utf7ModifiedToUtf8($sText);
} }
public function isUTF8() : bool
{
return $this->UTF8;
}
} }

3
snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/SORT.php
View file

@ -99,7 +99,8 @@ class SORT extends Request
$sSearchCriterias = (\strlen($this->sCriterias) && '*' !== $this->sCriterias) ? $this->sCriterias : 'ALL'; $sSearchCriterias = (\strlen($this->sCriterias) && '*' !== $this->sCriterias) ? $this->sCriterias : 'ALL';
if (!$this->sCharset) { if (!$this->sCharset) {
$this->sCharset = \MailSo\Base\Utils::IsAscii($sSearchCriterias) ? 'US-ASCII' : 'UTF-8'; $this->sCharset = (!$this->oImapClient->isUTF8() && \MailSo\Base\Utils::IsAscii($sSearchCriterias))
? 'US-ASCII' : 'UTF-8';
} }
$aRequest[] = \strtoupper($this->sCharset); $aRequest[] = \strtoupper($this->sCharset);

3
snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/THREAD.php
View file

@ -57,7 +57,8 @@ class THREAD extends Request
$sSearchCriterias = (\strlen($this->sCriterias) && '*' !== $this->sCriterias) ? $this->sCriterias : 'ALL'; $sSearchCriterias = (\strlen($this->sCriterias) && '*' !== $this->sCriterias) ? $this->sCriterias : 'ALL';
if (!$this->sCharset) { if (!$this->sCharset) {
$this->sCharset = \MailSo\Base\Utils::IsAscii($sSearchCriterias) ? 'US-ASCII' : 'UTF-8'; $this->sCharset = (!$this->oImapClient->isUTF8() && \MailSo\Base\Utils::IsAscii($sSearchCriterias))
? 'US-ASCII' : 'UTF-8';
} }
$aRequest[] = \strtoupper($this->sCharset); $aRequest[] = \strtoupper($this->sCharset);