[jan] Allow to set vaction with only start or end date, if Sieve date…

… extension is available.
horde · May 8, 2017 · 38efa90 · 38efa90
1 parent 103a1d8
commit 38efa90
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 13 deletions.
diff --git a/ingo/docs/CHANGES b/ingo/docs/CHANGES
@@ -2,6 +2,8 @@
 v4.0.0-git
 ----------
 
+[jan] Allow to set vaction with only start or end date, if Sieve date extension
+      is available.
 [jan] Add support for Sieve date extension to vacation messages (Request
       #12520).
 [mjr] Export active vacation messages via the timeObjects API (Request #10885).

diff --git a/ingo/lib/Script/Sieve/Action/Vacation.php b/ingo/lib/Script/Sieve/Action/Vacation.php
@@ -53,14 +53,14 @@ public function __construct($vars = array())
      */
     public function generate()
     {
-        if (empty($this->_vars['start']) || empty($this->_vars['end'])) {
-            return $this->_vacationCode();
-        }
-
         if ($this->_vars['date']) {
             return $this->_dateCheck();
         }
 
+        if (empty($this->_vars['start']) || empty($this->_vars['end'])) {
+            return $this->_vacationCode();
+        }
+
         return $this->_regexCheck();
     }
 
@@ -178,15 +178,39 @@ protected function _regexCheck()
      */
     protected function _dateCheck()
     {
-        return 'if allof ( currentdate :zone '
-            . date('O', $this->_vars['start']) . ' :value "ge" "date" "'
-            . date('Y-m-d', $this->_vars['start']) . "\",\n"
-            . '               currentdate :zone '
-            . date('O', $this->_vars['end']) . ' :value "le" "date" "'
-            . date('Y-m-d', $this->_vars['end']) . "\" ) {\n"
-            . '    '
-            . $this->_vacationCode()
-            . "\n    }";
+        $start = empty($this->_vars['start']) ? null : $this->_vars['start'];
+        $end = empty($this->_vars['end']) ? null : $this->_vars['end'];
+        $code = '';
+        if ($start || $end) {
+            $code .= 'if ';
+        }
+        if ($start && $end) {
+            $code .= 'allof ( ';
+        }
+        if ($start) {
+            $code .= 'currentdate :zone '
+                . date('O', $this->_vars['start']) . ' :value "ge" "date" "'
+                . date('Y-m-d', $this->_vars['start']) . '"';
+        }
+        if ($start && $end) {
+            $code .= ",\n" . '               ';
+        }
+        if ($end) {
+            $code .= 'currentdate :zone '
+                . date('O', $this->_vars['end']) . ' :value "le" "date" "'
+                . date('Y-m-d', $this->_vars['end']) . '"';
+        }
+        if ($start && $end) {
+            $code .= ' )';
+        }
+        if ($start || $end) {
+            $code .= " {\n" . '    ';
+        }
+        $code .= $this->_vacationCode();
+        if ($start || $end) {
+            $code .= "\n    }";
+        }
+        return $code;
     }
 
     /**

diff --git a/ingo/package.xml b/ingo/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/apache">ASL</license>
  <notes>
+* [jan] Allow to set vaction with only start or end date, if Sieve date extension is available.
 * [jan] Add support for Sieve date extension to vacation messages (Request #12520).
 * [mjr] Export active vacation messages via the timeObjects API (Request #10885).
 * [mms] Added a NoSQL (MongoDB) driver for the storage backend.
@@ -1778,6 +1779,7 @@
    </stability>
    <license uri="http://www.horde.org/licenses/apache">ASL</license>
    <notes>
+* [jan] Allow to set vaction with only start or end date, if Sieve date extension is available.
 * [jan] Add support for Sieve date extension to vacation messages (Request #12520).
 * [mjr] Export active vacation messages via the timeObjects API (Request #10885).
 * [mms] Added a NoSQL (MongoDB) driver for the storage backend.