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

Support regex extension (SIEVE) (#1043)

Browse source 
+ Update jquery
This commit is contained in:
RainLoop Team 2016-05-27 00:38:39 +03:00
parent 2fefad437e
commit c0ab236440
8 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionType.php
View file

@ -8,6 +8,7 @@ class ConditionType
const NOT_EQUAL_TO = 'NotEqualTo';
const CONTAINS = 'Contains';
const NOT_CONTAINS = 'NotContains';
const REGEX = 'Regex';
const OVER = 'Over';
const UNDER = 'Under';
}

15
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
View file

@ -96,6 +96,9 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
'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),
@ -161,7 +164,7 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
*
* @return string
*/
private function conditionToSieveScript($oCondition)
private function conditionToSieveScript($oCondition, &$aCapa)
{
$sResult = '';
$sTypeWord = '';
@ -192,6 +195,10 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
case \RainLoop\Providers\Filters\Enumerations\ConditionType::CONTAINS:
$sTypeWord = ':contains';
break;
case \RainLoop\Providers\Filters\Enumerations\ConditionType::REGEX:
$sTypeWord = ':regex';
$aCapa['regex'] = true;
break;
default:
$bTrue = false;
$sResult = '/* @Error: unknown type value */ false';
@ -284,7 +291,7 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
foreach ($aConditions as $oCond)
{
$bTrim = true;
$sCons = $this->conditionToSieveScript($oCond);
$sCons = $this->conditionToSieveScript($oCond, $aCapa);
if (!empty($sCons))
{
$aResult[] = $sTab.$sCons.',';
@ -302,7 +309,7 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
$aResult[] = 'if allof(';
foreach ($aConditions as $oCond)
{
$aResult[] = $sTab.$this->conditionToSieveScript($oCond).',';
$aResult[] = $sTab.$this->conditionToSieveScript($oCond, $aCapa).',';
}
$aResult[\count($aResult) - 1] = \rtrim($aResult[\count($aResult) - 1], ',');
@ -311,7 +318,7 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
}
else if (1 === \count($aConditions))
{
$aResult[] = 'if '.$this->conditionToSieveScript($aConditions[0]).'';
$aResult[] = 'if '.$this->conditionToSieveScript($aConditions[0], $aCapa).'';
}
else
{