Update changelog, CS fixes

2 files changed, 18 insertions, 16 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82d310b78..0f9303ee4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Advanced mail search syntax with more possibilities (without UI) (#8502)
 - Support for HAproxy protocol header in IMAP connections (#8625)
 - Enigma: Support Kolab's Web Of Anti-Trust feature (#8626)
+- Managesieve: Support Sieverules disabled rule format (#8571)
 - Remove use of utf8_encode() and utf8_decode() functions deprecated in PHP 8.2
 - Fix various PHP 8.1 warnings (#8628, #8644, #8667, #8656, #8647)
 - Password: Remove references to %c variable that has been removed before (#8633)
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
index 3acd2e648..6c40b0baa 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
@@ -1510,32 +1510,33 @@ class rcube_sieve_script
             return;
         }
 
-        if (!empty($rule["tests"])) {
-            foreach ($rule["tests"] as &$test) {
-                $test["test"] = $test["type"];
+        if (!empty($rule['tests'])) {
+            foreach ($rule['tests'] as &$test) {
+                $test['test'] = $test['type'];
 
-                if (isset($test["operator"])) {
-                    $test["type"] = $test["operator"];
-                    unset($test["operator"]);
+                if (isset($test['operator'])) {
+                    $test['type'] = $test['operator'];
+                    unset($test['operator']);
                 }
 
-                if (isset($test["header"])) {
-                    $test["arg1"] = $test["header"];
-                    unset($test["header"]);
-                    $test["arg2"] = $test["target"];
-                    unset($test["target"]);
+                if (isset($test['header'])) {
+                    $test['arg1'] = $test['header'];
+                    unset($test['header']);
+                    $test['arg2'] = $test['target'];
+                    unset($test['target']);
                 }
             }
         }
 
-        if (!empty($rule["actions"])) {
-            foreach ($rule["actions"] as &$action) {
-                if ($action["type"] == "vacation") {
-                    $action["reason"] = $action["msg"];
-                    unset($action["msg"]);
+        if (!empty($rule['actions'])) {
+            foreach ($rule['actions'] as &$action) {
+                if ($action['type'] == 'vacation') {
+                    $action['reason'] = $action['msg'];
+                    unset($action['msg']);
                 }
             }
         }
+
         $this->content[] = $rule;
     }
 }