fix(calendar): return SOGoUser instances when expanding LDAP groups

Fixes #5043
This commit is contained in:
Francis Lachapelle
2020-07-01 16:58:16 -04:00
parent 62fc80de20
commit b8595d7ae6
5 changed files with 30 additions and 34 deletions
+4 -4
View File
@@ -397,7 +397,7 @@
NSString *email;
SOGoObject <SOGoContactObject> *contact;
SOGoObject <SOGoSource> *source;
NSDictionary *user;
SOGoUser *user;
id <WOActionResults> result;
unsigned int i, max;
@@ -418,14 +418,14 @@
{
user = [allUsers objectAtIndex: i];
allUserEmails = [NSMutableArray array];
emails = [[user objectForKey: @"c_emails"] objectEnumerator];
emails = [[user allEmails] objectEnumerator];
while ((email = [emails nextObject])) {
[allUserEmails addObject: [NSDictionary dictionaryWithObjectsAndKeys:
email, @"value", @"work", @"type", nil]];
}
userData = [NSDictionary dictionaryWithObjectsAndKeys:
[user objectForKey: @"c_uid"], @"c_uid",
[user objectForKey: @"c_cn"], @"c_cn",
[user loginInDomain], @"c_uid",
[user cn], @"c_cn",
allUserEmails, @"emails", nil];
[allUsersData addObject: userData];
}