(fix) now always enforce the organizer's default identity in appointments

NEWS

@@ -3,6 +3,7 @@
 
 Enhancements
  - improved EAS speed, especially when fetching big attachments
+ - now always enforce the organizer's default identity in appointments
 
 Bug fixes
  - EAS's GetItemEstimate/ItemOperations now support fetching mails and empty folders

SoObjects/Appointments/SOGoAppointmentObject.m

@@ -1802,6 +1802,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 {
   NSArray *allEvents;
   iCalEvent *event;
+  NSString *uid;
   NSUInteger i;
 
   allEvents = [rqCalendar events];
@@ -1824,6 +1825,20 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
         {
           [[event organizer] setCn: [[event organizer] rfc822Email]];
         }
+
+      // We now make sure that the organizer, if managed by SOGo, is using
+      // its default email when creating events and inviting attendees.
+      uid = [[SOGoUserManager sharedUserManager] getUIDForEmail: [[event organizer] rfc822Email]];
+      if (uid)
+        {
+          NSDictionary *defaultIdentity;
+          SOGoUser *organizer;
+
+          organizer = [SOGoUser userWithLogin: uid];
+          defaultIdentity = [organizer defaultIdentity];
+          [[event organizer] setCn: [defaultIdentity objectForKey: @"fullName"]];
+          [[event organizer] setEmail: [defaultIdentity objectForKey: @"email"]];
+        }
     }
 }