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

Cleanup MailSo MailClient using __call()

Browse source
This commit is contained in:
the-djmaze 2022-10-31 11:50:29 +01:00
parent 2c54b0caf0
commit 2ef9b22385
2 changed files with 11 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

67
snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
View file

@ -28,7 +28,7 @@ class MailClient
/** /**
* @var \MailSo\Log\Logger * @var \MailSo\Log\Logger
*/ */
private $oLogger; private $oLogger = null;
/** /**
* @var \MailSo\Imap\ImapClient * @var \MailSo\Imap\ImapClient
@ -37,8 +37,6 @@ class MailClient
function __construct() function __construct()
{ {
$this->oLogger = null;
$this->oImapClient = new \MailSo\Imap\ImapClient; $this->oImapClient = new \MailSo\Imap\ImapClient;
$this->oImapClient->SetTimeOuts(10, \MailSo\Config::$ImapTimeout); $this->oImapClient->SetTimeOuts(10, \MailSo\Config::$ImapTimeout);
} }
@ -48,31 +46,6 @@ class MailClient
return $this->oImapClient; return $this->oImapClient;
} }
/**
* @throws \MailSo\RuntimeException
* @throws \MailSo\Net\Exceptions\*
*/
public function Disconnect() : self
{
$this->oImapClient->Disconnect();
return $this;
}
public function IsConnected() : bool
{
return $this->oImapClient->IsConnected();
}
public function IsLoggined() : bool
{
return $this->oImapClient->IsLoggined();
}
public function Capabilities() : array
{
return $this->oImapClient->Capability();
}
private function getEnvelopeOrHeadersRequestString() : string private function getEnvelopeOrHeadersRequestString() : string
{ {
if (\MailSo\Config::$MessageAllHeaders) if (\MailSo\Config::$MessageAllHeaders)
@ -1016,16 +989,6 @@ class MailClient
return $oMessageCollection; return $oMessageCollection;
} }
public function Quota(string $sRootName = '') : ?array
{
return $this->oImapClient->Quota($sRootName);
}
public function QuotaRoot(string $sFolderName = 'INBOX') : ?array
{
return $this->oImapClient->QuotaRoot($sFolderName);
}
public function FindMessageUidByMessageId(string $sFolderName, string $sMessageId) : ?int public function FindMessageUidByMessageId(string $sFolderName, string $sMessageId) : ?int
{ {
if (!\strlen($sMessageId)) if (!\strlen($sMessageId))
@ -1297,39 +1260,27 @@ class MailClient
/** /**
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */
public function SetLogger(\MailSo\Log\Logger $oLogger) : self public function SetLogger(\MailSo\Log\Logger $oLogger) : void
{ {
$this->oLogger = $oLogger; $this->oLogger = $oLogger;
$this->oImapClient->SetLogger($this->oLogger); $this->oImapClient->SetLogger($oLogger);
return $this;
} }
public function GetNamespace() : string public function GetPersonalNamespace() : string
{ {
$oNamespace = $this->oImapClient->GetNamespace(); $oNamespace = $this->oImapClient->GetNamespace();
return $oNamespace ? $oNamespace->GetPersonalNamespace() : ''; return $oNamespace ? $oNamespace->GetPersonalNamespace() : '';
} }
public function __call(string $name, array $arguments) /*: mixed*/
{
return $this->oImapClient->{$name}(...$arguments);
}
/** /**
* RFC 5464 * RFC 5464
*/ */
public function ServerGetMetadata(array $aEntries, array $aOptions = []) : array
{
return $this->oImapClient->ServerGetMetadata($aEntries, $aOptions);
}
public function FolderGetMetadata(string $sFolderName, array $aEntries, array $aOptions = []) : array
{
return $this->oImapClient->FolderGetMetadata($sFolderName, $aEntries, $aOptions);
}
public function FolderSetMetadata(string $sFolderName, array $aEntries) : void
{
$this->oImapClient->FolderSetMetadata($sFolderName, $aEntries);
}
public function FolderDeleteMetadata($sFolderName, array $aEntries) : void public function FolderDeleteMetadata($sFolderName, array $aEntries) : void
{ {
$this->oImapClient->FolderSetMetadata($sFolderName, \array_fill_keys(\array_keys($aEntries), null)); $this->oImapClient->FolderSetMetadata($sFolderName, \array_fill_keys(\array_keys($aEntries), null));

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

@ -64,7 +64,7 @@ trait Folders
if ($oFolderCollection) if ($oFolderCollection)
{ {
$sNamespace = $this->MailClient()->GetNamespace(); $sNamespace = $this->MailClient()->GetPersonalNamespace();
$this->Plugins()->RunHook('filter.folders-post', array($oAccount, $oFolderCollection)); $this->Plugins()->RunHook('filter.folders-post', array($oAccount, $oFolderCollection));
@ -186,7 +186,7 @@ trait Folders
} }
} }
$aCapabilities = \array_filter($this->MailClient()->Capabilities(), function($item){ $aCapabilities = \array_filter($this->MailClient()->Capability(), function($item){
return !\preg_match('/^(IMAP|AUTH|LOGIN|SASL)/', $item); return !\preg_match('/^(IMAP|AUTH|LOGIN|SASL)/', $item);
}); });
if (!$this->Config()->Get('imap', 'use_list_status', true)) { if (!$this->Config()->Get('imap', 'use_list_status', true)) {