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

Conflicts:
	SoObjects/SOGo/SOGoUserManager.m
	Tools/SOGoToolRestore.m

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -3157,6 +3157,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
                                     inContainer: self];
   [object setIsNew: YES];
   content = [NSMutableString stringWithString: @"BEGIN:VCALENDAR\n"];
+  [content appendFormat: @"PRODID:-//Inverse inc./SOGo %@//EN\n", SOGoVersion];
+
   if (timezone)
     [content appendFormat: @"%@\n",  [timezone versitString]];
   [content appendFormat: @"%@\nEND:VCALENDAR", [event versitString]];

SoObjects/Appointments/SOGoAppointmentObject.m

@@ -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"]];
+            }
         }
     }
 }

SoObjects/Appointments/iCalAlarm+SOGo.h

@@ -1,6 +1,6 @@
 /* iCalAlarm+SOGo.h - this file is part of SOGo
  *
- * Copyright (C) 2014 Inverse inc.
+ * Copyright (C) 2015 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,11 +20,11 @@
 
 #import <NGCards/iCalAlarm.h>
 
-@class iCalRepeatableEntityObject;
+@class iCalEntityObject;
 
 @interface iCalAlarm (SOGoExtensions)
 
-+ (id) alarmForEvent: (iCalRepeatableEntityObject *) theEntity
++ (id) alarmForEvent: (iCalEntityObject *) theEntity
                owner: (NSString *) theOwner
               action: (NSString *) reminderAction
                 unit: (NSString *) reminderUnit

SoObjects/Appointments/iCalAlarm+SOGo.m

@@ -1,6 +1,6 @@
 /* iCalAlarm+SOGo.m - this file is part of SOGo
  *
- * Copyright (C) 2014 Inverse inc.
+ * Copyright (C) 2015 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@
 
 #import <NGCards/iCalPerson.h>
 #import <NGCards/iCalTrigger.h>
+#import <NGCards/iCalEntityObject.h>
 
 @implementation iCalAlarm (SOGoExtensions)
 
@@ -65,7 +66,7 @@
   [alarm addChild: aAttendee];
 }
 
-+ (id) alarmForEvent: (iCalRepeatableEntityObject *) theEntity
++ (id) alarmForEvent: (iCalEntityObject *) theEntity
                owner: (NSString *) theOwner
               action: (NSString *) reminderAction
                 unit: (NSString *) reminderUnit