From a2b638dc554e91cffd040a5d947a692a57bbaf97 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Sun, 26 Nov 2023 02:55:08 +0100
Subject: [PATCH] Remove all String.trim() from Sieve RainLoop script #1329

---
 dev/Sieve/Model/Script.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dev/Sieve/Model/Script.js b/dev/Sieve/Model/Script.js
index abce7e1b2..231bf22f4 100644
--- a/dev/Sieve/Model/Script.js
+++ b/dev/Sieve/Model/Script.js
@@ -17,8 +17,8 @@ function filtersToSieveScript(filters)
 			''
 		];
 
-	const quote = string => '"' + string.trim().replace(/(\\|")/g, '\\$1') + '"';
-	const StripSpaces = string => string.replace(/\s+/, ' ').trim();
+	const quote = string => '"' + string.replace(/(\\|")/g, '\\$1') + '"';
+	const StripSpaces = string => string.replace(/\s+/, ' ');
 
 	// conditionToSieveScript
 	const conditionToString = (condition, require) =>
@@ -26,8 +26,8 @@ function filtersToSieveScript(filters)
 		let result = '',
 			type = condition.type(),
 			field = condition.field(),
-			value = condition.value().trim(),
-			valueSecond = condition.valueSecond().trim();
+			value = condition.value(),
+			valueSecond = condition.valueSecond();
 
 		if (value.length && ('Header' !== field || valueSecond.length)) {
 			switch (type)
@@ -85,7 +85,7 @@ function filtersToSieveScript(filters)
 			}
 
 			if (('From' === field || 'Recipient' === field) && value.includes(',')) {
-				result += ' [' + value.split(',').map(value => quote(value)).join(', ').trim() + ']';
+				result += ' [' + value.split(',').map(value => quote(value)).join(', ') + ']';
 			} else if ('Size' === field) {
 				result += ' ' + value;
 			} else {
@@ -130,7 +130,7 @@ function filtersToSieveScript(filters)
 			result.push(sTab + 'addflag "\\\\Seen";');
 		}
 
-		let value = filter.actionValue().trim();
+		let value = filter.actionValue();
 		value = value.length ? quote(value) : 0;
 		switch (filter.actionType())
 		{
@@ -146,21 +146,21 @@ function filtersToSieveScript(filters)
 					let days = 1,
 						subject = '',
 						addresses = '',
-						paramValue = filter.actionValueSecond().trim();
+						paramValue = filter.actionValueSecond();
 
 					if (paramValue.length) {
 						subject = ':subject ' + quote(StripSpaces(paramValue)) + ' ';
 					}
 
-					paramValue = ('' + (filter.actionValueThird() || '')).trim();
+					paramValue = ('' + (filter.actionValueThird() || ''));
 					if (paramValue.length) {
 						days = Math.max(1, parseInt(paramValue, 10));
 					}
 
-					paramValue = ('' + (filter.actionValueFourth() || '')).trim()
+					paramValue = ('' + (filter.actionValueFourth() || ''))
 					if (paramValue.length) {
 						paramValue = paramValue.split(',').map(email =>
-							email.trim().length ? quote(email) : ''
+							email.length ? quote(email) : ''
 						).filter(email => email.length);
 						if (paramValue.length) {
 							addresses = ':addresses [' + paramValue.join(', ') + '] ';
@@ -286,7 +286,7 @@ export class SieveScriptModel extends AbstractModel
 	}
 
 	verify() {
-		this.nameError(!this.name().trim());
+		this.nameError(!this.name());
 		return !this.nameError();
 	}