moparisthebest
/
davmail
mirror of https://github.com/moparisthebest/davmail
1
0
Fork 0
Code Issues Releases Wiki Activity

LDAP: a few more attribute fixes 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1334 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-08-10 00:03:16 +00:00
parent 3d98a34328
commit 7897bcc77f
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/davmail/exchange/dav/DavExchangeSession.java
View File

@ -224,7 +224,7 @@ public class DavExchangeSession extends ExchangeSession {
GALFIND_ATTRIBUTE_MAP.put("displayName", "DN");
GALFIND_ATTRIBUTE_MAP.put("telephoneNumber", "PH");
GALFIND_ATTRIBUTE_MAP.put("l", "OFFICE");
GALFIND_ATTRIBUTE_MAP.put("company", "CP");
GALFIND_ATTRIBUTE_MAP.put("o", "CP");
GALFIND_ATTRIBUTE_MAP.put("title", "TL");
GALFIND_ATTRIBUTE_MAP.put("givenName", "first");
@ -232,10 +232,11 @@ public class DavExchangeSession extends ExchangeSession {
GALFIND_ATTRIBUTE_MAP.put("sn", "last");
GALFIND_ATTRIBUTE_MAP.put("street", "street");
GALFIND_ATTRIBUTE_MAP.put("st", "state");
GALFIND_ATTRIBUTE_MAP.put("postalCode", "zip");
GALFIND_ATTRIBUTE_MAP.put("c", "country");
GALFIND_ATTRIBUTE_MAP.put("departement", "department");
GALFIND_ATTRIBUTE_MAP.put("postalcode", "zip");
GALFIND_ATTRIBUTE_MAP.put("co", "country");
GALFIND_ATTRIBUTE_MAP.put("department", "department");
GALFIND_ATTRIBUTE_MAP.put("mobile", "mobile");
GALFIND_ATTRIBUTE_MAP.put("roomnumber", "office");
}
@Override

1
src/java/davmail/exchange/dav/Field.java
View File

@ -193,7 +193,6 @@ public class Field {
createField("anniversary", URN_SCHEMAS_CONTACTS, "weddinganniversary"); // WeddingAnniversary
createField(URN_SCHEMAS_CONTACTS, "businesshomepage"); // PR_BUSINESS_HOME_PAGE 0x3A51 String
createField(URN_SCHEMAS_CONTACTS, "personalHomePage"); // PR_PERSONAL_HOME_PAGE 0x3A50 String
//createField(URN_SCHEMAS_CONTACTS, "c"); // country DistinguishedPropertySetType.PublicStrings/urn:schemas:contacts:c/String
createField(URN_SCHEMAS_CONTACTS, "cn"); // PR_DISPLAY_NAME 0x3001 String
createField(URN_SCHEMAS_CONTACTS, "co"); // workAddressCountry DistinguishedPropertySetType.Address/0x00008049/String
createField(URN_SCHEMAS_CONTACTS, "department"); // PR_DEPARTMENT_NAME 0x3A18 String

1
src/java/davmail/ldap/LdapConnection.java
View File

@ -1422,7 +1422,6 @@ public class LdapConnection extends AbstractConnection {
*/
protected void sendPersons(int currentMessageId, String baseContext, Map<String, ExchangeSession.Contact> persons, Set<String> returningAttributes) throws IOException {
boolean needObjectClasses = returningAttributes.contains("objectclass") || returningAttributes.isEmpty();
boolean iCalSearch = returningAttributes.contains("apple-serviceslocator");
boolean returnAllAttributes = returningAttributes.isEmpty();
for (ExchangeSession.Contact person : persons.values()) {