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

Cleanup #884

Browse source
This commit is contained in:
the-djmaze 2023-01-28 08:28:40 +01:00
parent f862634143
commit 6666712bc9
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -228,6 +228,8 @@ abstract class Account implements \JsonSerializable
// $oSettings->body_text_limit = \min($oSettings->body_text_limit, (int) $oConfig->Get('imap', 'body_text_limit', 50)); // $oSettings->body_text_limit = \min($oSettings->body_text_limit, (int) $oConfig->Get('imap', 'body_text_limit', 50));
// $oSettings->thread_limit = \min($oSettings->thread_limit, (int) $oConfig->Get('imap', 'large_thread_limit', 50)); // $oSettings->thread_limit = \min($oSettings->thread_limit, (int) $oConfig->Get('imap', 'large_thread_limit', 50));
$oImapClient->Settings = $oSettings;
$oPlugins->RunHook('imap.before-connect', array($this, $oImapClient, $oSettings)); $oPlugins->RunHook('imap.before-connect', array($this, $oImapClient, $oSettings));
$oImapClient->Connect($oSettings); $oImapClient->Connect($oSettings);
$oPlugins->RunHook('imap.after-connect', array($this, $oImapClient, $oSettings)); $oPlugins->RunHook('imap.after-connect', array($this, $oImapClient, $oSettings));
@ -242,9 +244,11 @@ abstract class Account implements \JsonSerializable
$oSettings->Login = $this->OutLogin(); $oSettings->Login = $this->OutLogin();
$oSettings->Ehlo = \MailSo\Smtp\SmtpClient::EhloHelper(); $oSettings->Ehlo = \MailSo\Smtp\SmtpClient::EhloHelper();
$oSmtpClient->Settings = $oSettings;
$oPlugins->RunHook('smtp.before-connect', array($this, $oSmtpClient, $oSettings)); $oPlugins->RunHook('smtp.before-connect', array($this, $oSmtpClient, $oSettings));
if ($oSettings->usePhpMail) { if ($oSettings->usePhpMail) {
$oSmtpClient->Settings = $oSettings; $oSettings->useAuth = false;
return true; return true;
} }
$oSmtpClient->Connect($oSettings, $oSettings->Ehlo); $oSmtpClient->Connect($oSettings, $oSettings->Ehlo);
@ -254,7 +258,6 @@ abstract class Account implements \JsonSerializable
throw new RequireCredentialsException throw new RequireCredentialsException
} }
*/ */
$oSettings->useAuth = $oSettings->useAuth && !$oSettings->usePhpMail;
$oSettings->Password = $this->sSmtpPassword ?: $this->sPassword; $oSettings->Password = $this->sSmtpPassword ?: $this->sPassword;
return $this->netClientLogin($oSmtpClient, $oPlugins, $oSettings); return $this->netClientLogin($oSmtpClient, $oPlugins, $oSettings);
} }
@ -264,6 +267,8 @@ abstract class Account implements \JsonSerializable
$oSettings = $this->Domain()->SieveSettings(); $oSettings = $this->Domain()->SieveSettings();
$oSettings->Login = $this->IncLogin(); $oSettings->Login = $this->IncLogin();
$oSieveClient->Settings = $oSettings;
$oPlugins->RunHook('sieve.before-connect', array($this, $oSieveClient, $oSettings)); $oPlugins->RunHook('sieve.before-connect', array($this, $oSieveClient, $oSettings));
$oSieveClient->Connect($oSettings); $oSieveClient->Connect($oSettings);
$oPlugins->RunHook('sieve.after-connect', array($this, $oSieveClient, $oSettings)); $oPlugins->RunHook('sieve.after-connect', array($this, $oSieveClient, $oSettings));