Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-09 17:37:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prepare Sieve Filtering feature for advanced editing/handling

Browse source
This commit is contained in:
djmaze 2021-01-06 01:06:16 +01:00
parent 4e1722560f
commit e023a5d6ab
4 changed files with 72 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

62
snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
View file

@ -41,61 +41,53 @@ class SieveStorage implements FiltersInterface
public function Load(\RainLoop\Model\Account $oAccount, bool $bAllowRaw = false) : array
{
$sRaw = '';
$bBasicIsActive = false;
$bRawIsActive = false;
$aModules = array();
$aFilters = array();
$aScripts = array();
$oSieveClient = new \MailSo\Sieve\ManageSieveClient();
$oSieveClient->SetLogger($this->oLogger);
$oSieveClient->SetTimeOuts(10, (int) $this->oConfig->Get('labs', 'sieve_timeout', 10));
if ($oAccount->SieveConnectAndLoginHelper($this->oPlugins, $oSieveClient, $this->oConfig))
{
if ($oAccount->SieveConnectAndLoginHelper($this->oPlugins, $oSieveClient, $this->oConfig)) {
$aModules = $oSieveClient->Modules();
$aList = $oSieveClient->ListScripts();
if (0 < \count($aList))
{
if (isset($aList[self::SIEVE_FILE_NAME]))
{
$bBasicIsActive = !!$aList[self::SIEVE_FILE_NAME];
$sS = $oSieveClient->GetScript(self::SIEVE_FILE_NAME);
if ($sS)
{
$aFilters = $this->fileStringToCollection($sS);
}
if (!empty($aList[self::SIEVE_FILE_NAME])) {
$sS = $oSieveClient->GetScript(self::SIEVE_FILE_NAME);
if ($sS) {
$aFilters = $this->fileStringToCollection($sS);
}
}
if ($bAllowRaw && isset($aList[self::SIEVE_FILE_NAME_RAW]))
{
$bRawIsActive = !!$aList[self::SIEVE_FILE_NAME_RAW];
$sRaw = \trim($oSieveClient->GetScript(self::SIEVE_FILE_NAME_RAW));
if ($bAllowRaw) {
foreach ($aList as $name => $active) {
if ($name != self::SIEVE_FILE_NAME) {
$aScripts[$name] = array(
'name' => $name,
'active' => $active,
'body' => $oSieveClient->GetScript($name) // \trim() ?
);
}
}
}
$oSieveClient->LogoutAndDisconnect();
}
if (!isset($aList[self::SIEVE_FILE_NAME_RAW])) {
$aScripts[$name] = array(
'name' => self::SIEVE_FILE_NAME_RAW,
'active' => false,
'body' => ''
);
}
return array(
'RawIsAllow' => $bAllowRaw,
'RawIsActive' => $bRawIsActive,
'Raw' => $bAllowRaw ? $sRaw : '',
'Filters' => !$bBasicIsActive && !$bRawIsActive ? array() : $aFilters,
'Capa' => $bAllowRaw ? $aModules : array(),
'Modules' => array(
'redirect' => \in_array('fileinto', $aModules),
'regex' => \in_array('regex', $aModules),
'relational' => \in_array('relational', $aModules),
'date' => \in_array('date', $aModules),
'moveto' => \in_array('fileinto', $aModules),
'reject' => \in_array('reject', $aModules),
'vacation' => \in_array('vacation', $aModules),
'markasread' => \in_array('imap4flags', $aModules)
)
'Filters' => $aFilters,
'Capa' => $aModules,
'Scripts' => $aScripts
);
}