Calendar module optimizations in multidomain setup

2026-07-14 21:04:53 +00:00 · 2015-07-22 17:23:02 -04:00
parent 366ad44cd1
commit 6830d6d930
9 changed files with 69 additions and 36 deletions
@@ -126,11 +126,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;
 }

 - (BOOL) canSubscribeUsers