changes for #884

This commit is contained in:
the-djmaze 2023-01-28 00:44:10 +01:00 committed by GitHub
parent c6500dfe14
commit e45959949c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -236,16 +236,15 @@ abstract class Account implements \JsonSerializable
return $this->netClientLogin($oImapClient, $oPlugins, $oSettings);
}
public function SmtpConnectAndLogin(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Smtp\SmtpClient $oSmtpClient, \RainLoop\Config\Application $oConfig, bool &$bUsePhpMail = false) : bool
public function SmtpConnectAndLogin(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Smtp\SmtpClient $oSmtpClient) : bool
{
$oSettings = $this->Domain()->SmtpSettings();
$oSettings->Login = $this->OutLogin();
$oSettings->usePhpMail = $bUsePhpMail;
$oSettings->Ehlo = \MailSo\Smtp\SmtpClient::EhloHelper();
$oPlugins->RunHook('smtp.before-connect', array($this, $oSmtpClient, $oSettings));
if ($oSettings->usePhpMail) {
$bUsePhpMail = true;
$oSmtpClient->Settings = $oSettings;
return true;
}
$oSmtpClient->Connect($oSettings, $oSettings->Ehlo);