Merge pull request #66 in ZP/z-push from bugfix/ZP-724-contact-s-birthday-is-not-updated to develop

* commit 'c782d49a':
  ZP-724 Add CalendarType also to SyncTaskRecurrence and SyncMeetingRequestRecurrence objects.
  ZP-724 Add instance variable for calendar type.
  ZP-724 ADD CalendarType to SyncRecurrence object.

(cherry picked from commit a8b25c37)

src/lib/syncobjects/syncmeetingrequestrecurrence.php

@@ -56,6 +56,7 @@ class SyncMeetingRequestRecurrence extends SyncObject {
     public $dayofmonth;
     public $weekofmonth;
     public $monthofyear;
+    public $calendartype;
 
     function SyncMeetingRequestRecurrence() {
         $mapping = array (
@@ -114,8 +115,12 @@ class SyncMeetingRequestRecurrence extends SyncObject {
                                                                                     self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_ONEVALUEOF => array(1,2,3,4,5,6,7,8,9,10,11,12) )),
                 );
 
+        if(Request::GetProtocolVersion() >= 14.0) {
+            $mapping[SYNC_POOMMAIL2_CALENDARTYPE]                       = array (   self::STREAMER_VAR      => "calendartype");
+        }
+
         parent::SyncObject($mapping);
     }
 }
 
-?>
\ No newline at end of file
+?>

src/lib/syncobjects/syncrecurrence.php

@@ -56,6 +56,7 @@ class SyncRecurrence extends SyncObject {
     public $dayofmonth;
     public $weekofmonth;
     public $monthofyear;
+    public $calendartype;
 
     function SyncRecurrence() {
         $mapping = array (
@@ -114,7 +115,11 @@ class SyncRecurrence extends SyncObject {
                                                                                     self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_ONEVALUEOF => array(1,2,3,4,5,6,7,8,9,10,11,12) )),
                 );
 
+        if(Request::GetProtocolVersion() >= 14.0) {
+            $mapping[SYNC_POOMCAL_CALENDARTYPE]                         = array (   self::STREAMER_VAR      => "calendartype");
+        }
+
         parent::SyncObject($mapping);
     }
 }
-?>
\ No newline at end of file
+?>

src/lib/syncobjects/synctaskrecurrence.php

@@ -59,6 +59,7 @@ class SyncTaskRecurrence extends SyncObject {
     public $monthofyear;
     public $regenerate;
     public $deadoccur;
+    public $calendartype;
 
     function SyncTaskRecurrence() {
         $mapping = array (
@@ -121,8 +122,12 @@ class SyncTaskRecurrence extends SyncObject {
                     // 1-12 representing the month
                     SYNC_POOMTASKS_MONTHOFYEAR                          => array (  self::STREAMER_VAR      => "monthofyear",
                                                                                     self::STREAMER_CHECKS   => array(   self::STREAMER_CHECK_ONEVALUEOF => array(1,2,3,4,5,6,7,8,9,10,11,12) )),
-
                 );
+
+        if(Request::GetProtocolVersion() >= 14.0) {
+            $mapping[SYNC_POOMTASKS_CALENDARTYPE]                       = array (   self::STREAMER_VAR      => "calendartype");
+        }
+
         parent::SyncObject($mapping);
     }
 
@@ -156,4 +161,4 @@ class SyncTaskRecurrence extends SyncObject {
     }
 }
 
-?>
\ No newline at end of file
+?>