mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-08 22:18:28 +03:00
Better fix for #780
This commit is contained in:
parent
edd083801f
commit
3fdb2e7698
1 changed files with 3 additions and 3 deletions
|
|
@ -119,7 +119,7 @@ class ImapClient extends \MailSo\Net\NetClient
|
|||
|
||||
$this->sLogginedUser = $sLogin;
|
||||
|
||||
$type = 'LOGIN';
|
||||
$type = '';
|
||||
foreach ($oSettings->SASLMechanisms as $sasl_type) {
|
||||
if ($this->IsSupported("AUTH={$sasl_type}") && \SnappyMail\SASL::isSupported($sasl_type)) {
|
||||
$type = $sasl_type;
|
||||
|
|
@ -127,8 +127,8 @@ class ImapClient extends \MailSo\Net\NetClient
|
|||
}
|
||||
}
|
||||
// RFC3501 6.2.3
|
||||
if ('LOGIN' === $type && $this->IsSupported('LOGINDISABLED')) {
|
||||
$type = '';
|
||||
if (!$type && \in_array('LOGIN', $oSettings->SASLMechanisms) && !$this->IsSupported('LOGINDISABLED')) {
|
||||
$type = 'LOGIN';
|
||||
}
|
||||
if (!$type) {
|
||||
if (!$this->Encrypted() && $this->IsSupported('STARTTLS')) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue