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

Rename OutConnectAndLoginHelper to SmtpConnectAndLoginHelper

Browse source 
Rename IncConnectAndLoginHelper to ImapConnectAndLoginHelper
This commit is contained in:
the-djmaze 2022-07-21 18:37:37 +02:00
parent b77ffc1786
commit a5caae8991
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1231,7 +1231,7 @@ class Actions
$oAccount = $this->getAccountFromToken();
try {
$oAccount->IncConnectAndLoginHelper($this->oPlugins, $this->MailClient(), $this->oConfig);
$oAccount->ImapConnectAndLoginHelper($this->oPlugins, $this->MailClient(), $this->oConfig);
} catch (\MailSo\Net\Exceptions\ConnectionException $oException) {
throw new Exceptions\ClientException(Notifications::ConnectionError, $oException);
} catch (\Throwable $oException) {

2
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
View file

@ -790,7 +790,7 @@ trait Messages
$oSmtpClient->SetTimeOuts(10, (int) \RainLoop\Api::Config()->Get('labs', 'smtp_timeout', 60));
$bUsePhpMail = false;
$oAccount->OutConnectAndLoginHelper($this->Plugins(), $oSmtpClient, $this->Config(), $bUsePhpMail);
$oAccount->SmtpConnectAndLoginHelper($this->Plugins(), $oSmtpClient, $this->Config(), $bUsePhpMail);
if ($bUsePhpMail)
{

2
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
View file

@ -434,7 +434,7 @@ trait UserAuth
protected function CheckMailConnection(Account $oAccount, bool $bAuthLog = false): void
{
try {
$oAccount->IncConnectAndLoginHelper($this->Plugins(), $this->MailClient(), $this->Config());
$oAccount->ImapConnectAndLoginHelper($this->Plugins(), $this->MailClient(), $this->Config());
} catch (ClientException $oException) {
throw $oException;
} catch (\MailSo\Net\Exceptions\ConnectionException $oException) {

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

@ -195,7 +195,7 @@ abstract class Account implements \JsonSerializable
return null;
}
public function IncConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Mail\MailClient $oMailClient, \RainLoop\Config\Application $oConfig) : bool
public function ImapConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Mail\MailClient $oMailClient, \RainLoop\Config\Application $oConfig) : bool
{
$oImapClient = $oMailClient->ImapClient();
$oImapClient->__FORCE_SELECT_ON_EXAMINE__ = !!$oConfig->Get('labs', 'use_imap_force_selection');
@ -230,7 +230,7 @@ abstract class Account implements \JsonSerializable
return $this->netClientLogin($oImapClient, $oConfig, $oPlugins, $aCredentials);
}
public function OutConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Smtp\SmtpClient $oSmtpClient, \RainLoop\Config\Application $oConfig, bool &$bUsePhpMail = false) : bool
public function SmtpConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Smtp\SmtpClient $oSmtpClient, \RainLoop\Config\Application $oConfig, bool &$bUsePhpMail = false) : bool
{
$aCredentials = \array_merge(
$this->Domain()->SmtpSettings(),