amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-11 11:25:12 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 463195ab0268a4a769eab22f23b6aecf0c87ad79

Browse Source 
Monotone-Revision: 9abbb51cbabcad645190865841814453369fa85f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-18T10:16:25
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-11-18 10:16:25 +00:00
parent e3cdb8ecbf
commit 73bfada6bf
50 changed files with 1751 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/LDAPUserManager.m
+7 -17
View File
@@ -27,6 +27,7 @@
#import <Foundation/NSUserDefaults.h>
#import <Foundation/NSValue.h>
#import "NSArray+Utilities.h"
#import "LDAPSource.h"
#import "LDAPUserManager.h"
@@ -289,9 +290,7 @@ static NSString *defaultMailDomain = nil;
emails = [contact objectForKey: @"emails"];
uid = [contact objectForKey: @"c_uid"];
systemEmail = [NSString stringWithFormat: @"%@@%@", uid, defaultMailDomain];
if ([emails containsObject: systemEmail])
[emails removeObject: systemEmail];
[emails addObject: systemEmail];
[emails addObjectUniquely: systemEmail];
[contact setObject: [emails objectAtIndex: 0] forKey: @"c_email"];
}
@@ -302,8 +301,8 @@ static NSString *defaultMailDomain = nil;
NSDictionary *userEntry;
NSEnumerator *ldapSources;
LDAPSource *currentSource;
NSString *cn, *email, *c_uid;
NSArray *attrs;
NSString *cn, *c_uid;
NSArray *c_emails;
emails = [NSMutableArray array];
cn = nil;
@@ -320,18 +319,9 @@ static NSString *defaultMailDomain = nil;
cn = [userEntry objectForKey: @"c_cn"];
if (!c_uid)
c_uid = [userEntry objectForKey: @"c_uid"];
if ((attrs = [[sourcesMetadata objectForKey: [currentSource sourceID]] objectForKey: @"MailFieldNames"]))
{
int i;
for (i = 0; i < [attrs count]; i++)
{
email = [userEntry objectForKey: [attrs objectAtIndex: i]];
if (email && ![emails containsObject: email])
[emails addObject: email];
}
}
c_emails = [userEntry objectForKey: @"c_emails"];
if ([c_emails count])
[emails addObjectsFromArray: c_emails];
}
currentSource = [ldapSources nextObject];
}