Request 3202 (accepted)

You're not reviewing the full diff of request 3202 , but the diff to the superseded request 3198 (Show full diff)

Overview

Request 3202 (accepted)

New release

Created by mollekopf over 1 year ago
In state accepted
Supersedes 3198
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit kolab-syncroton

Submit package Kolab:16:Testing / kolab-syncroton to package Kolab:16 / kolab-syncroton

kolab-syncroton.spec Changed

debian.changelog Changed

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data_calendar.php Changed

@@ -116,7 +116,8 @@
     const SENSITIVITY_PRIVATE      = 2;
     const SENSITIVITY_CONFIDENTIAL = 3;
 
-    const KEY_DTSTAMP = 'x-custom.X-ACTIVESYNC-DTSTAMP';
+    const KEY_DTSTAMP          = 'x-custom.X-ACTIVESYNC-DTSTAMP';
+    const KEY_RESPONSE_DTSTAMP = 'x-custom.X-ACTIVESYNC-RESPONSE-DTSTAMP';
 
     /**
      * Mapping of attendee status
@@ -183,7 +184,6 @@
         $event  = is_array($serverId) ? $serverId : $this->getObject($collection->collectionId, $serverId);
         $config = $this->getFolderConfig($event'_mailbox');
         $result = array();
-        $is_outlook   = stripos($this->device->devicetype, 'outlook') !== false;
 
         // Kolab Format 3.0 and xCal does support timezone per-date, but ActiveSync allows
         // only one timezone per-event. We'll use timezone of the start date
@@ -231,7 +231,7 @@
                 break;
 
             case 'free_busy':
-                if (!$is_outlook && !empty($value)) {
+                if (!empty($value)) {
                     $value = $this->busyStatusMap$value;
                 }
                 break;
@@ -314,17 +314,6 @@
                 if ($email && in_array_nocase($email, $user_emails)) {
                     $user_rsvp = !empty($attendee'rsvp');
                     $resp_type = $status ?: self::ATTENDEE_STATUS_UNKNOWN;
-
-                    // Synchronize the attendee status to the event status to get the same behaviour as outlook.
-                    if ($is_outlook) {
-                        if ($attendee'status' == 'ACCEPTED') {
-                            $result'busyStatus' = self::BUSY_STATUS_BUSY;
-                        }
-                        if ($attendee'status' == 'TENTATIVE') {
-                            $result'busyStatus' = self::BUSY_STATUS_TENTATIVE;
-                        }
-                    }
-
                 }
 
                 $result'attendees' = new Syncroton_Model_EventAttendee($att);
@@ -449,11 +438,6 @@
                 break;
 
             case 'free_busy':
-                // Outlook sets the busy state to the attendance state, and we don't want to change the event state based on that.
-                // Outlook doesn't have the concept of an event state, so we just ignore this.
-                if ($is_outlook) {
-                    continue 2;
-                }
                 $map   = array_flip($this->busyStatusMap);
                 $value = isset($map$value) ? $map$value : null;
                 break;
@@ -506,10 +490,10 @@
         }
 
         // Attendees
-        // Whenever Outlook sends dummy timezone it is an event where the user is an attendee.
-        // In these cases Attendees element is bogus: contains invalid status and does not
-        // contain all attendees. We have to ignore it.
-        if ($is_outlook && !$is_exception && $data->timezone === $dummy_tz) {
+        // Outlook 2013 sends a dummy update just after MeetingResponse has been processed,
+        // this update resets attendee status set in the MeetingResponse request.
+        // We ignore changes to attendees data on such updates
+        if ($is_outlook && $this->isDummyOutlookUpdate($data, $entry, $event)) {
             $this->logger->debug('Dummy outlook update detected, ignoring attendee changes.');
             $attendees = $entry'attendees';
         }
@@ -561,22 +545,6 @@
             }
         }
 
-        // Outlook does not send the correct attendee status when changing between accepted and tentative, but it toggles the busyStatus.
-        if ($is_outlook) {
-            $status = null;
-            if ($data->busyStatus == self::BUSY_STATUS_BUSY) {
-                $status = "ACCEPTED";
-            } else if ($data->busyStatus == self::BUSY_STATUS_TENTATIVE) {
-                $status = "TENTATIVE";
-            }
-
-            if ($status) {
-                $this->logger->debug("Updating our attendee status based on the busy status to {$status}.");
-                $emails = $this->user_emails();
-                $this->find_and_update_attendee_status($attendees, $status, $emails);
-            }
-        }
-
         if (!$is_exception) {
             // Make sure the event has the organizer set
             if (!$organizer_email && ($identity = kolab_sync::get_instance()->user->get_identity())) {
@@ -662,6 +630,10 @@
 
             // Update/Save the event
             if (empty($existing)) {
+                if ($dtstamp) {
+                    $this->setKolabDataItem($event, self::KEY_RESPONSE_DTSTAMP, $dtstamp);
+                }
+
                 $folder = $this->save_event($event, $status);
 
                 // Create SyncState for the new event, so it is not synced twice
@@ -689,6 +661,10 @@
                 }
             }
             else {
+                if ($dtstamp) {
+                    $this->setKolabDataItem($existing, self::KEY_RESPONSE_DTSTAMP, $dtstamp);
+                }
+
                 $folder = $this->update_event($event, $existing, $status, $request->instanceId);
             }
 
@@ -833,33 +809,25 @@
     }
 
     /**
-     * Update the attendee status of the user matching $emails
+     * Update the attendee status of the user
      */
-    protected function find_and_update_attendee_status(&$attendees, $status, $emails)
+    protected function update_attendee_status(&$event, $status)
     {
-        $found = false;
-        foreach ((array) $attendees as $i => $attendee) {
+        $emails = $this->user_emails();
+
+        foreach ((array) $event'attendees' as $i => $attendee) {
             if (!empty($attendee'email')
                 && (empty($attendee'role') || $attendee'role' != 'ORGANIZER')
                 && in_array_nocase($attendee'email', $emails)
             ) {
-                $attendees$i'status' = $status;
-                $attendees$i'rsvp'   = false;
+                $event'attendees'$i'status' = $status;
+                $event'attendees'$i'rsvp'   = false;
+                $event_attendee = $attendee;
                 $this->logger->debug('Updating existing attendee: ' . $attendee'email' . ' status: ' . $status);
-                $found = true;
             }
         }
-        return $found;
-    }
-
-    /**
-     * Update the attendee status of the user
-     */
-    protected function update_attendee_status(&$event, $status)
-    {
-        $emails = $this->user_emails();
 
-        if (!$this->find_and_update_attendee_status($event'attendees', $status, $emails)) {
+        if (empty($event_attendee)) {
             $this->logger->debug('Adding new attendee ' . $emails0 . ' status: ' . $status);
             // Add the user to the attendees list
             $event'attendees' = array(
@@ -1117,4 +1085,39 @@
 
         return $rec;
     }
+
+    /**
+     * Check if the event update request is a fake (for Outlook)
+     */
+    protected function isDummyOutlookUpdate($data, $entry, &$result)
+    {
+        $is_dummy = false;
+
+        // Outlook 2013 sends a dummy update just after MeetingResponse has been processed,
+        // this update resets attendee status set in the MeetingResponse request.
+        // We ignore attendees data in such updates, they should not happen according to
+        // https://msdn.microsoft.com/en-us/library/office/hh428685(v=exchg.140).aspx
+        // but they will contain some data as alarms and free/busy status so we don't
+        // ignore them completely
+        if (!empty($entry) && !empty($data->attendees) && stripos($this->device->devicetype, 'outlook') !== false) {
+            // Some of these requests use just dummy Timezone
+            $dummy_tz = str_repeat('A', 230) . '==';
+
+            if ($data->timezone == $dummy_tz) {
+                $is_dummy = true;
+            }
+
+            // But some of them do not, so we have check if that is a first
+            // update immediately (up to 5 seconds) after MeetingResponse request
+            if (!$is_dummy && ($dtstamp = $this->getKolabDataItem($entry, self::KEY_RESPONSE_DTSTAMP))) {
+                $dtstamp  = new DateTime($dtstamp);
+                $now      = new DateTime('now', new DateTimeZone('UTC'));
+                $is_dummy = $now->getTimestamp() - $dtstamp->getTimestamp() <= 5;
+            }
+
+            $this->unsetKolabDataItem($result, self::KEY_RESPONSE_DTSTAMP);
+        }
+
+        return $is_dummy;
+    }
 }

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data_email.php Changed

@@ -403,7 +403,6 @@
             $meeting'startTime' = $event'start';
             $meeting'dtStamp' = $event'created' ?? null;
             $meeting'endTime' = $event'end' ?? null;
-            $meeting'location' = $event'location' ?? null;
 
             //TODO implement recurrences. We can't detect exceptions like this (don't know how), and the recurrences structure is different from event,
             //so that also doesn't work like this.
@@ -421,11 +420,15 @@
             // }
             $meeting'instanceType' = Syncroton_Model_EmailMeetingRequest::TYPE_NORMAL;
 
+            $meeting'location' = $event'location' ?? null;
+
             // Organizer
             if (!empty($event'attendees')) {
                 foreach ($event'attendees' as $idx => $attendee) {
-                    if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER' && !empty($attendee'email')) {
-                        $meeting'organizer' = $attendee'email';
+                    if ($attendee'role' == 'ORGANIZER') {
+                        if ($email = $attendee'email') {
+                            $meeting'organizer' = $email;
+                        }
                         break;
                     }
                 }
@@ -436,7 +439,7 @@
             $meeting'timeZone' = kolab_sync_timezone_converter::encodeTimezoneFromDate($event'start');
             $meeting'globalObjId' = self::encodeGlobalObjId('uid' => $event'uid');
 
-            // TODO handle other methods
+            //TODO handle other methods
             if ($event'_method' == 'REQUEST') {
                 $meeting'meetingMessageType' = Syncroton_Model_EmailMeetingRequest::MESSAGE_TYPE_REQUEST;
             } else {
@@ -1747,7 +1750,7 @@
 
         foreach ($lines as $line) {
             // don't wrap already quoted lines
-            if (isset($line0) && $line0 == '>') {
+            if ($line0 == '>') {
                 $line = '>' . rtrim($line);
             }
             else if (mb_strlen($line) > $max) {

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_message.php Changed

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3202 0

Request History

mollekopf created request over 1 year ago

New release

mollekopf accepted request over 1 year ago