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

Monotone-Parent: 48d58a4e991ff751249e19642dfe41818aadaf08

Browse Source 
Monotone-Revision: 76922c5ed8141c0367b26af025fdc509ce3fd7e8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-27T17:47:10
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-10-27 17:47:10 +00:00
parent 2c9d84ce12
commit 1c5a0b19c9
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,5 +1,12 @@
2006-10-27 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Contacts/SOGoContactLDAPFolder.m
([SOGoContactLDAPFolder -_searchAttributes]): fixed typo to
request the "streetAddress" instead of the "streetaddress".
([SOGoContactLDAPFolder -_qualifierForFilter:filter]): lookup
mails that *contain*, and not just *start with* the search
pattern.
* SoObjects/Contacts/SOGoContactLDAPEntry.m ([SOGoContactLDAPEntry
-vCard]): mark address returned from LDAP as the work address.

13
SoObjects/Contacts/SOGoContactLDAPFolder.m
View File

@@ -44,6 +44,7 @@
#define folderListingFields [NSArray arrayWithObjects: @"c_name", @"cn", \
@"displayName", \
@"streetAddress", \
@"sn", @"givenname", @"l", \
@"mail", @"telephonenumber", \
@"mailNickname", \
@@ -205,7 +206,7 @@
@"nsAIMid",
@"nscpaimscreenname",
@"street",
@"streetaddress",
@"streetAddress",
@"postOfficeBox",
@"homePhone",
@"cn",
@@ -284,7 +285,7 @@
id obj;
NGLdapEntry *entry;
NSLog (@"looking up name '%@'...", name);
// NSLog (@"looking up name '%@'...", name);
/* first check attributes directly bound to the application */
obj = [super lookupName: name inContext: context acquire: NO];
@@ -334,7 +335,7 @@
@"(cn='%@*')"
@"OR (sn='%@*')"
@"OR (displayName='%@*')"
@"OR (mail='%@*')"
@"OR (mail='*%@*')"
@"OR (telephoneNumber='*%@*')",
filter, filter, filter, filter, filter];
qualifier = [EOQualifier qualifierWithQualifierFormat: qs];
@@ -359,9 +360,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];