This might be correct strictly to RFC 2445, but it's not like any oth…

…er iCalendar implementation seems to do it.
horde · Jun 16, 2014 · c95f68e · c95f68e
1 parent fdc8203
commit c95f68e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 20 deletions.
diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
@@ -706,12 +706,8 @@ public function toiCalendar($calendar)
         }
 
         if ($this->isAllDay()) {
-            /* DTEND is non-inclusive, but $this->end is inclusive. */
-            $end = clone $this->end;
-            $end->sec++;
-
             $vEvent->setAttribute('DTSTART', $this->start, array('VALUE' => 'DATE'));
-            $vEvent->setAttribute('DTEND', $end, array('VALUE' => 'DATE'));
+            $vEvent->setAttribute('DTEND', $this->end, array('VALUE' => 'DATE'));
             $vEvent->setAttribute('X-FUNAMBOL-ALLDAY', 1);
         } else {
             $this->setTimezone(true);
@@ -726,13 +722,8 @@ public function toiCalendar($calendar)
                 }
             }
 
-            /* DTEND is non-inclusive, but $this->end is inclusive. This needs
-             * to be done AFTER setting the timezone. */
-            $end = clone $this->end;
-            $end->sec++;
-
             $vEvent->setAttribute('DTSTART', clone $this->start, $params);
-            $vEvent->setAttribute('DTEND', clone $end, $params);
+            $vEvent->setAttribute('DTEND', clone $this->end, $params);
         }
 
         $vEvent->setAttribute('DTSTAMP', $_SERVER['REQUEST_TIME']);
@@ -1202,10 +1193,6 @@ public function fromiCalendar($vEvent, $parseAttendees = false)
                               'month' => (int)$this->end->month,
                               'mday'  => (int)$this->end->mday + 1),
                         $tzid);
-                } else {
-                    // Otherwise, honor RFC 2445 that says DTEND is non-inclusive
-                    // (we store it as inclusive).
-                    --$this->end->sec;
                 }
             } else {
                 // Date field

diff --git a/kronolith/test/Kronolith/Integration/FromIcalendarTest.php b/kronolith/test/Kronolith/Integration/FromIcalendarTest.php
@@ -38,7 +38,7 @@ public function testStart()
     public function testEnd()
     {
         $event = $this->_getFixture('fromicalendar.ics');
-        $this->assertEquals('2010-11-01 10:59:59', (string)$event->end);
+        $this->assertEquals('2010-11-01 11:00:00', (string)$event->end);
     }
 
     public function testAllDay()

diff --git a/kronolith/test/Kronolith/fixtures/export1.ics b/kronolith/test/Kronolith/fixtures/export1.ics
@@ -3,7 +3,7 @@ VERSION:1.0
 PRODID:-//The Horde Project//Horde iCalendar Library//EN
 BEGIN:VEVENT
 DTSTART:20070315T121020Z
-DTEND:20070315T132001Z
+DTEND:20070315T132000Z
 DTSTAMP:--------T------Z
 UID:20070315143732.4wlenqz3edq8@horde.org
 SUMMARY;ENCODING=QUOTED-PRINTABLE;CHARSET=UTF-8:H=C3=BCbscher Termin

diff --git a/kronolith/test/Kronolith/fixtures/export2.ics b/kronolith/test/Kronolith/fixtures/export2.ics
@@ -3,7 +3,7 @@ VERSION:2.0
 PRODID:-//The Horde Project//Horde iCalendar Library//EN
 BEGIN:VEVENT
 DTSTART:20070315T121020Z
-DTEND:20070315T132001Z
+DTEND:20070315T132000Z
 DTSTAMP:--------T------Z
 UID:20070315143732.4wlenqz3edq8@horde.org
 SUMMARY:Hübscher Termin

diff --git a/kronolith/test/Kronolith/fixtures/export3.ics b/kronolith/test/Kronolith/fixtures/export3.ics
@@ -3,7 +3,7 @@ VERSION:1.0
 PRODID:-//The Horde Project//Horde iCalendar Library//EN
 BEGIN:VEVENT
 DTSTART:20070315T121020Z
-DTEND:20070315T132001Z
+DTEND:20070315T132000Z
 DTSTAMP:--------T------Z
 UID:20070315143732.4wlenqz3edq8@horde.org
 SUMMARY:busy

diff --git a/kronolith/test/Kronolith/fixtures/export4.ics b/kronolith/test/Kronolith/fixtures/export4.ics
@@ -3,7 +3,7 @@ VERSION:2.0
 PRODID:-//The Horde Project//Horde iCalendar Library//EN
 BEGIN:VEVENT
 DTSTART:20070315T121020Z
-DTEND:20070315T132001Z
+DTEND:20070315T132000Z
 DTSTAMP:--------T------Z
 UID:20070315143732.4wlenqz3edq8@horde.org
 SUMMARY:busy