Fix bug where text: syntax was forced for strings longer than 1024 characters (#6143)

CHANGELOG

@@ -65,6 +65,7 @@ CHANGELOG Roundcube Webmail
 - Fix touch event issue on messages list in IE/Edge (#5781)
 - Fix so links over images are not removed in plain text signatures converted from HTML (#4473)
 - Fix various issues when downloading files with names containing non-ascii chars, use RFC 2231 (#5772)
+- Managesieve: Fix bug where text: syntax was forced for strings longer than 1024 characters (#6143)
 
 RELEASE 1.3.4
 -------------

plugins/managesieve/Changelog

@@ -3,6 +3,7 @@
 - Support filter action with custom IMAP flags (#6011)
 - Support 'mime' extension tests - RFC5703 (#5832)
 - Support Elastic skin
+- Fix bug where text: syntax was forced for strings longer than 1024 characters (#6143)
 
 * version 9.0 [2017-10-02]
 -----------------------------------------------------------

plugins/managesieve/lib/Roundcube/rcube_sieve_script.php

@@ -1166,7 +1166,7 @@ class rcube_sieve_script
         }
 
         // multi-line string
-        if (preg_match('/[\r\n\0]/', $str) || strlen($str) > 1024) {
+        if (preg_match('/[\r\n\0]/', $str)) {
             return sprintf("text:\n%s\n.\n", self::escape_multiline_string($str));
         }
         // quoted-string

plugins/managesieve/tests/src/parser

@@ -50,3 +50,9 @@ if envelope :domain :is "From" "domain.tld"
 	fileinto "domain.tld";
 	stop;
 }
+# rule:[do not wrap long lines]
+if envelope :domain :is "From" "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
+{
+	fileinto "domain.tld";
+	stop;
+}

plugins/managesieve/tests/src/parser.out

@@ -50,3 +50,9 @@ if envelope :domain :is "From" "domain.tld"
 	fileinto "domain.tld";
 	stop;
 }
+# rule:[do not wrap long lines]
+if envelope :domain :is "From" "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
+{
+	fileinto "domain.tld";
+	stop;
+}