LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(calendar): ensure valid identity when sending invitations

pull/283/head
Francis Lachapelle 2020-07-06 12:40:30 -04:00
parent c99170b9bc
commit c2d937746f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SoObjects/Appointments/SOGoAppointmentObject.m
View File

@ -1972,7 +1972,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
NSArray *allAttendees;
organizerUser = [SOGoUser userWithLogin: uid];
defaultIdentity = [organizerUser defaultIdentity];
defaultIdentity = [organizerUser primaryIdentity];
organizer = [[event organizer] copy];
[organizer setCn: [defaultIdentity objectForKey: @"fullName"]];
[organizer setEmail: [defaultIdentity objectForKey: @"email"]];

2
SoObjects/Appointments/SOGoCalendarComponent.m
View File

@ -828,7 +828,7 @@
// No organizer, grab the event's owner
if (![senderEmail length])
senderEmail = shortSenderEmail = [[ownerUser defaultIdentity] objectForKey: @"email"];
senderEmail = shortSenderEmail = [[ownerUser primaryIdentity] objectForKey: @"email"];
/* calendar part */
eventBodyPart = [self _bodyPartForICalObject: object];

2
SoObjects/Appointments/iCalAlarm+SOGo.m
View File

@ -59,7 +59,7 @@
iCalPerson *aAttendee;
ownerIdentity = [[SOGoUser userWithLogin: uid roles: nil]
defaultIdentity];
primaryIdentity];
aAttendee = [iCalPerson elementWithTag: @"attendee"];
[aAttendee setCn: [ownerIdentity objectForKey: @"fullName"]];
[aAttendee setEmail: [ownerIdentity objectForKey: @"email"]];