From 39e9ecd4f2126fe0625d7c8e701ab833d9450d93 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Sat, 12 Sep 2020 14:08:18 +0200
Subject: [PATCH] https://github.com/RainLoop/rainloop-webmail/pull/2012

---
 .../Providers/Filters/SieveStorage.php        | 25 +++++++++++++++----
 .../User/SettingsFiltersActionDiscard.html    | 11 ++++++++
 .../User/SettingsFiltersActionForward.html    |  9 ++++++-
 .../SettingsFiltersActionMoveToFolder.html    |  9 ++++++-
 .../Views/User/SettingsFiltersActionNone.html | 11 ++++++++
 .../User/SettingsFiltersActionReject.html     |  9 ++++++-
 6 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
index 0e362f87b..40f731a3c 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
@@ -320,11 +320,17 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
 		switch ($oFilter->ActionType())
 		{
 			case \RainLoop\Providers\Filters\Enumerations\ActionType::NONE:
-				$aResult[] = $sTab.'stop;';
+				if ($oFilter->Stop())
+				{
+					$aResult[] = $sTab.'stop;';
+				}
 				break;
 			case \RainLoop\Providers\Filters\Enumerations\ActionType::DISCARD:
 				$aResult[] = $sTab.'discard;';
-				$aResult[] = $sTab.'stop;';
+				if ($oFilter->Stop())
+				{
+					$aResult[] = $sTab.'stop;';
+				}
 				break;
 			case \RainLoop\Providers\Filters\Enumerations\ActionType::VACATION:
 				$sValue = \trim($oFilter->ActionValue());
@@ -383,7 +389,10 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
 					$aCapa['reject'] = true;
 
 					$aResult[] = $sTab.'reject "'.$this->quote($sValue).'";';
-					$aResult[] = $sTab.'stop;';
+					if ($oFilter->Stop())
+					{
+						$aResult[] = $sTab.'stop;';
+					}
 				}
 				else
 				{
@@ -401,7 +410,10 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
 					}
 
 					$aResult[] = $sTab.'redirect "'.$this->quote($sValue).'";';
-					$aResult[] = $sTab.'stop;';
+					if ($oFilter->Stop())
+					{
+						$aResult[] = $sTab.'stop;';
+					}
 				}
 				else
 				{
@@ -422,7 +434,10 @@ class SieveStorage implements \RainLoop\Providers\Filters\FiltersInterface
 
 					$aCapa['fileinto'] = true;
 					$aResult[] = $sTab.'fileinto "'.$this->quote($sFolderName).'";';
-					$aResult[] = $sTab.'stop;';
+					if ($oFilter->Stop())
+					{
+						$aResult[] = $sTab.'stop;';
+					}
 				}
 				else
 				{
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionDiscard.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionDiscard.html
index e69de29bb..4eace6776 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionDiscard.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionDiscard.html
@@ -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>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
index e9da576f6..e465064f1 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionForward.html
@@ -20,5 +20,12 @@
 				value: actionMarkAsRead
 			}
 		}"></div>
+		<div data-bind="component: {
+			name: 'Checkbox',
+			params: {
+				label: 'POPUPS_FILTER/STOP_LABEL',
+				value: actionNoStop
+			}
+		}"></div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
index 0f32a1af7..44566d311 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionMoveToFolder.html
@@ -13,5 +13,12 @@
 				value: actionMarkAsRead
 			}
 		}"></div>
+		<div data-bind="component: {
+			name: 'Checkbox',
+			params: {
+				label: 'POPUPS_FILTER/STOP_LABEL',
+				value: actionNoStop
+			}
+		}"></div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionNone.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionNone.html
index e69de29bb..4eace6776 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionNone.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionNone.html
@@ -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>
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
index fbfaef0ef..29816cc6c 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionReject.html
@@ -2,5 +2,12 @@
 	<div class="controls">
 		<textarea class="span5 i18n" data-bind="value: actionValue" style="height: 100px;"
 			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>
\ No newline at end of file
+</div>