From aa3f71d299d070cb1f0edcff2411510956c72b00 Mon Sep 17 00:00:00 2001 From: djmaze Date: Tue, 15 Sep 2020 15:27:15 +0200 Subject: [PATCH] Bugfix: MailSo ResponseCollection undefined oLogger Bugfix: MailSo cache driver file, no need for double mkdir() --- .../0.0.0/app/libraries/MailSo/Cache/Drivers/File.php | 11 +++-------- .../v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php | 2 +- .../app/libraries/MailSo/Imap/ResponseCollection.php | 6 +++--- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php b/rainloop/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php index 999b1470f..9a1d8564a 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php @@ -92,15 +92,10 @@ class File implements \MailSo\Cache\DriverInterface $sKeyPath = \substr($sKeyPath, 0, 2).'/'.\substr($sKeyPath, 2, 2).'/'.$sKeyPath; $sFilePath = $this->sCacheFolder.$this->sKeyPrefix.$sKeyPath; - if ($bMkDir && !\is_dir(\dirname($sFilePath))) + $dir = \dirname($sFilePath); + if ($bMkDir && !\is_dir($dir) && !\mkdir($dir, 0755, true)) { - if (!\mkdir(\dirname($sFilePath), 0755, true)) - { - if (!\mkdir(\dirname($sFilePath), 0755, true)) - { - $sFilePath = ''; - } - } + $sFilePath = ''; } } diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php index 2c4d38528..9ea88e869 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php @@ -578,7 +578,7 @@ class ImapClient extends \MailSo\Net\NetClient $this->aFetchCallbacks = array(); } - return $oResult->getFetchResult(); + return $oResult->getFetchResult($this->oLogger); } /** diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php index 7796b2f4d..43e46c489 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php @@ -76,15 +76,15 @@ class ResponseCollection extends \MailSo\Base\Collection return null; } - public function getFetchResult() : array + public function getFetchResult($oLogger) : array { $aReturn = array(); foreach ($this as $oResponse) { if (FetchResponse::IsValidFetchImapResponse($oResponse)) { if (FetchResponse::IsNotEmptyFetchImapResponse($oResponse)) { $aReturn[] = new FetchResponse($oResponse); - } else if ($this->oLogger) { - $this->oLogger->Write('Skipped Imap Response! ['.$oResponse->ToLine().']', \MailSo\Log\Enumerations\Type::NOTICE); + } else if ($oLogger) { + $oLogger->Write('Skipped Imap Response! ['.$oResponse->ToLine().']', \MailSo\Log\Enumerations\Type::NOTICE); } } }