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

Monotone-Parent: 3ddca8791831b56115aff88f2ea9f9bdf89a6ef7

Browse Source 
Monotone-Revision: c08c1b108dddcf6aa1bcd2741e800b8a90587384

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-04-17T13:45:03
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-04-17 13:45:03 +00:00
parent f46adb59ae
commit 23daba3d29
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6
View File
@@ -1,3 +1,9 @@
2007-04-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Contacts/SOGoContactLDAPFolder.m
([SOGoContactLDAPFolder
-lookupContactsWithFilter:filtersortBy:sortKeyordering:sortOrdering]): request field "uid" when doing a search.
2007-04-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Main/SOGo.m ([SOGo +initialize]): on GNUstep, trigger some
SoObjects/Contacts/SOGoContactLDAPFolder.m
+19 -24
View File
@@ -50,6 +50,7 @@
@"mail", @"telephonenumber", \
@"mailNickname", \
@"sAMAccountName", \
@"uid", \
nil]
@class WOContext;
@@ -97,20 +98,11 @@
- (void) dealloc
{
if (connection)
{
if ([connection isBound])
[connection unbind];
[connection release];
}
if (contactIdentifier)
[contactIdentifier release];
if (userIdentifier)
[userIdentifier release];
if (rootDN)
[rootDN release];
if (entries)
[entries release];
[connection release];
[contactIdentifier release];
[userIdentifier release];
[rootDN release];
[entries release];
[super dealloc];
}
@@ -333,13 +325,16 @@
if (filter && [filter length] > 0)
{
qs = [NSString stringWithFormat:
@"(cn='%@*')"
@"OR (sn='%@*')"
@"OR (displayName='%@*')"
@"OR (mail='%@*')"
@"OR (telephoneNumber='*%@*')",
filter, filter, filter, filter, filter];
if ([filter isEqualToString: @"."])
qs = @"(cn='*')";
else
qs = [NSString stringWithFormat:
@"(cn='%@*')"
@"OR (sn='%@*')"
@"OR (displayName='%@*')"
@"OR (mail='%@*')"
@"OR (telephoneNumber='*%@*')",
filter, filter, filter, filter, filter];
qualifier = [EOQualifier qualifierWithQualifierFormat: qs];
}
else
@@ -362,9 +357,9 @@
if (filter && [filter length] > 0)
{
// NSLog (@"%@: fetching records matching '*%@*', sorted by '%@'"
// @" in order %d",
// self, filter, sortKey, sortOrdering);
NSLog (@"%@: fetching records matching '%@', sorted by '%@'"
@" in order %d",
self, filter, sortKey, sortOrdering);
records = [NSMutableArray new];
[records autorelease];