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

Monotone-Parent: 79461b8ac05970c57a512022f8200f6a8524119e

Browse Source 
Monotone-Revision: e0a110c700ace37c521b69b4fc25af7050fc415b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-04-25T15:16:58
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-04-25 15:16:58 +00:00
parent e4e5aabd6f
commit 6165dff19e
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2008-04-25 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/LDAPSource.m ([LDAPSource -fetchContactsMatching:match])
([LDAPSource -lookupContactEntryWithUIDorEmail:uid]): take all the
mail fields into account when doing a search.
2008-04-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoObject.m ([SOGoObject +initialize]): the
SoObjects/SOGo/LDAPSource.m
+17 -12
View File
@@ -31,6 +31,7 @@
#import "LDAPSource.h"
#import "LDAPUserManager.h"
#import "NSArray+Utilities.h"
static NSArray *commonSearchFields;
static int timeLimit;
@@ -268,7 +269,8 @@ static int sizeLimit;
[self _initLDAPConnection];
entries = [ldapConnection deepSearchAtBaseDN: baseDN
qualifier: [self _qualifierForBindFilter: loginToCheck]
qualifier:
[self _qualifierForBindFilter: loginToCheck]
attributes: [NSArray arrayWithObject: @"dn"]];
userEntry = [entries nextObject];
if (userEntry)
@@ -318,9 +320,13 @@ static int sizeLimit;
/* contact management */
- (EOQualifier *) _qualifierForFilter: (NSString *) filter
{
NSString *qs;
NSString *qs, *mailFormat, *fieldFormat;
EOQualifier *qualifier;
fieldFormat = [NSString stringWithFormat: @"(%%@='%@*')", filter];
mailFormat = [[mailFields stringsWithFormat: fieldFormat]
componentsJoinedByString: @" OR "];
if ([filter length] > 0)
{
if ([filter isEqualToString: @"."])
@@ -330,9 +336,9 @@ static int sizeLimit;
@"(cn='%@*')"
@"OR (sn='%@*')"
@"OR (displayName='%@*')"
@"OR (mail='%@*')"
@"OR %@"
@"OR (telephoneNumber='*%@*')",
filter, filter, filter, filter, filter];
filter, filter, filter, mailFormat, filter];
qualifier = [EOQualifier qualifierWithQualifierFormat: qs];
}
else
@@ -343,12 +349,13 @@ static int sizeLimit;
- (EOQualifier *) _qualifierForUIDFilter: (NSString *) uid
{
NSString *qs;
NSString *qs, *mailFormat, *fieldFormat;
qs = [NSString stringWithFormat: (@"(%@='%@') OR (mail='%@')"
@" OR (mozillaSecondEmail='%@')"
@" OR (xmozillasecondemail='%@')"),
UIDField, uid, uid, uid, uid];
fieldFormat = [NSString stringWithFormat: @"(%%@='%@')", uid];
mailFormat = [[mailFields stringsWithFormat: fieldFormat]
componentsJoinedByString: @" OR "];
qs = [NSString stringWithFormat: (@"(%@='%@') OR %@"),
UIDField, uid, mailFormat];
return [EOQualifier qualifierWithQualifierFormat: qs];
}
@@ -474,14 +481,12 @@ static int sizeLimit;
contactEntry = [NSMutableDictionary dictionary];
attributes = [[self _searchAttributes] objectEnumerator];
currentAttribute = [attributes nextObject];
while (currentAttribute)
while ((currentAttribute = [attributes nextObject]))
{
value = [[ldapEntry attributeWithName: currentAttribute]
stringValueAtIndex: 0];
if (value)
[contactEntry setObject: value forKey: currentAttribute];
currentAttribute = [attributes nextObject];
}
value = [[ldapEntry attributeWithName: IDField] stringValueAtIndex: 0];
if (!value)