1
0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-14 11:42:23 -05:00

Caldav: fix regressions after refactoring

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@416 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-03-04 17:21:15 +00:00
parent 06f4b6075e
commit 0e1ba6c469

View File

@ -279,7 +279,7 @@ public class CaldavConnection extends AbstractConnection {
} }
protected void appendEventResponse(CaldavResponse response, CaldavRequest request, String path, ExchangeSession.Event event) throws IOException { protected void appendEventResponse(CaldavResponse response, CaldavRequest request, String path, ExchangeSession.Event event) throws IOException {
String eventPath = event.getPath().replaceAll("<", "&lt;").replaceAll(">", "&gt;"); String eventPath = event.getPath().replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("&", "&amp;");
response.startResponse("/users/" + session.getEmail() + "/" + path + "/" + URIUtil.encodeWithinQuery(eventPath)); response.startResponse("/users/" + session.getEmail() + "/" + path + "/" + URIUtil.encodeWithinQuery(eventPath));
response.startPropstat(); response.startPropstat();
if (request.hasProperty("calendar-data")) { if (request.hasProperty("calendar-data")) {
@ -336,7 +336,7 @@ public class CaldavConnection extends AbstractConnection {
base64Encode(session.getInboxCtag())); base64Encode(session.getInboxCtag()));
} }
if (request.hasProperty("displayname")) { if (request.hasProperty("displayname")) {
response.appendProperty("<D:displayname>", "inbox"); response.appendProperty("D:displayname", "inbox");
} }
response.endPropStatOK(); response.endPropStatOK();
response.endResponse(); response.endResponse();
@ -355,7 +355,7 @@ public class CaldavConnection extends AbstractConnection {
"0"); "0");
} }
if (request.hasProperty("displayname")) { if (request.hasProperty("displayname")) {
response.appendProperty("<D:displayname>", "outbox"); response.appendProperty("D:displayname", "outbox");
} }
response.endPropStatOK(); response.endPropStatOK();
response.endResponse(); response.endResponse();
@ -510,7 +510,7 @@ public class CaldavConnection extends AbstractConnection {
response.startPropstat(); response.startPropstat();
if (request.hasProperty("calendar-home-set")) { if (request.hasProperty("calendar-home-set")) {
response.appendProperty("C:calendar-home-set", "<D:href>/users/" + actualPrincipal + "</D:href>"); response.appendProperty("C:calendar-home-set", "<D:href>/users/" + actualPrincipal + "/calendar</D:href>");
} }
if (request.hasProperty("calendar-user-address-set")) { if (request.hasProperty("calendar-user-address-set")) {