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

See ChangeLog

Browse Source 
Monotone-Parent: fdd87c8990a184548d84798a93d2b2df80f30651
Monotone-Revision: fc98ebd698555332841f6988e47ba738f8e5e2da

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-03-21T18:24:06
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-03-21 18:24:06 +00:00
parent 8508800ca5
commit eb6629d89f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -6,6 +6,9 @@
retrieve the users from LDAP sources that limit the number
of results.
* SoObjects/SOGo/LDAPSource.m (:_qualifierForFilter): avoid
duplicated filters on the CN attribute.
2011-03-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreCalendarMessage.m

6
SoObjects/SOGo/LDAPSource.m
View File

@@ -596,7 +596,7 @@ static NSArray *commonSearchFields;
- (EOQualifier *) _qualifierForFilter: (NSString *) filter
{
NSMutableArray *fields;
NSString *searchFormat, *fieldFormat, *escapedFilter;
NSString *fieldFormat, *searchFormat, *escapedFilter;
EOQualifier *qualifier;
NSMutableString *qs;
@@ -611,10 +611,10 @@ static NSArray *commonSearchFields;
fieldFormat = [NSString stringWithFormat: @"(%%@='%@*')", escapedFilter];
fields = [NSMutableArray arrayWithArray: searchFields];
[fields addObjectsFromArray: mailFields];
[fields addObject: CNField];
searchFormat = [[[fields uniqueObjects] stringsWithFormat: fieldFormat]
componentsJoinedByString: @" OR "];
[qs appendFormat: @"(%@='%@*') OR %@",
CNField, escapedFilter, searchFormat];
[qs appendString: searchFormat];
}
if (_filter && [_filter length])