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

changes for #884

Browse source
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
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
View file

@ -236,16 +236,15 @@ abstract class Account implements \JsonSerializable
return $this->netClientLogin($oImapClient, $oPlugins, $oSettings); 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 = $this->Domain()->SmtpSettings();
$oSettings->Login = $this->OutLogin(); $oSettings->Login = $this->OutLogin();
$oSettings->usePhpMail = $bUsePhpMail;
$oSettings->Ehlo = \MailSo\Smtp\SmtpClient::EhloHelper(); $oSettings->Ehlo = \MailSo\Smtp\SmtpClient::EhloHelper();
$oPlugins->RunHook('smtp.before-connect', array($this, $oSmtpClient, $oSettings)); $oPlugins->RunHook('smtp.before-connect', array($this, $oSmtpClient, $oSettings));
if ($oSettings->usePhpMail) { if ($oSettings->usePhpMail) {
$bUsePhpMail = true; $oSmtpClient->Settings = $oSettings;
return true; return true;
} }
$oSmtpClient->Connect($oSettings, $oSettings->Ehlo); $oSmtpClient->Connect($oSettings, $oSettings->Ehlo);