Fix recurrence end if specified as DATE value (Bug #13401).

UNTIL properties are inclusive. If specified as DATE value we need to add one day, so we cover the whole day until 12am on the next day.
horde · Aug 1, 2014 · d922e25 · d922e25
1 parent 15ce290
commit d922e25
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/framework/Date/lib/Horde/Date/Recurrence.php b/framework/Date/lib/Horde/Date/Recurrence.php
@@ -1135,7 +1135,7 @@ public function fromRRule20($rrule)
                     $until = new Horde_Date(
                         array('year' => $year,
                               'month' => $month,
-                              'mday' => $mday),
+                              'mday' => $mday + 1),
                         $this->start->timezone
                     );
                 }

diff --git a/framework/Date/package.xml b/framework/Date/package.xml
@@ -27,7 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [jan] Fix calculating recurrence end if UNTIL property of iCalendar data is DATE value (Bug #13401).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1012,7 +1012,7 @@
    <date>2014-07-01</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [jan] Fix calculating recurrence end if UNTIL property of iCalendar data is DATE value (Bug #13401).
    </notes>
   </release>
  </changelog>

diff --git a/framework/Date/test/Horde/Date/RecurrenceTest.php b/framework/Date/test/Horde/Date/RecurrenceTest.php
@@ -544,7 +544,7 @@ public function testParseDaily()
         $this->assertEquals(2, $r->getRecurInterval());
         $this->assertNull($r->getRecurOnDays());
         $this->assertNull($r->getRecurCount());
-        $this->assertEquals('2007-03-07 00:00:00', (string)$r->recurEnd);
+        $this->assertEquals('2007-03-08 00:00:00', (string)$r->recurEnd);
 
         $r->fromRRule20('FREQ=DAILY;INTERVAL=2;UNTIL=20070308T090000Z');
         $this->assertEquals(Horde_Date_Recurrence::RECUR_DAILY, $r->getRecurType());
@@ -601,7 +601,7 @@ public function testParseWeekly()
         $this->assertEquals(1, $r->getRecurInterval());
         $this->assertEquals(Horde_Date::MASK_THURSDAY, $r->getRecurOnDays());
         $this->assertNull($r->getRecurCount());
-        $this->assertEquals('2007-03-29 00:00:00', (string)$r->recurEnd);
+        $this->assertEquals('2007-03-30 00:00:00', (string)$r->recurEnd);
 
         $r->fromRRule20('FREQ=WEEKLY;INTERVAL=1;BYDAY=TH;UNTIL=20070330T080000Z');
         $this->assertEquals(Horde_Date_Recurrence::RECUR_WEEKLY, $r->getRecurType());
@@ -669,7 +669,7 @@ public function testParseMonthlyDate()
         $this->assertEquals(1, $r->getRecurInterval());
         $this->assertNull($r->getRecurOnDays());
         $this->assertNull($r->getRecurCount());
-        $this->assertEquals('2007-05-01 00:00:00', (string)$r->recurEnd);
+        $this->assertEquals('2007-05-02 00:00:00', (string)$r->recurEnd);
 
         $r->fromRRule20('FREQ=MONTHLY;INTERVAL=1;UNTIL=20070502T080000Z');
         $this->assertEquals(Horde_Date_Recurrence::RECUR_MONTHLY_DATE, $r->getRecurType());
@@ -719,7 +719,7 @@ public function testParseMonthlyWeekday()
         $this->assertEquals(1, $r->getRecurInterval());
         $this->assertNull($r->getRecurOnDays());
         $this->assertNull($r->getRecurCount());
-        $this->assertEquals('2007-05-01 00:00:00', (string)$r->recurEnd);
+        $this->assertEquals('2007-05-02 00:00:00', (string)$r->recurEnd);
 
         $r->fromRRule20('FREQ=MONTHLY;INTERVAL=1;BYDAY=1TH;UNTIL=20070502T080000Z');
         $this->assertEquals(Horde_Date_Recurrence::RECUR_MONTHLY_WEEKDAY, $r->getRecurType());
@@ -763,7 +763,7 @@ public function testParseYearlyDate()
         $this->assertEquals(1, $r->getRecurInterval());
         $this->assertNull($r->getRecurOnDays());
         $this->assertNull($r->getRecurCount());
-        $this->assertEquals('2009-03-01 00:00:00', (string)$r->recurEnd);
+        $this->assertEquals('2009-03-02 00:00:00', (string)$r->recurEnd);
 
         $r->fromRRule20('FREQ=YEARLY;INTERVAL=1;UNTIL=20090302T090000Z');
         $this->assertEquals(Horde_Date_Recurrence::RECUR_YEARLY_DATE, $r->getRecurType());
@@ -807,7 +807,7 @@ public function testParseYearlyDay()
         $this->assertEquals(1, $r->getRecurInterval());
         $this->assertNull($r->getRecurOnDays());
         $this->assertNull($r->getRecurCount());
-        $this->assertEquals('2009-03-01 00:00:00', (string)$r->recurEnd);
+        $this->assertEquals('2009-03-02 00:00:00', (string)$r->recurEnd);
 
         $r->fromRRule20('FREQ=YEARLY;INTERVAL=1;BYYEARDAY=60;UNTIL=20090302T090000Z');
         $this->assertEquals(Horde_Date_Recurrence::RECUR_YEARLY_DAY, $r->getRecurType());
@@ -831,7 +831,7 @@ public function testParseYearlyWeekday()
         $this->assertEquals(1, $r->getRecurInterval());
         $this->assertNull($r->getRecurOnDays());
         $this->assertNull($r->getRecurCount());
-        $this->assertEquals('2009-03-01 00:00:00', (string)$r->recurEnd);
+        $this->assertEquals('2009-03-02 00:00:00', (string)$r->recurEnd);
 
         $r->fromRRule20('FREQ=YEARLY;INTERVAL=1;BYDAY=1TH;BYMONTH=3;UNTIL=20090302T090000Z');
         $this->assertEquals(Horde_Date_Recurrence::RECUR_YEARLY_WEEKDAY, $r->getRecurType());