mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-11-22 07:14:21 +00:00
Calendar module optimizations in multidomain setup
Conflicts: NEWS UI/Common/UIxUserRightsEditor.m
This commit is contained in:
1 parent
8f49778501
commit
613f05ac02
9 files changed
+68
-34
No files matched your search
@@ -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
|
||||
|
||||
Reference in new issue
Block a user