[jan] Add parameters to Horde_Timezone_Zone#toVtimezone() to limit th…

…e generated STANDARD and DAYLIGHT sections.
horde · Mar 23, 2016 · 3ae0f73 · 3ae0f73
1 parent 95f0a69
commit 3ae0f73
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/framework/Timezone/lib/Horde/Timezone/Zone.php b/framework/Timezone/lib/Horde/Timezone/Zone.php
@@ -77,7 +77,7 @@ public function add($info)
      *                                    this timezone.
      * @throws Horde_Timezone_Exception
      */
-    public function toVtimezone()
+    public function toVtimezone($from = null, $to = null)
     {
         if (!count($this->_info)) {
             throw new Horde_Timezone_Exception('No rules found for timezone ' . $this->_name);
@@ -95,8 +95,14 @@ public function toVtimezone()
         $startDate = $this->_getDate(0);
         $startOffset = $this->_getOffset(0);
         for ($i = 1, $c = count($this->_info); $i < $c; $i++) {
+            if ($to && $startDate->after($to)) {
+                continue;
+            }
             $name = $this->_info[$i][2];
             $endDate = count($this->_info[$i]) > 3 ? $this->_getDate($i) : null;
+            if ($from && $endDate && $endDate->before($from)) {
+                continue;
+            }
             if ($this->_info[$i][1] == '-') {
                 // Standard time.
                 $component = new Horde_Icalendar_Standard();
@@ -106,7 +112,15 @@ public function toVtimezone()
             } else {
                 // Represented by a ruleset.
                 $startOffset = $this->_getOffset($i);
-                $this->_tz->getRule($this->_info[$i][1])->addRules($tz, $this->_name, $name, $startOffset, $startDate, $endDate);
+                $this->_tz->getRule($this->_info[$i][1])
+                    ->addRules(
+                        $tz,
+                        $this->_name,
+                        $name,
+                        $startOffset,
+                        $from && $from->after($startDate) ? $from : $startDate,
+                        $to && $to->before($endDate) ? $to : $endDate
+                    );
                 $startDate = $endDate;
                 // Continue, because addRules() already adds the
                 // component to $tz.

diff --git a/framework/Timezone/package.xml b/framework/Timezone/package.xml
@@ -10,18 +10,18 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2016-03-21</date>
+ <date>2016-03-23</date>
  <version>
-  <release>1.0.12</release>
-  <api>1.0.0</api>
+  <release>1.1.0</release>
+  <api>1.1.0</api>
  </version>
  <stability>
   <release>stable</release>
   <api>stable</api>
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [jan] Add parameters to Horde_Timezone_Zone#toVtimezone() to limit the generated STANDARD and DAYLIGHT sections.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -318,15 +318,15 @@
   </release>
   <release>
    <version>
-    <release>1.0.12</release>
-    <api>1.0.0</api></version>
+    <release>1.1.0</release>
+    <api>1.1.0</api></version>
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2016-03-21</date>
+   <date>2016-03-23</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [jan] Add parameters to Horde_Timezone_Zone#toVtimezone() to limit the generated STANDARD and DAYLIGHT sections.
    </notes>
   </release>
  </changelog>