From 234e5a5014e89d722995f77f5d6ebf64afda6a8b Mon Sep 17 00:00:00 2001 From: djmaze Date: Wed, 11 Mar 2020 15:46:56 +0100 Subject: [PATCH] Resolve issue with ->SetLogger() due to function return type issue --- rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php | 12 ++++++++---- .../RainLoop/Providers/Filters/SieveStorage.php | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index 43c8159f5..d4e5a19bf 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -3503,7 +3503,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack { try { - $oImapClient = \MailSo\Imap\ImapClient::NewInstance()->SetLogger($this->Logger()); + $oImapClient = \MailSo\Imap\ImapClient::NewInstance(); + $oImapClient->SetLogger($this->Logger()); $oImapClient->SetTimeOuts($iConnectionTimeout); $iTime = \microtime(true); @@ -3544,7 +3545,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack { try { - $oSmtpClient = \MailSo\Smtp\SmtpClient::NewInstance()->SetLogger($this->Logger()); + $oSmtpClient = \MailSo\Smtp\SmtpClient::NewInstance(); + $oSmtpClient->SetLogger($this->Logger()); $oSmtpClient->SetTimeOuts($iConnectionTimeout); $iTime = \microtime(true); @@ -3578,7 +3580,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack { try { - $oSieveClient = \MailSo\Sieve\ManageSieveClient::NewInstance()->SetLogger($this->Logger()); + $oSieveClient = \MailSo\Sieve\ManageSieveClient::NewInstance(); + $oSieveClient->SetLogger($this->Logger()); $oSieveClient->SetTimeOuts($iConnectionTimeout); $oSieveClient->__USE_INITIAL_AUTH_PLAIN_COMMAND = !!$this->Config()->Get('labs', 'sieve_auth_plain_initial', true); @@ -5402,7 +5405,8 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack $bUsePhpMail = $oAccount->Domain()->OutUsePhpMail(); - $oSmtpClient = \MailSo\Smtp\SmtpClient::NewInstance()->SetLogger($this->Logger()); + $oSmtpClient = \MailSo\Smtp\SmtpClient::NewInstance(); + $oSmtpClient->SetLogger($this->Logger()); $oSmtpClient->SetTimeOuts(10, (int) \RainLoop\Api::Config()->Get('labs', 'smtp_timeout', 60)); $bLoggined = $oAccount->OutConnectAndLoginHelper( diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php index 336eeaded..0ed8d9f0b 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php @@ -49,7 +49,8 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface $aModules = array(); $aFilters = array(); - $oSieveClient = \MailSo\Sieve\ManageSieveClient::NewInstance()->SetLogger($this->oLogger); + $oSieveClient = \MailSo\Sieve\ManageSieveClient::NewInstance(); + $oSieveClient->SetLogger($this->oLogger); $oSieveClient->SetTimeOuts(10, (int) $this->oConfig->Get('labs', 'sieve_timeout', 10)); if ($oAccount->SieveConnectAndLoginHelper($this->oPlugins, $oSieveClient, $this->oConfig)) @@ -100,7 +101,8 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface public function Save(\RainLoop\Model\Account $oAccount, array $aFilters, string $sRaw = '', bool $bRawIsActive = false) : bool { - $oSieveClient = \MailSo\Sieve\ManageSieveClient::NewInstance()->SetLogger($this->oLogger); + $oSieveClient = \MailSo\Sieve\ManageSieveClient::NewInstance(); + $oSieveClient->SetLogger($this->oLogger); $oSieveClient->SetTimeOuts(10, (int) \RainLoop\Api::Config()->Get('labs', 'sieve_timeout', 10)); if ($oAccount->SieveConnectAndLoginHelper($this->oPlugins, $oSieveClient, $this->oConfig))