amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-02-28 20:56:24 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 7a38303ac45419355a1bdedefd53d63339248410

Browse Source 
Monotone-Revision: f8af7a968c459aff400e85a6c5422a0c7a370167

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-28T04:42:02
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-03-28 04:42:02 +00:00
parent 4489085c59
commit d28ca1ecdc
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2012-03-28 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/LDAPSource.m (-allEntryIDs): take the _filter
ivar into account.
2012-03-27 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Contacts/SOGoContactFolders.m

14
SoObjects/SOGo/LDAPSource.m
View File

@@ -830,6 +830,8 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField
NSEnumerator *entries;
NGLdapEntry *currentEntry;
NGLdapConnection *ldapConnection;
EOQualifier *qualifier;
NSMutableString *qs;
NSString *value;
NSArray *attributes;
NSMutableArray *ids;
@@ -838,17 +840,23 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField
ldapConnection = [self _ldapConnection];
attributes = [NSArray arrayWithObject: IDField];
qs = [NSMutableString stringWithFormat: @"(%@='*')", CNField];
if ([_filter length])
[qs appendFormat: @" AND %@", _filter];
qualifier = [EOQualifier qualifierWithQualifierFormat: qs];
if ([_scope caseInsensitiveCompare: @"BASE"] == NSOrderedSame)
entries = [ldapConnection baseSearchAtBaseDN: baseDN
qualifier: nil
qualifier: qualifier
attributes: attributes];
else if ([_scope caseInsensitiveCompare: @"ONE"] == NSOrderedSame)
entries = [ldapConnection flatSearchAtBaseDN: baseDN
qualifier: nil
qualifier: qualifier
attributes: attributes];
else
entries = [ldapConnection deepSearchAtBaseDN: baseDN
qualifier: nil
qualifier: qualifier
attributes: attributes];
while ((currentEntry = [entries nextObject]))