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

Resolve #73

Browse source
This commit is contained in:
djmaze 2021-03-31 22:59:06 +02:00
parent 65a302d87f
commit f17609b442
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -161,13 +161,12 @@ class ImapClient extends \MailSo\Net\NetClient
$this->sLogginedUser = $sLogin; $this->sLogginedUser = $sLogin;
// $encrypted = !empty(\stream_get_meta_data($this->rConnect)['crypto']); // $encrypted = !empty(\stream_get_meta_data($this->rConnect)['crypto']);
$type = ''; $type = 'LOGIN'; // RFC3501 6.2.3
$types = [ $types = [
// 'SCRAM-SHA-256' => 1, // !$encrypted // 'SCRAM-SHA-256' => 1, // !$encrypted
// 'SCRAM-SHA-1' => 1, // !$encrypted // 'SCRAM-SHA-1' => 1, // !$encrypted
'CRAM-MD5' => $bUseAuthCramMd5IfSupported, 'CRAM-MD5' => $bUseAuthCramMd5IfSupported,
'PLAIN' => $bUseAuthPlainIfSupported, 'PLAIN' => $bUseAuthPlainIfSupported,
'LOGIN' => 1 // $encrypted
]; ];
foreach ($types as $sasl_type => $active) { foreach ($types as $sasl_type => $active) {
if ($active && $this->IsSupported("AUTH={$sasl_type}") && \SnappyMail\SASL::isSupported($sasl_type)) { if ($active && $this->IsSupported("AUTH={$sasl_type}") && \SnappyMail\SASL::isSupported($sasl_type)) {
@ -248,12 +247,6 @@ class ImapClient extends \MailSo\Net\NetClient
$this->EscapeString($sPassword) $this->EscapeString($sPassword)
)); ));
} }
// else
// {
// $this->writeLogException(
// new Exceptions\LoginBadMethodException,
// \MailSo\Log\Enumerations\Type::NOTICE, true);
// }
if (0 < \strlen($sProxyAuthUser)) if (0 < \strlen($sProxyAuthUser))
{ {