Rename ManageSieveClient to SieveClient

This commit is contained in:
the-djmaze 2022-11-11 15:50:15 +01:00
parent ff065378ab
commit 2ac376d582
5 changed files with 9 additions and 9 deletions

View file

@ -111,25 +111,25 @@ $Plugin->addHook('hook.name', 'functionName');
### sieve.before-connect ### sieve.before-connect
params: params:
\RainLoop\Model\Account $oAccount \RainLoop\Model\Account $oAccount
\MailSo\Sieve\ManageSieveClient $oSieveClient \MailSo\Sieve\SieveClient $oSieveClient
\MailSo\Sieve\Settings $oSettings \MailSo\Sieve\Settings $oSettings
### sieve.after-connect ### sieve.after-connect
params: params:
\RainLoop\Model\Account $oAccount \RainLoop\Model\Account $oAccount
\MailSo\Sieve\ManageSieveClient $oSieveClient \MailSo\Sieve\SieveClient $oSieveClient
\MailSo\Sieve\Settings $oSettings \MailSo\Sieve\Settings $oSettings
### sieve.before-login ### sieve.before-login
params: params:
\RainLoop\Model\Account $oAccount \RainLoop\Model\Account $oAccount
\MailSo\Sieve\ManageSieveClient $oSieveClient \MailSo\Sieve\SieveClient $oSieveClient
\MailSo\Sieve\Settings $oSettings \MailSo\Sieve\Settings $oSettings
### sieve.after-login ### sieve.after-login
params: params:
\RainLoop\Model\Account $oAccount \RainLoop\Model\Account $oAccount
\MailSo\Sieve\ManageSieveClient $oSieveClient \MailSo\Sieve\SieveClient $oSieveClient
bool $bSuccess bool $bSuccess
\MailSo\Sieve\Settings $oSettings \MailSo\Sieve\Settings $oSettings

View file

@ -17,7 +17,7 @@ use MailSo\Net\Enumerations\ConnectionSecurityType;
* @category MailSo * @category MailSo
* @package Sieve * @package Sieve
*/ */
class ManageSieveClient extends \MailSo\Net\NetClient class SieveClient extends \MailSo\Net\NetClient
{ {
/** /**
* @var bool * @var bool

View file

@ -352,7 +352,7 @@ class ActionsAdmin extends Actions
{ {
try try
{ {
$oSieveClient = new \MailSo\Sieve\ManageSieveClient(); $oSieveClient = new \MailSo\Sieve\SieveClient();
$oSieveClient->SetLogger($this->Logger()); $oSieveClient->SetLogger($this->Logger());
$oSieveClient->SetTimeOuts($iConnectionTimeout); $oSieveClient->SetTimeOuts($iConnectionTimeout);

View file

@ -251,7 +251,7 @@ abstract class Account implements \JsonSerializable
return $this->netClientLogin($oSmtpClient, $oPlugins, $oSettings); return $this->netClientLogin($oSmtpClient, $oPlugins, $oSettings);
} }
public function SieveConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Sieve\ManageSieveClient $oSieveClient, \RainLoop\Config\Application $oConfig) public function SieveConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Sieve\SieveClient $oSieveClient, \RainLoop\Config\Application $oConfig)
{ {
$oSettings = $this->Domain()->SieveSettings(); $oSettings = $this->Domain()->SieveSettings();
$oSettings->Login = $this->IncLogin(); $oSettings->Login = $this->IncLogin();

View file

@ -29,9 +29,9 @@ class SieveStorage implements FiltersInterface
$this->oConfig = $oConfig; $this->oConfig = $oConfig;
} }
protected function getConnection(\RainLoop\Model\Account $oAccount) : ?\MailSo\Sieve\ManageSieveClient protected function getConnection(\RainLoop\Model\Account $oAccount) : ?\MailSo\Sieve\SieveClient
{ {
$oSieveClient = new \MailSo\Sieve\ManageSieveClient(); $oSieveClient = new \MailSo\Sieve\SieveClient();
$oSieveClient->SetLogger($this->oLogger); $oSieveClient->SetLogger($this->oLogger);
$oSieveClient->SetTimeOuts(10, (int) \RainLoop\Api::Config()->Get('labs', 'sieve_timeout', 10)); $oSieveClient->SetTimeOuts(10, (int) \RainLoop\Api::Config()->Get('labs', 'sieve_timeout', 10));
return $oAccount->SieveConnectAndLoginHelper($this->oPlugins, $oSieveClient, $this->oConfig) return $oAccount->SieveConnectAndLoginHelper($this->oPlugins, $oSieveClient, $this->oConfig)