[UDP] Sieve: Update henrique-borba/php-sieve-manager to 1.0.6

josaphatim · Jul 25, 2024 · 2bd205e · 2bd205e
1 parent 6ecc75d
commit 2bd205e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 24 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/modules/sievefilters/modules.php b/modules/sievefilters/modules.php
@@ -890,7 +890,7 @@ public function process() {
                 $custom_condition->addCriteria($cond);
             }
         }
-
+        
         foreach ($actions as $action) {
             if ($action->action == 'discard') {
                 $custom_condition->addAction(
@@ -909,51 +909,45 @@ public function process() {
             }
             if ($action->action == 'redirect') {
                 $custom_condition->addAction(
-                    new \PhpSieveManager\Filters\Actions\RedirectFilterAction([$action->value])
+                    new \PhpSieveManager\Filters\Actions\RedirectFilterAction(['address' => $action->value])
                 );
             }
             if ($action->action == 'flag') {
                 $custom_condition->addAction(
-                    new \PhpSieveManager\Filters\Actions\FlagFilterAction([$action->value])
+                    new \PhpSieveManager\Filters\Actions\FlagFilterAction(['flags' => [$action->value]])
                 );
             }
-            if ($action->action == 'addflag') {
-                $filter->addRequirement('imap4flags');
+            if ($action->action == 'addflag') {                
                 $custom_condition->addAction(
-                    new \PhpSieveManager\Filters\Actions\AddFlagFilterAction([$action->value])
+                    new \PhpSieveManager\Filters\Actions\AddFlagFilterAction(['flags' => [$action->value]])
                 );
             }
             if ($action->action == 'removeflag') {
-                $filter->addRequirement('imap4flags');
                 $custom_condition->addAction(
-                    new \PhpSieveManager\Filters\Actions\RemoveFlagFilterAction([$action->value])
+                    new \PhpSieveManager\Filters\Actions\RemoveFlagFilterAction(['flags' => [$action->value]])
                 );
             }
             if ($action->action == 'move') {
-                $filter->addRequirement('fileinto');
                 $custom_condition->addAction(
-                    new \PhpSieveManager\Filters\Actions\FileIntoFilterAction([$action->value])
+                    new \PhpSieveManager\Filters\Actions\FileIntoFilterAction(['mailbox' => [$action->value]])
                 );
             }
             if ($action->action == 'reject') {
-                $filter->addRequirement('reject');
                 $custom_condition->addAction(
-                    new \PhpSieveManager\Filters\Actions\RejectFilterAction([$action->value])
+                    new \PhpSieveManager\Filters\Actions\RejectFilterAction(['reason' => $action->value])
                 );
             }
             if ($action->action == 'copy') {
-                $filter->addRequirement('fileinto');
                 $custom_condition->addAction(
-                    new \PhpSieveManager\Filters\Actions\FileIntoFilterAction([$action->value])
+                    new \PhpSieveManager\Filters\Actions\FileIntoFilterAction(['mailbox' => $action->value])
                 );
                 $custom_condition->addAction(
                     new \PhpSieveManager\Filters\Actions\KeepFilterAction()
                 );
             }
             if ($action->action == 'autoreply') {
-                $filter->addRequirement('vacation');
                 $custom_condition->addAction(
-                    new \PhpSieveManager\Filters\Actions\VacationFilterAction([$action->extra_option_value, $action->value])
+                    new \PhpSieveManager\Filters\Actions\VacationFilterAction(['reason' => $action->value, 'subject' => $action->extra_option_value])
                 );
             }
         }