amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-11 09:53:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into merge-upstream

Browse Source 
Conflicts:
	SoObjects/SOGo/SOGoUserManager.m
	Tools/SOGoToolRestore.m
This commit is contained in:
Julio García
2015-06-26 09:41:58 +02:00
parent dc2cc14d25 d16bf7c1a7
commit 8e047aaa9c
41 changed files with 761 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/SOGoAppointmentObject.m
+21 -2
View File
@@ -1820,9 +1820,28 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
[self warnWithFormat: @"Invalid event: no end date; setting duration to %@", [event duration]];
}
if ([event organizer] && ![[[event organizer] cn] length])
if ([event organizer])
{
[[event organizer] setCn: [[event organizer] rfc822Email]];
NSString *uid;
if (![[[event organizer] cn] length])
{
[[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"]];
}
}
}
}