Merge pull request #77 in ZP/z-push from...

Merge pull request #77 in ZP/z-push from bugfix/ZP-737-resolverecipients-availability-and to develop

* commit 'ee459d6c':
  ZP-737 ResolveRecipients Availability and Picture do not honour AS version.

src/lib/syncobjects/syncresolverecipient.php

@@ -60,16 +60,20 @@ class SyncResolveRecipient extends SyncObject {
             SYNC_RESOLVERECIPIENTS_DISPLAYNAME              => array (  self::STREAMER_VAR      => "displayname"),
             SYNC_RESOLVERECIPIENTS_EMAILADDRESS             => array (  self::STREAMER_VAR      => "emailaddress"),
 
-            SYNC_RESOLVERECIPIENTS_AVAILABILITY             => array (  self::STREAMER_VAR      => "availability",
-                                                                        self::STREAMER_TYPE     => "SyncResolveRecipientsAvailability"),
-
             SYNC_RESOLVERECIPIENTS_CERTIFICATES             => array (  self::STREAMER_VAR      => "certificates",
-                                                                        self::STREAMER_TYPE     => "SyncResolveRecipientsCertificates"),
-
-            SYNC_RESOLVERECIPIENTS_PICTURE                  => array (  self::STREAMER_VAR      => "picture",
-                                                                        self::STREAMER_TYPE     => "SyncResolveRecipientsPicture"),
+                                                                        self::STREAMER_TYPE     => "SyncResolveRecipientsCertificates")
         );
 
+        if (Request::GetProtocolVersion() >= 14.0) {
+            $mapping[SYNC_RESOLVERECIPIENTS_AVAILABILITY]   = array (  self::STREAMER_VAR      => "availability",
+                                                                       self::STREAMER_TYPE     => "SyncResolveRecipientsAvailability");
+        }
+
+        if (Request::GetProtocolVersion() >= 14.1) {
+            $mapping[SYNC_RESOLVERECIPIENTS_PICTURE]        = array (  self::STREAMER_VAR      => "picture",
+                                                                       self::STREAMER_TYPE     => "SyncResolveRecipientsPicture");
+        }
+
         parent::SyncObject($mapping);
     }
 

src/lib/syncobjects/syncresolverecipientsavailability.php

@@ -52,12 +52,14 @@ class SyncResolveRecipientsAvailability extends SyncObject {
     public $mergedfreebusy;
 
     public function SyncResolveRecipientsAvailability() {
-        $mapping = array (
-            SYNC_RESOLVERECIPIENTS_STARTTIME                => array (  self::STREAMER_VAR      => "starttime"),
-            SYNC_RESOLVERECIPIENTS_ENDTIME                  => array (  self::STREAMER_VAR      => "endtime"),
-            SYNC_RESOLVERECIPIENTS_STATUS                   => array (  self::STREAMER_VAR      => "status"),
-            SYNC_RESOLVERECIPIENTS_MERGEDFREEBUSY           => array (  self::STREAMER_VAR      => "mergedfreebusy"),
-        );
+        $mapping = array ();
+
+        if (Request::GetProtocolVersion() >= 14.0) {
+            $mapping[SYNC_RESOLVERECIPIENTS_STARTTIME]      = array (  self::STREAMER_VAR      => "starttime");
+            $mapping[SYNC_RESOLVERECIPIENTS_ENDTIME]        = array (  self::STREAMER_VAR      => "endtime");
+            $mapping[SYNC_RESOLVERECIPIENTS_STATUS]         = array (  self::STREAMER_VAR      => "status");
+            $mapping[SYNC_RESOLVERECIPIENTS_MERGEDFREEBUSY] = array (  self::STREAMER_VAR      => "mergedfreebusy");
+        }
 
         parent::SyncObject($mapping);
     }

src/lib/syncobjects/syncresolverecipientspicture.php

@@ -52,12 +52,14 @@ class SyncResolveRecipientsPicture extends SyncObject {
     public $data;
 
     public function SyncResolveRecipientsPicture() {
-        $mapping = array (
-            SYNC_RESOLVERECIPIENTS_MAXSIZE                  => array (  self::STREAMER_VAR      => "maxsize"),
-            SYNC_RESOLVERECIPIENTS_MAXPICTURES              => array (  self::STREAMER_VAR      => "maxpictures"),
-            SYNC_RESOLVERECIPIENTS_STATUS                   => array (  self::STREAMER_VAR      => "status"),
-            SYNC_RESOLVERECIPIENTS_DATA                     => array (  self::STREAMER_VAR      => "data"),
-        );
+        $mapping = array ();
+
+        if (Request::GetProtocolVersion() >= 14.1) {
+            $mapping[SYNC_RESOLVERECIPIENTS_MAXSIZE]        = array (  self::STREAMER_VAR      => "maxsize");
+            $mapping[SYNC_RESOLVERECIPIENTS_MAXPICTURES]    = array (  self::STREAMER_VAR      => "maxpictures");
+            $mapping[SYNC_RESOLVERECIPIENTS_STATUS]         = array (  self::STREAMER_VAR      => "status");
+            $mapping[SYNC_RESOLVERECIPIENTS_DATA]           = array (  self::STREAMER_VAR      => "data");
+        }
 
         parent::SyncObject($mapping);
     }