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

https://github.com/RainLoop/rainloop-webmail/pull/2012

Browse source
This commit is contained in:
djmaze 2020-09-12 14:08:18 +02:00
parent 99bd895090
commit 39e9ecd4f2
6 changed files with 66 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -320,11 +320,17 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
switch ($oFilter->ActionType()) switch ($oFilter->ActionType())
{ {
case \RainLoop\Providers\Filters\Enumerations\ActionType::NONE: case \RainLoop\Providers\Filters\Enumerations\ActionType::NONE:
$aResult[] = $sTab.'stop;'; if ($oFilter->Stop())
{
$aResult[] = $sTab.'stop;';
}
break; break;
case \RainLoop\Providers\Filters\Enumerations\ActionType::DISCARD: case \RainLoop\Providers\Filters\Enumerations\ActionType::DISCARD:
$aResult[] = $sTab.'discard;'; $aResult[] = $sTab.'discard;';
$aResult[] = $sTab.'stop;'; if ($oFilter->Stop())
{
$aResult[] = $sTab.'stop;';
}
break; break;
case \RainLoop\Providers\Filters\Enumerations\ActionType::VACATION: case \RainLoop\Providers\Filters\Enumerations\ActionType::VACATION:
$sValue = \trim($oFilter->ActionValue()); $sValue = \trim($oFilter->ActionValue());
@ -383,7 +389,10 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
$aCapa['reject'] = true; $aCapa['reject'] = true;
$aResult[] = $sTab.'reject "'.$this->quote($sValue).'";'; $aResult[] = $sTab.'reject "'.$this->quote($sValue).'";';
$aResult[] = $sTab.'stop;'; if ($oFilter->Stop())
{
$aResult[] = $sTab.'stop;';
}
} }
else else
{ {
@ -401,7 +410,10 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
} }
$aResult[] = $sTab.'redirect "'.$this->quote($sValue).'";'; $aResult[] = $sTab.'redirect "'.$this->quote($sValue).'";';
$aResult[] = $sTab.'stop;'; if ($oFilter->Stop())
{
$aResult[] = $sTab.'stop;';
}
} }
else else
{ {
@ -422,7 +434,10 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
$aCapa['fileinto'] = true; $aCapa['fileinto'] = true;
$aResult[] = $sTab.'fileinto "'.$this->quote($sFolderName).'";'; $aResult[] = $sTab.'fileinto "'.$this->quote($sFolderName).'";';
$aResult[] = $sTab.'stop;'; if ($oFilter->Stop())
{
$aResult[] = $sTab.'stop;';
}
} }
else else
{ {

11
rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionDiscard.html
View file

@ -0,0 +1,11 @@
<div class="control-group" data-bind="css: {'error': actionValue.error}" style="margin-bottom: 0">
<div class="controls">
<div data-bind="component: {
name: 'Checkbox',
params: {
label: 'POPUPS_FILTER/STOP_LABEL',
value: actionNoStop
}
}"></div>
</div>
</div>

7
rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
View file

@ -20,5 +20,12 @@
value: actionMarkAsRead value: actionMarkAsRead
} }
}"></div> }"></div>
<div data-bind="component: {
name: 'Checkbox',
params: {
label: 'POPUPS_FILTER/STOP_LABEL',
value: actionNoStop
}
}"></div>
</div> </div>
</div> </div>

7
rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
View file

@ -13,5 +13,12 @@
value: actionMarkAsRead value: actionMarkAsRead
} }
}"></div> }"></div>
<div data-bind="component: {
name: 'Checkbox',
params: {
label: 'POPUPS_FILTER/STOP_LABEL',
value: actionNoStop
}
}"></div>
</div> </div>
</div> </div>

11
rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionNone.html
View file

@ -0,0 +1,11 @@
<div class="control-group" data-bind="css: {'error': actionValue.error}" style="margin-bottom: 0">
<div class="controls">
<div data-bind="component: {
name: 'Checkbox',
params: {
label: 'POPUPS_FILTER/STOP_LABEL',
value: actionNoStop
}
}"></div>
</div>
</div>

7
rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
View file

@ -2,5 +2,12 @@
<div class="controls"> <div class="controls">
<textarea class="span5 i18n" data-bind="value: actionValue" style="height: 100px;" <textarea class="span5 i18n" data-bind="value: actionValue" style="height: 100px;"
data-i18n="[placeholder]POPUPS_FILTER/REJECT_MESSAGE_LABEL"></textarea> data-i18n="[placeholder]POPUPS_FILTER/REJECT_MESSAGE_LABEL"></textarea>
<div data-bind="component: {
name: 'Checkbox',
params: {
label: 'POPUPS_FILTER/STOP_LABEL',
value: actionNoStop
}
}"></div>
</div> </div>
</div> </div>