moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2025-02-28 09:21:49 -05:00
Code Issues Releases Wiki Activity

Caldav: Exclude RSVP=FALSE from notifications recipients list for Outlook 2003 compatibility

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@545 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-04-28 21:01:40 +00:00
parent 9ad2490e3c
commit 0a42c44863
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/java/davmail/exchange/ExchangeSession.java
View File

@ -363,7 +363,7 @@ public class ExchangeSession {
// test form based authentication // test form based authentication
checkFormLoginQueryString(logonMethod); checkFormLoginQueryString(logonMethod);
// workaround for post logon script redirect // workaround for post logon script redirect
if (httpClient.getState().getCookies().length == 0) { if (httpClient.getState().getCookies().length == 0) {
logonMethod = buildLogonMethod(httpClient, logonMethod); logonMethod = buildLogonMethod(httpClient, logonMethod);
@ -375,7 +375,7 @@ public class ExchangeSession {
} }
protected void checkFormLoginQueryString(HttpMethod logonMethod) throws DavMailAuthenticationException { protected void checkFormLoginQueryString(HttpMethod logonMethod) throws DavMailAuthenticationException {
String queryString = logonMethod.getQueryString(); String queryString = logonMethod.getQueryString();
if (queryString != null && queryString.contains("reason=2")) { if (queryString != null && queryString.contains("reason=2")) {
logonMethod.releaseConnection(); logonMethod.releaseConnection();
if (poolKey.userName != null && poolKey.userName.contains("\\")) { if (poolKey.userName != null && poolKey.userName.contains("\\")) {
@ -888,7 +888,8 @@ public class ExchangeSession {
ArrayList<DavProperty> list = new ArrayList<DavProperty>(); ArrayList<DavProperty> list = new ArrayList<DavProperty>();
list.add(new DefaultDavProperty(DavPropertyName.create("outlookfolderclass", Namespace.getNamespace("http://schemas.microsoft.com/exchange/")), "IPF.Note")); list.add(new DefaultDavProperty(DavPropertyName.create("outlookfolderclass", Namespace.getNamespace("http://schemas.microsoft.com/exchange/")), "IPF.Note"));
PropPatchMethod method = new PropPatchMethod(URIUtil.encodePath(folderPath), list) { PropPatchMethod method = new PropPatchMethod(URIUtil.encodePath(folderPath), list) {
@Override public String getName() { @Override
public String getName() {
return "MKCOL"; return "MKCOL";
} }
}; };
@ -1485,8 +1486,10 @@ public class ExchangeSession {
} }
if ("ORGANIZER".equals(key)) { if ("ORGANIZER".equals(key)) {
organizer = value; organizer = value;
// exclude current user and invalid values from recipients // exclude current user and invalid values from recipients
} else if (!email.equalsIgnoreCase(value) && value.indexOf('@') >=0) { // also exclude RSVP=FALSE attendees
} else if (!email.equalsIgnoreCase(value) && value.indexOf('@') >= 0
&& line.indexOf("RSVP=FALSE") < 0) {
attendees.add(value); attendees.add(value);
} }
} }
@ -1742,6 +1745,7 @@ public class ExchangeSession {
/** /**
* Build base path for cmd commands (galfind, gallookup). * Build base path for cmd commands (galfind, gallookup).
* This does not work with freebusy, which requires /public/ * This does not work with freebusy, which requires /public/
*
* @return cmd base path * @return cmd base path
*/ */
public String getCmdBasePath() { public String getCmdBasePath() {
@ -1755,7 +1759,7 @@ public class ExchangeSession {
public String getEmail(String alias) throws IOException { public String getEmail(String alias) throws IOException {
String emailResult = null; String emailResult = null;
if (alias != null) { if (alias != null) {
String path = getCmdBasePath()+"?Cmd=galfind&AN=" + URIUtil.encodeWithinQuery(alias); String path = getCmdBasePath() + "?Cmd=galfind&AN=" + URIUtil.encodeWithinQuery(alias);
GetMethod getMethod = new GetMethod(path); GetMethod getMethod = new GetMethod(path);
try { try {
int status = httpClient.executeMethod(getMethod); int status = httpClient.executeMethod(getMethod);
@ -1883,7 +1887,7 @@ public class ExchangeSession {
*/ */
public Map<String, Map<String, String>> galFind(String searchAttribute, String searchValue) throws IOException { public Map<String, Map<String, String>> galFind(String searchAttribute, String searchValue) throws IOException {
Map<String, Map<String, String>> results; Map<String, Map<String, String>> results;
GetMethod getMethod = new GetMethod(URIUtil.encodePathQuery(getCmdBasePath()+"?Cmd=galfind&" + searchAttribute + '=' + searchValue)); GetMethod getMethod = new GetMethod(URIUtil.encodePathQuery(getCmdBasePath() + "?Cmd=galfind&" + searchAttribute + '=' + searchValue));
try { try {
int status = httpClient.executeMethod(getMethod); int status = httpClient.executeMethod(getMethod);
if (status != HttpStatus.SC_OK) { if (status != HttpStatus.SC_OK) {
@ -1901,7 +1905,7 @@ public class ExchangeSession {
if (!disableGalLookup) { if (!disableGalLookup) {
GetMethod getMethod = null; GetMethod getMethod = null;
try { try {
getMethod = new GetMethod(URIUtil.encodePathQuery(getCmdBasePath()+"?Cmd=gallookup&ADDR=" + person.get("EM"))); getMethod = new GetMethod(URIUtil.encodePathQuery(getCmdBasePath() + "?Cmd=gallookup&ADDR=" + person.get("EM")));
int status = httpClient.executeMethod(getMethod); int status = httpClient.executeMethod(getMethod);
if (status != HttpStatus.SC_OK) { if (status != HttpStatus.SC_OK) {
throw new DavMailException("EXCEPTION_UNABLE_TO_FIND_USERS", status, getMethod.getURI()); throw new DavMailException("EXCEPTION_UNABLE_TO_FIND_USERS", status, getMethod.getURI());