Calendar module optimizations in multidomain setup

Conflicts:
	NEWS
	UI/Common/UIxUserRightsEditor.m

UI/Common/UIxAclEditor.m

@@ -195,11 +195,21 @@
 
 - (NSString *) currentUserDisplayName
 {
+  NSDictionary *infos;
+  NSString *uid;
   SOGoUserManager *um;
 
   um = [SOGoUserManager sharedUserManager];
-
-  return [um getFullEmailForUID: [self currentUser]];
+  uid = [self currentUser];
+  infos = [um contactInfosForUserWithUIDorEmail: uid inDomain: [[context activeUser] domain]];
+  if (infos)
+    {
+      return [NSString stringWithFormat: @"%@ <%@>",
+                    [infos objectForKey: @"cn"],
+                    [infos objectForKey: @"c_email"]];
+    }
+  else
+    return uid;
 }
 
 - (NSDictionary *) currentUserInfos

UI/Common/UIxUserRightsEditor.m

@@ -1,6 +1,6 @@
 /* UIxUserRightsEditor.m - this file is part of SOGo
  *
- * Copyright (C) 2007-2014 Inverse inc.
+ * Copyright (C) 2007-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
@@ -90,6 +90,7 @@
 
 - (NSString *) userDisplayName
 {
+  NSDictionary *infos;
   SOGoUserManager *um;
 
   if ([self userIsAnonymousUser])
@@ -103,9 +104,15 @@
   else
     {
       um = [SOGoUserManager sharedUserManager];
-      return [NSString stringWithFormat: @"%@ <%@>",
-                        [um getCNForUID: uid],
-                     [um getEmailForUID: uid]];
+      infos = [um contactInfosForUserWithUIDorEmail: uid inDomain: [[context activeUser] domain]];
+      if (infos)
+        {
+          return [NSString stringWithFormat: @"%@ <%@>",
+                        [infos objectForKey: @"cn"],
+                        [infos objectForKey: @"c_email"]];
+        }
+      else
+        return uid;
     }
 }
 

UI/MailPartViewers/UIxMailPartICalActions.m

@@ -303,7 +303,7 @@
       delegatedAttendee = [iCalPerson new];
       [delegatedAttendee autorelease];
       [delegatedAttendee setEmail: delegatedEmail];
-      delegatedUid = [delegatedAttendee uid];
+      delegatedUid = [delegatedAttendee uidInDomain: [user domain]];
       if (delegatedUid)
 	{
 	  SOGoUser *delegatedUser;

UI/Scheduler/UIxAppointmentEditor.m

@@ -293,7 +293,7 @@
             delegatedAttendee = [iCalPerson new];
             [delegatedAttendee autorelease];
             [delegatedAttendee setEmail: delegatedEmail];
-            delegatedUid = [delegatedAttendee uid];
+            delegatedUid = [delegatedAttendee uidInDomain: [user domain]];
             if (delegatedUid)
               {
                 SOGoUser *delegatedUser;