Request 3232 (accepted)

This request supersedes: request 3230 (Show diff)

Overview

Request 3232 (accepted)

New release 2.4.2.10

Created by mollekopf over 1 year ago
In state accepted
Supersedes 3230
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

@@ -391,8 +391,10 @@
         $is_outlook   = stripos($this->device->devicetype, 'outlook') !== false;
         $is_android   = stripos($this->device->devicetype, 'android') !== false;
 
-        // check data validity
-        $this->check_event($data);
+        // check data validity (of a new event)
+        if (empty($event)) {
+            $this->check_event($data);
+        }
 
         if (!empty($event'start') && ($event'start' instanceof DateTime)) {
             $old_timezone = $event'start'->getTimezone();
@@ -429,6 +431,11 @@
 
             $value = $data->$key;
 
+            // Skip ghosted (unset) properties, (but make sure 'changed' timestamp is reset)
+            if ($value === null && $name != 'changed') {
+                continue;
+            }
+
             switch ($name) {
             case 'changed':
                 $value = null;
@@ -510,12 +517,27 @@
         }
 
         // Organizer
-        if (!$is_exception && ($organizer_email = $data->organizerEmail)) {
-            $attendees = array(
-                'role'   => 'ORGANIZER',
-                'name'   => $data->organizerName,
-                'email'  => $organizer_email,
-            );
+        if (!$is_exception) {
+            // Organizer specified
+            if ($organizer_email = $data->organizerEmail) {
+                $attendees = array(
+                    'role'   => 'ORGANIZER',
+                    'name'   => $data->organizerName,
+                    'email'  => $organizer_email,
+                );
+            } else if (!empty($event'attendees')) {
+                // Organizer not specified, use one from the original event if that's an update
+                foreach ($event'attendees' as $idx => $attendee) {
+                    if (!empty($attendee'email') && !empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
+                        $organizer_email = $attendee'email';
+                        $attendees = array(
+                            'role'   => 'ORGANIZER',
+                            'name'   => $attendee'name' ?? '',
+                            'email'  => $organizer_email,
+                        );
+                    }
+                }
+            }
         }
 
         // Attendees

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3232 0

Request History

mollekopf created request over 1 year ago

New release 2.4.2.10

mollekopf accepted request over 1 year ago