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

Better fix for #780

Browse source
This commit is contained in:
the-djmaze 2022-12-16 11:45:24 +01:00
parent edd083801f
commit 3fdb2e7698
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -119,7 +119,7 @@ class ImapClient extends \MailSo\Net\NetClient
$this->sLogginedUser = $sLogin; $this->sLogginedUser = $sLogin;
$type = 'LOGIN'; $type = '';
foreach ($oSettings->SASLMechanisms as $sasl_type) { foreach ($oSettings->SASLMechanisms as $sasl_type) {
if ($this->IsSupported("AUTH={$sasl_type}") && \SnappyMail\SASL::isSupported($sasl_type)) { if ($this->IsSupported("AUTH={$sasl_type}") && \SnappyMail\SASL::isSupported($sasl_type)) {
$type = $sasl_type; $type = $sasl_type;
@ -127,8 +127,8 @@ class ImapClient extends \MailSo\Net\NetClient
} }
} }
// RFC3501 6.2.3 // RFC3501 6.2.3
if ('LOGIN' === $type && $this->IsSupported('LOGINDISABLED')) { if (!$type && \in_array('LOGIN', $oSettings->SASLMechanisms) && !$this->IsSupported('LOGINDISABLED')) {
$type = ''; $type = 'LOGIN';
} }
if (!$type) { if (!$type) {
if (!$this->Encrypted() && $this->IsSupported('STARTTLS')) { if (!$this->Encrypted() && $this->IsSupported('STARTTLS')) {