mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-08 22:18:28 +03:00
changes for #884
This commit is contained in:
parent
c6500dfe14
commit
e45959949c
1 changed files with 2 additions and 3 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue