Merge remote-tracking branch 'origin/develop' into AS14.1

src/backend/kopano/mapiprovider.php

@@ -1460,7 +1460,7 @@ class MAPIProvider {
             $org[PR_EMAIL_ADDRESS] = isset($representingprops[$appointmentprops["sentrepresentingemail"]]) ? $representingprops[$appointmentprops["sentrepresentingemail"]] : $props[$appointmentprops["sentrepresentingemail"]];
             $org[PR_SEARCH_KEY] = isset($representingprops[$appointmentprops["sentrepresentinsrchk"]]) ? $representingprops[$appointmentprops["sentrepresentinsrchk"]] : $props[$appointmentprops["sentrepresentinsrchk"]];
             $org[PR_RECIPIENT_FLAGS] = recipOrganizer | recipSendable;
-            $org[PR_RECIPIENT_TYPE] = MAPI_TO;
+            $org[PR_RECIPIENT_TYPE] = MAPI_TO; // TODO: shouldn't that be MAPI_ORIG ?
 
             array_push($recips, $org);
 
@@ -1479,14 +1479,14 @@ class MAPIProvider {
                     $recip[PR_SEARCH_KEY] = $userinfo[0][PR_SEARCH_KEY];
                     $recip[PR_ADDRTYPE] = $userinfo[0][PR_ADDRTYPE];
                     $recip[PR_ENTRYID] = $userinfo[0][PR_ENTRYID];
-                    $recip[PR_RECIPIENT_TYPE] = MAPI_TO;
+                    $recip[PR_RECIPIENT_TYPE] = isset($attendee->attendeetype) ? $attendee->attendeetype : MAPI_TO;
                     $recip[PR_RECIPIENT_FLAGS] = recipSendable;
                 }
                 else {
                     $recip[PR_DISPLAY_NAME] = u2w($attendee->name);
                     $recip[PR_SEARCH_KEY] = "SMTP:".$recip[PR_EMAIL_ADDRESS]."\0";
                     $recip[PR_ADDRTYPE] = "SMTP";
-                    $recip[PR_RECIPIENT_TYPE] = MAPI_TO;
+                    $recip[PR_RECIPIENT_TYPE] = isset($attendee->attendeetype) ? $attendee->attendeetype : MAPI_TO;
                     $recip[PR_ENTRYID] = mapi_createoneoff($recip[PR_DISPLAY_NAME], $recip[PR_ADDRTYPE], $recip[PR_EMAIL_ADDRESS]);
                 }
 

src/lib/request/sync.php

@@ -919,6 +919,14 @@ class Sync extends RequestProcessor {
         if ($this->startFolderTagSent)
             self::$encoder->endTag();
 
+        // Check if there was any response - in case of an empty sync request, we shouldn't send an empty answer (ZP-1241)
+        if (!$this->startTagsSent && $emptysync === true) {
+            $this->sendStartTags();
+            self::$encoder->startTag(SYNC_STATUS);
+            self::$encoder->content(SYNC_STATUS_SYNCREQUESTINCOMPLETE);
+            self::$encoder->endTag();
+        }
+
         //SYNC_SYNCHRONIZE - only if the starttag was sent
         if ($this->startTagsSent)
             self::$encoder->endTag();

src/lib/syncobjects/syncattendee.php

@@ -30,6 +30,8 @@
 class SyncAttendee extends SyncObject {
     public $email;
     public $name;
+    public $attendeestatus;
+    public $attendeetype;
 
     function __construct() {
         $mapping = array(