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

Improve #1038

Browse source
This commit is contained in:
the-djmaze 2023-03-21 19:08:17 +01:00
parent 30c95ac04e
commit b5356a4115
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
View file

@ -133,9 +133,10 @@ class SmtpClient extends \MailSo\Net\NetClient
$this->writeLogException(new \MailSo\Smtp\Exceptions\LoginBadMethodException); $this->writeLogException(new \MailSo\Smtp\Exceptions\LoginBadMethodException);
} }
if ($this->Settings->authPlainLine) { $SASL = \SnappyMail\SASL::factory($type);
if ($this->Settings->authPlainLine && $SASL instanceof \SnappyMail\SASL\Plain) {
// https://github.com/the-djmaze/snappymail/issues/1038 // https://github.com/the-djmaze/snappymail/issues/1038
$SASL = \SnappyMail\SASL::factory('PLAIN');
try try
{ {
$sResult = $this->sendRequestWithCheck('AUTH', 235, 'PLAIN ' . $SASL->authenticate($sLogin, $sPassword)); $sResult = $this->sendRequestWithCheck('AUTH', 235, 'PLAIN ' . $SASL->authenticate($sLogin, $sPassword));
@ -148,8 +149,6 @@ class SmtpClient extends \MailSo\Net\NetClient
} }
} else { } else {
// Start authentication // Start authentication
$SASL = \SnappyMail\SASL::factory($type);
try try
{ {
$sResult = $this->sendRequestWithCheck('AUTH', 334, $type); $sResult = $this->sendRequestWithCheck('AUTH', 334, $type);