X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2FCalDAV%2FCalDAV.cpp;h=38c5bdb5fc1330c5951c290753fb947198b1837a;hb=6db84a2ded5a6d8f10b341965e303f329588f293;hp=bc62ff2a789e5f84d3c759dd609e0426ddfc1948;hpb=05662d2300b9da67452a77011de669b88e22cd75;p=xestiacalendar%2F.git

diff --git a/source/objects/CalDAV/CalDAV.cpp b/source/objects/CalDAV/CalDAV.cpp
index bc62ff2..38c5bdb 100644
--- a/source/objects/CalDAV/CalDAV.cpp
+++ b/source/objects/CalDAV/CalDAV.cpp
@@ -476,6 +476,7 @@ CalDAVCalendarList CalDAV::GetCalendars(){
 	" <d:prop>\n"
         "  <d:resourcetype />\n"
 	"  <d:displayname />\n"
+	"  <d:sync-token />\n"
 	"  <x0:calendar-color />\n"
 	"  <x0:calendar-order />\n"
 	"  <cs:getctag />\n"
@@ -546,6 +547,16 @@ CalDAVCalendarList CalDAV::GetCalendars(){
 
 CalDAVServerResult CalDAV::AddCalendar(string CalendarName){
 	
+	CalDAVServerResult ServerResult;
+	
+	AddCalendar(&CalendarName, nullptr);
+	
+	return ServerResult;
+	
+}
+
+CalDAVServerResult CalDAV::AddCalendar(string *CalendarName, string *CalendarShortName){
+	
 	CalDAVServerResult ServerResult;
 	CalDAVSendData CalendarAddSendData;
 	
@@ -565,9 +576,19 @@ CalDAVServerResult CalDAV::AddCalendar(string CalendarName){
 	
 	// Generate the UUID.
 	
-	string UUIDValue = GenerateUUID();
-	UUIDValue.erase(UUIDValue.end()-1);
+	string UUIDValue = "";
+	
+	if (CalendarShortName == nullptr){
+	
+		UUIDValue = GenerateUUID();
+		UUIDValue.erase(UUIDValue.end()-1);
+
+	} else {
 	
+		UUIDValue = *CalendarShortName;
+		
+	}
+		
 	string CalendarHomeURL = CalendarHomeURI;
 	CalendarHomeURL.append(UUIDValue);
 	CalendarHomeURL.append("/");
@@ -581,7 +602,7 @@ CalDAVServerResult CalDAV::AddCalendar(string CalendarName){
 	" <d:set>\n"
 	"  <d:prop>\n"
 	"   <d:displayname>";
-	CalendarAddRequest += CalendarName;
+	CalendarAddRequest += *CalendarName;
 	CalendarAddRequest += "</d:displayname>\n"
 	"   <c:supported-calendar-component-set>\n"
 	"    <c:comp name=\"VTODO\"/>\n"
@@ -908,6 +929,101 @@ CalDAVServerResult CalDAV::DeleteCalendar(string *CalendarHREF){
 	
 }
 
+CalDAVServerResult CalDAV::GetEntryETag(string *CalendarEntryHREF, string *ETagValue){
+	
+	CalDAVServerResult ServerResult;
+	CalDAVSendData EntryETagGetData;
+	
+	// Build the server address.
+	
+	string UserPrincipalURI = "";
+	UserPrincipalURI = GetUserPrincipal();
+	
+	if (UserPrincipalURI.size() == 0){
+		
+		return ServerResult;
+		
+	}
+	
+	string CalendarHomeURI = "";
+	CalendarHomeURI = GetCalendarHome(UserPrincipalURI);
+
+	// Split the path and filename.
+	
+	string EntryURIPath;
+	string EntryFilename;
+	
+	SplitPathFilename(CalendarEntryHREF, &EntryURIPath, &EntryFilename);
+	
+	// Build the request for the server.
+
+	string EntryETagRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+	"<c:calendar-multiget xmlns:d=\"DAV:\" xmlns:c=\"urn:ietf:params:xml:ns:caldav\">\n"
+	" <d:prop>\n"
+	"  <d:getetag />\n"
+	" </d:prop>\n"
+	" <d:href>";
+	EntryETagRequest += (*CalendarEntryHREF);
+	EntryETagRequest += "</d:href>\n"
+	"</c:calendar-multiget>";
+	
+	EntryETagGetData.readptr = &EntryETagRequest;
+	EntryETagGetData.sizeleft = EntryETagRequest.size();
+	
+	// Build the calendar list address.
+	
+	struct curl_slist *GetETagRequestHeader = NULL;
+
+	GetETagRequestHeader = curl_slist_append(GetETagRequestHeader, "Depth: 1");	
+	GetETagRequestHeader = curl_slist_append(GetETagRequestHeader, "Prefer: return-minimal");
+	GetETagRequestHeader = curl_slist_append(GetETagRequestHeader, "Content-Type: application/xml; charset=utf-8");
+	
+	string GetETagURLAddress = BuildServerAddress(&ConnectionData, EntryURIPath);
+	
+	curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, GetETagRequestHeader);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_URL, GetETagURLAddress.c_str());
+	curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "REPORT");
+	curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 1L);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, &EntryETagGetData);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, CalDAVSend);
+	
+	// Attempt to get the entity tag.
+	
+	ServerData.clear();
+	ServerHeader.clear();
+	
+	CURLcode ServerConnectionResult = curl_easy_perform(ConnectionHandle);
+	
+	if (ServerConnectionResult == CURLE_OK){
+		ServerResult.Result = CALDAVQUERYRESULT_OK;
+	} else {
+		ServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;		
+	}
+	ServerResult.Code = ServerConnectionResult;
+	curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ServerResult.HTTPCode);
+	
+	if (ServerConnectionResult != CURLE_OK){
+		return ServerResult;
+	}
+	
+	// Get the entity tag from the result.
+	
+	*ETagValue = ProcessXMLEntryETag();
+	
+	// Restore the original settings.
+	
+	string OriginalServerAddress = BuildServerAddress(&ConnectionData, "/principals/");
+	curl_easy_setopt(ConnectionHandle, CURLOPT_URL, OriginalServerAddress.c_str());
+	curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, NULL);	
+	curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 0L);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, NULL);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, NULL);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, NULL);
+	
+	return ServerResult;
+	
+}
+
 CalDAVServerResult CalDAV::AddEntry(string *CalendarEntryHREF, string *EntryData){
 	
 	// Add an entry to the calendar collection.
@@ -921,10 +1037,71 @@ CalDAVServerResult CalDAV::AddEntry(string *CalendarEntryHREF, string *EntryData
 	
 	EntryAddSendData.readptr = EntryData;
 	EntryAddSendData.sizeleft = EntryData->size();
+	
+	struct curl_slist *CalendarRequestHeader = NULL;
+	
+	CalendarRequestHeader = curl_slist_append(CalendarRequestHeader, "Content-Type: text/calendar; charset=utf-8");
+	
+	curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, CalendarRequestHeader);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_URL, EntryAddURLAddress.c_str());
+	curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "PUT");
+	curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 1L);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, &EntryAddSendData);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, CalDAVSend);
+	
+	// Process the data.
+	
+	ServerData.clear();
+	ServerHeader.clear();
+	
+	CURLcode ServerConnectionResult = curl_easy_perform(ConnectionHandle);
+	
+	if (ServerConnectionResult == CURLE_OK){
+		ServerResult.Result = CALDAVQUERYRESULT_OK;
+	} else {
+		ServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;		
+	}
+	ServerResult.Code = ServerConnectionResult;
+	curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ServerResult.HTTPCode);
+	
+	// Restore the original settings.
+	
+	string OriginalServerAddress = BuildServerAddress(&ConnectionData, "/principals/");
+	curl_easy_setopt(ConnectionHandle, CURLOPT_URL, OriginalServerAddress.c_str());
+	curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, NULL);	
+	curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 0L);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, NULL);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, NULL);
+	curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, NULL);
+	
+	return ServerResult;
+	
+}
 
+CalDAVServerResult CalDAV::EditEntry(string *CalendarEntryHREF, string *EntryData, string *EntryETag){
+	
+	// Edit an entry in the calendar collection.
+
+	// Add an entry to the calendar collection.
+	
+	CalDAVServerResult ServerResult;
+	CalDAVSendData EntryAddSendData;
+	
+	// Build the calendar list address.
+	
+	string EntryAddURLAddress = BuildServerAddress(&ConnectionData, (*CalendarEntryHREF));
+	
+	EntryAddSendData.readptr = EntryData;
+	EntryAddSendData.sizeleft = EntryData->size();
+	
+	string IfMatchHeader = "If-Match: \"";
+	IfMatchHeader.append(*EntryETag);
+	IfMatchHeader.append("\"");
+	
 	struct curl_slist *CalendarRequestHeader = NULL;
 	
 	CalendarRequestHeader = curl_slist_append(CalendarRequestHeader, "Content-Type: text/calendar; charset=utf-8");
+	CalendarRequestHeader = curl_slist_append(CalendarRequestHeader, IfMatchHeader.c_str());	
 	
 	curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, CalendarRequestHeader);
 	curl_easy_setopt(ConnectionHandle, CURLOPT_URL, EntryAddURLAddress.c_str());