fix(Felamimail/Json): deactive vacation script if end date expired

tine20 · Jan 10, 2023 · 9c8902a · 9c8902a
1 parent 1540cbc
commit 9c8902a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/tests/tine20/Felamimail/Frontend/JsonTest.php b/tests/tine20/Felamimail/Frontend/JsonTest.php
@@ -200,6 +200,23 @@ public function testSearchAccounts()
         }
     }
 
+    /**
+     * test search accounts and deactive sieve script if end date expired
+     */
+    public function testSearchAccountsCheckSieveEndDate()
+    {
+        $vacationData = self::getVacationData($this->_account);
+        $vacationData['start_date'] = '2012-04-18';
+        $vacationData['end_date'] = '2012-04-20';
+        $this->_sieveTestHelper($vacationData);
+
+        // check if script was deactivated
+        $results = $this->_json->searchAccounts(array());
+        $vacation = Felamimail_Controller_Sieve::getInstance()->getVacation($results['results'][0]['id']);
+        $this->assertFalse((bool)$results['results'][0]['sieve_vacation_active']);
+        $this->assertFalse((bool)$vacation['enabled']);
+    }
+
     /**
      * get system account
      *

diff --git a/tine20/Felamimail/Frontend/Json.php b/tine20/Felamimail/Frontend/Json.php
@@ -641,8 +641,14 @@ protected function _initAccounts(array $accounts): array
                     Felamimail_Controller_Account::getInstance()->autoCreateMoveNotifications($account);
                 }
 
-                // TODO auto-deactivate sieve vacation notifications if over due date
-
+                // auto-deactivate sieve vacation notifications if over due date
+                $vacation = Felamimail_Controller_Sieve::getInstance()->getVacation($account['id']);
+                if ($vacation['end_date'] instanceof Tinebase_DateTime && Tinebase_DateTime::now()->compare($vacation['end_date']) === 1) {
+                    $vacation->enabled = false;
+                    Felamimail_Controller_Sieve::getInstance()->setSieveScript($account['id'], $vacation, null);
+                    $account = Felamimail_Controller_Account::getInstance()->get($account['id']);
+                }
+
                 $accounts[$idx] = $this->_recordToJson($account);
             }
         }