X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2FCalDAV%2FCalDAV.cpp;h=467f3e18d2b872892c137a53ada0bcc9a6a19b62;hb=3511800e4e2c6630a24a4a4945f252f976da75c8;hp=a34ca071cf655e557637d6177f1449543aceba64;hpb=c9138ee3356f67e30b75dd6fb4b9ce8d020423cc;p=xestiacalendar%2F.git
diff --git a/source/objects/CalDAV/CalDAV.cpp b/source/objects/CalDAV/CalDAV.cpp
index a34ca07..467f3e1 100644
--- a/source/objects/CalDAV/CalDAV.cpp
+++ b/source/objects/CalDAV/CalDAV.cpp
@@ -437,12 +437,13 @@ string CalDAV::GetCalendarHome(string UserPrincipalURI){
// Reset the changed settings.
- string OriginalServerAddress = BuildServerAddress(&ConnectionData, "/principals");
+ string OriginalServerAddress = BuildServerAddress(&ConnectionData, "/principals/");
curl_easy_setopt(ConnectionHandle, CURLOPT_URL, OriginalServerAddress.c_str());
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 CalendarHomeURI;
@@ -467,12 +468,8 @@ CalDAVCalendarList CalDAV::GetCalendars(){
string CalendarHomeURI = "";
CalendarHomeURI = GetCalendarHome(UserPrincipalURI);
- cout << ServerData << endl;
-
string CalendarListURLAddress = BuildServerAddress(&ConnectionData, CalendarHomeURI);
- cout << CalendarListURLAddress << endl;
-
string CalendarListRequest = "\n"
"\n"
@@ -483,6 +480,7 @@ CalDAVCalendarList CalDAV::GetCalendars(){
" \n"
" \n"
" \n"
+ " \n"
" \n"
"";
@@ -511,13 +509,31 @@ CalDAVCalendarList CalDAV::GetCalendars(){
CURLcode ServerResult = curl_easy_perform(ConnectionHandle);
- cout << ServerData << endl;
-
//ServerList = ProcessXMLCalendarList();
+ if (ServerResult == CURLE_OK){
+ ConnectionServerResult.Result = CALDAVQUERYRESULT_OK;
+ } else {
+ ConnectionServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ }
+ ConnectionServerResult.Code = ServerResult;
+ curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ConnectionServerResult.HTTPCode);
+
+ if (ServerResult != CURLE_OK){
+
+ return ServerList;
+
+ }
+
+ // Process the received XML data into a list of calendars
+ // and locations.
+
+ ServerList = ProcessXMLCalendarList();
+
// Restore the original settings.
- string OriginalServerAddress = BuildServerAddress(&ConnectionData, "/principals");
+ 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);
@@ -528,6 +544,423 @@ CalDAVCalendarList CalDAV::GetCalendars(){
}
+CalDAVServerResult CalDAV::AddCalendar(string CalendarName){
+
+ CalDAVServerResult ServerResult;
+ CalDAVSendData CalendarAddSendData;
+
+ // Build the server address.
+
+ string UserPrincipalURI = "";
+ UserPrincipalURI = GetUserPrincipal();
+
+ if (UserPrincipalURI.size() == 0){
+
+ return ServerResult;
+
+ }
+
+ string CalendarHomeURI = "";
+ CalendarHomeURI = GetCalendarHome(UserPrincipalURI);
+
+ // Generate the UUID.
+
+ string UUIDValue = GenerateUUID();
+ UUIDValue.erase(UUIDValue.end()-1);
+
+ string CalendarHomeURL = CalendarHomeURI;
+ CalendarHomeURL.append(UUIDValue);
+ CalendarHomeURL.append("/");
+
+ // Build the calendar list address.
+
+ string CalendarListURLAddress = BuildServerAddress(&ConnectionData, CalendarHomeURL);
+
+ string CalendarAddRequest = "\n"
+ "\n"
+ " \n"
+ " \n"
+ " ";
+ CalendarAddRequest += CalendarName;
+ CalendarAddRequest += "\n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ " \n"
+ "";
+
+ CalendarAddSendData.readptr = &CalendarAddRequest;
+ CalendarAddSendData.sizeleft = CalendarAddRequest.size();
+
+ // Setup the header.
+
+ struct curl_slist *CalendarRequestHeader = NULL;
+
+ //curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, CalendarRequestHeader);
+ curl_easy_setopt(ConnectionHandle, CURLOPT_URL, CalendarListURLAddress.c_str());
+ curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "MKCALENDAR");
+ curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 1L);
+ curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, &CalendarAddSendData);
+ 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);
+
+ return ServerResult;
+
+}
+
+CalDAVServerResult CalDAV::EditCalendarProcess(string *CalendarHREF,
+ string *CalendarName,
+ Colour *CalendarColour,
+ string *CalendarDescription,
+ int *CalendarOrder){
+
+ CalDAVServerResult ServerResult;
+ CalDAVSendData CalendarEditSendData;
+
+ // Build the server address.
+
+ string UserPrincipalURI = "";
+ UserPrincipalURI = GetUserPrincipal();
+
+ if (UserPrincipalURI.size() == 0){
+
+ return ServerResult;
+
+ }
+
+ string CalendarHomeURI = "";
+ CalendarHomeURI = GetCalendarHome(UserPrincipalURI);
+
+ // Generate the UUID.
+
+ string UUIDValue = GenerateUUID();
+ UUIDValue.erase(UUIDValue.end()-1);
+
+ string CalendarHomeURL = CalendarHomeURI;
+ CalendarHomeURL.append(UUIDValue);
+ CalendarHomeURL.append("/");
+
+ // Build the calendar list address.
+
+ string CalendarEditURLAddress = BuildServerAddress(&ConnectionData, (*CalendarHREF));
+
+ string CalendarEditRequest = "\n"
+ "\n"
+ " \n"
+ " \n";
+
+ // Update the calendar name.
+
+ if (CalendarName != nullptr){
+
+ CalendarEditRequest += "";
+ CalendarEditRequest += (*CalendarName);
+ CalendarEditRequest += "\n";
+
+ }
+
+ // Update the calendar colour.
+
+ if (CalendarColour != nullptr){
+
+ CalendarEditRequest += "";
+ CalendarEditRequest += (*CalendarColour);
+ CalendarEditRequest += "\n";
+
+ }
+
+ // Update the calendar description.
+
+ if (CalendarDescription != nullptr){
+
+ CalendarEditRequest += "";
+ CalendarEditRequest += (*CalendarDescription);
+ CalendarEditRequest += "\n";
+
+ }
+
+ // Update the calendar order.
+
+ if (CalendarOrder != nullptr){
+
+ CalendarEditRequest += "";
+ CalendarEditRequest += to_string((*CalendarOrder));
+ CalendarEditRequest += "\n";
+
+ }
+
+ CalendarEditRequest += " \n"
+ " \n"
+ "";
+
+ CalendarEditSendData.readptr = &CalendarEditRequest;
+ CalendarEditSendData.sizeleft = CalendarEditRequest.size();
+
+ // Setup the header.
+
+ struct curl_slist *CalendarRequestHeader = NULL;
+
+ //curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, CalendarRequestHeader);
+ curl_easy_setopt(ConnectionHandle, CURLOPT_URL, CalendarEditURLAddress.c_str());
+ curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "PROPPATCH");
+ curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 1L);
+ curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, &CalendarEditSendData);
+ 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);
+
+ return ServerResult;
+
+}
+
+CalDAVServerResult CalDAV::EditCalendar(string *CalendarHREF,
+ string *CalendarName,
+ Colour *CalendarColour,
+ string *CalendarDescription,
+ int *CalendarOrder){
+
+ CalDAVServerResult ServerResult;
+
+ ServerResult = EditCalendarProcess(CalendarHREF,
+ CalendarName,
+ CalendarColour,
+ CalendarDescription,
+ CalendarOrder);
+
+ return ServerResult;
+
+}
+
+CalDAVServerResult CalDAV::EditCalendar(string *CalendarHREF,
+ Colour *CalendarColour){
+
+
+ CalDAVServerResult ServerResult;
+
+ ServerResult = EditCalendarProcess(CalendarHREF,
+ nullptr,
+ CalendarColour,
+ nullptr,
+ nullptr);
+
+ return ServerResult;
+
+}
+
+CalDAVServerResult CalDAV::EditCalendar(string *CalendarHREF,
+ string *CalendarName){
+
+ CalDAVServerResult ServerResult;
+
+ ServerResult = EditCalendarProcess(CalendarHREF,
+ CalendarName,
+ nullptr,
+ nullptr,
+ nullptr);
+
+ return ServerResult;
+
+}
+
+CalDAVServerResult CalDAV::EditCalendar(string *CalendarHREF,
+ int *CalendarOrder){
+
+ CalDAVServerResult ServerResult;
+
+ ServerResult = EditCalendarProcess(CalendarHREF,
+ nullptr,
+ nullptr,
+ nullptr,
+ CalendarOrder);
+
+ return ServerResult;
+
+}
+
+CalDAVServerResult CalDAV::EditCalendarDescription(string *CalendarHREF,
+ string *CalendarDescription){
+
+ CalDAVServerResult ServerResult;
+
+ ServerResult = EditCalendarProcess(CalendarHREF,
+ nullptr,
+ nullptr,
+ CalendarDescription,
+ nullptr);
+
+ return ServerResult;
+
+}
+
+CalDAVServerResult CalDAV::DeleteCalendar(string *CalendarHREF){
+
+ CalDAVServerResult ServerResult;
+
+ // Build the server address.
+
+ string UserPrincipalURI = "";
+ UserPrincipalURI = GetUserPrincipal();
+
+ if (UserPrincipalURI.size() == 0){
+
+ return ServerResult;
+
+ }
+
+ string CalendarHomeURI = "";
+ CalendarHomeURI = GetCalendarHome(UserPrincipalURI);
+
+ // Generate the UUID.
+
+ string UUIDValue = GenerateUUID();
+ UUIDValue.erase(UUIDValue.end()-1);
+
+ string CalendarHomeURL = CalendarHomeURI;
+ CalendarHomeURL.append(UUIDValue);
+ CalendarHomeURL.append("/");
+
+ // Build the calendar list address.
+
+ struct curl_slist *DeleteRequestHeader = NULL;
+
+ DeleteRequestHeader = curl_slist_append(DeleteRequestHeader, "Depth: infinity");
+
+ string CalendarDeleteURLAddress = BuildServerAddress(&ConnectionData, (*CalendarHREF));
+
+ curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, DeleteRequestHeader);
+ curl_easy_setopt(ConnectionHandle, CURLOPT_URL, CalendarDeleteURLAddress.c_str());
+ curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "DELETE");
+
+ // Delete the calendar.
+
+ 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::AddEntry(string *CalendarEntryHREF, string *EntryData){
+
+ // 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();
+
+ 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;
+
+}
bool CalDAVObjectValidSettings(CalDAVConnectionData *ConnData){
// Check if the passed CalDAV Connection Data is has