From 7abfa4bbe1e2311e8493b3fa909018c206795b8d Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Mon, 21 Jun 2010 19:40:15 -0400 Subject: [PATCH] Fix recur_end encoding from Server -> PIM --- framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php | 3 +++ framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php index 9deaa22af..c8ac8d282 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php @@ -389,6 +389,9 @@ class Horde_ActiveSync_Message_Appointment extends Horde_ActiveSync_Message_Base if (!empty($recurrence->recurInterval)) { $r->interval = $recurrence->recurInterval; } + $r->until = $recurrence->getRecurEnd(); + $r->occurrences = $recurrence->getRecurCount(); + $this->_properties['recurrence'] = $r; } diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php index eec73eff1..6497b3ffa 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php @@ -349,7 +349,7 @@ class Horde_ActiveSync_Message_Base } if (isset($map[self::KEY_TYPE]) && ($map[self::KEY_TYPE] == self::TYPE_DATE || $map[self::KEY_TYPE] == self::TYPE_DATE_DASHES)) { if (!empty($this->$map[self::KEY_ATTRIBUTE])) { // don't output 1-1-1970 - $encoder->content(self::_formatDate($this->$map[self::KEY_ATTRIBUTE], $map[self::KEY_TYPE])); + $encoder->content(self::_formatDate($this->$map[self::KEY_ATTRIBUTE], $map[self::KEY_TYPE])); } } elseif (isset($map[self::KEY_TYPE]) && $map[self::KEY_TYPE] == self::TYPE_HEX) { $encoder->content(Horde_String::upper(bin2hex($this->$map[self::KEY_ATTRIBUTE]))); -- 2.11.0