From 1df21a8c8c365ffee80566607a26b30cc4bc4378 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Thu, 8 Apr 2010 15:49:25 -0400
Subject: [PATCH] These properties are only present in AS versions > 2.5

---
 .../lib/Horde/ActiveSync/Message/Appointment.php   |  2 +-
 .../lib/Horde/ActiveSync/Message/Attendee.php      |  4 ++--
 .../ActiveSync/lib/Horde/ActiveSync/Wbxml.php      |  6 +++---
 kronolith/lib/Event.php                            | 23 +++++++++++++++++++---
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php
index 4f195b92a..30eeea75b 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php
@@ -78,7 +78,7 @@ class Horde_ActiveSync_Message_Appointment extends Horde_ActiveSync_Message_Base
             SYNC_POOMCAL_BODYTRUNCATED => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'bodytruncated'),
             SYNC_POOMCAL_EXCEPTIONS => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'exceptions', Horde_ActiveSync_Message_Base::KEY_TYPE => 'Horde_ActiveSync_Message_Exception', Horde_ActiveSync_Message_Base::KEY_VALUES => SYNC_POOMCAL_EXCEPTION),
             SYNC_POOMCAL_CATEGORIES => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'categories', Horde_ActiveSync_Message_Base::KEY_VALUES => SYNC_POOMCAL_CATEGORY),
-            SYNC_POOMCAL_RESPONSETYPE => array(Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'responsetype'),
+            //SYNC_POOMCAL_RESPONSETYPE => array(Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'responsetype'),
         );
 
         parent::__construct($mapping, $params);
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Attendee.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Attendee.php
index 0d50104b6..ebd426a12 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Attendee.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Attendee.php
@@ -31,8 +31,8 @@ class Horde_ActiveSync_Message_Attendee extends Horde_ActiveSync_Message_Base
         $mapping = array(
             SYNC_POOMCAL_EMAIL => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'email'),
             SYNC_POOMCAL_NAME => array (Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'name'),
-            SYNC_POOMCAL_ATTENDEETYPE => array(Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'type'),
-            SYNC_POOMCAL_ATTENDEESTATUS => array(Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'status')
+            //SYNC_POOMCAL_ATTENDEETYPE => array(Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'type'),
+            //SYNC_POOMCAL_ATTENDEESTATUS => array(Horde_ActiveSync_Message_Base::KEY_ATTRIBUTE => 'status')
         );
 
         parent::__construct($mapping, $params);
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php b/framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php
index 0ceac5263..752905684 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php
@@ -268,9 +268,9 @@ class Horde_ActiveSync_Wbxml
                         0x26 => 'Subject',
                         0x27 => 'StartTime',
                         0x28 => 'UID',
-                        0x29 => 'AttendeeStatus',
-                        0x2A => 'AttendeeType',
-                        0x36 => 'ResponseType',
+                        //0x29 => 'AttendeeStatus',
+                        //0x2A => 'AttendeeType',
+                        //0x36 => 'ResponseType',
                     ),
                     /* MOVE */
                     5 => array (
diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
index 5fae8bd4b..9a641f3b7 100644
--- a/kronolith/lib/Event.php
+++ b/kronolith/lib/Event.php
@@ -1081,7 +1081,11 @@ abstract class Kronolith_Event
         /* Attendees */
         $attendees = $message->getAttendees();
         foreach ($attendees as $attendee) {
-            $this->addAttendee($attendee->email, $attendee->type, $attendee->status, $attendee->name);
+            //if ($attendee->type == Horde_ActiveSync_Message_Attendee::TYPE_RESOURCE) {
+                // @TODO figure out a way to map this to an existing resource??
+            //} else {
+                $this->addAttendee($attendee->email, $attendee->type, $attendee->status, $attendee->name);
+            //}
         }
 
         /* Flag that we are initialized */
@@ -1215,11 +1219,24 @@ abstract class Kronolith_Event
         foreach ($this->attendees as $email => $properties) {
             $attendee = new Horde_ActiveSync_Message_Attendee();
             $attendee->email = $email;
-            $attendee->type = $properties['attendance'];
-            $attendee->status = $properties['response'];
+            // AS only as required or opitonal
+            //$attendee->type = ($properties['attendance'] !== Kronolith::PART_REQUIRED ? Kronolith::PART_OPTIONAL : Kronolith::PART_REQUIRED);
+            //$attendee->status = $properties['response'];
             $message->addAttendee($attendee);
         }
 
+//        /* Resources */
+//        $r = $this->getResources();
+//        foreach ($r as $id => $data) {
+//            $resource = Kronolith::getDriver('Resource')->getResource($id);
+//            $attendee = new Horde_ActiveSync_Message_Attendee();
+//            $attendee->email = $resource->get('email');
+//            $attendee->type = Horde_ActiveSync_Message_Attendee::TYPE_RESOURCE;
+//            $attendee->name = $data['name'];
+//            $attendee->status = $data['response'];
+//            $message->addAttendee($attendee);
+//        }
+
         /* Reminder */
         $message->setReminder($this->alarm);
 
-- 
2.11.0