Monotone-Parent: 349943f14a2072de2bead5914325b1b11a7c4f90

Monotone-Revision: 6a4ca400c5002f16d1bc1a5c29569fd895195891

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-10T16:05:18
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-05-10 16:05:18 +00:00
parent 1d34b811d4
commit f3093cc2e0
2 changed files with 7 additions and 3 deletions
+2
View File
@@ -2,6 +2,8 @@
* SoObjects/SOGo/LDAPUserManager.m ([LDAPUserManager
-contactInfosForUserWithUIDorEmail:uid]): check that uid is not empty.
([LDAPUserManager -_fillContactMailRecords:contact]): if the
system email is already present, remove it before adding it.
* SoObjects/SOGo/LDAPSource.m ([LDAPSource
-checkLogin:loginToCheckandPassword:passwordToCheck]): check that
+5 -3
View File
@@ -265,12 +265,14 @@ static NSString *defaultMailDomain = nil;
- (void) _fillContactMailRecords: (NSMutableDictionary *) contact
{
NSMutableArray *emails;
NSString *uid;
NSString *uid, *systemEmail;
emails = [contact objectForKey: @"emails"];
uid = [contact objectForKey: @"c_uid"];
[emails addObject:
[NSString stringWithFormat: @"%@@%@", uid, defaultMailDomain]];
systemEmail = [NSString stringWithFormat: @"%@@%@", uid, defaultMailDomain];
if ([emails containsObject: systemEmail])
[emails removeObject: systemEmail];
[emails addObject: systemEmail];
[contact setObject: [emails objectAtIndex: 0] forKey: @"c_email"];
}