using namespace std;
-size_t CalDAVReceive(char *ReceivedBuffer, size_t Size, size_t NewMemoryBytes, string *StringPointer)
+size_t CalDAVReceive(char *receivedBuffer, size_t size, size_t newMemoryBytes, string *stringPointer)
{
- StringPointer->append(ReceivedBuffer, NewMemoryBytes);
+ stringPointer->append(receivedBuffer, newMemoryBytes);
- return Size * NewMemoryBytes;
+ return size * newMemoryBytes;
}
-size_t CalDAVSend(char *SendBuffer, size_t Size, size_t NewMemoryBytes, void *DataStruct){
+size_t CalDAVSend(char *sendBuffer, size_t size, size_t newMemoryBytes, void *dataStruct){
- struct CalDAVSendData *UploadPtr = (struct CalDAVSendData *)DataStruct;
+ struct CalDAVSendData *uploadPtr = (struct calDAVSendData *)dataStruct;
- if (UploadPtr->sizeleft){
+ if (uploadPtr->sizeleft){
- UploadPtr->sizeleft--;
- char CharSend;
+ uploadPtr->sizeleft--;
+ char charSend;
- CharSend = (*UploadPtr->readptr)[UploadPtr->seek];
+ charSend = (*uploadPtr->readptr)[uploadPtr->seek];
- *SendBuffer = CharSend;
+ *sendBuffer = charSend;
- UploadPtr->seek++;
+ uploadPtr->seek++;
return 1;
// Setup the objects within the CalDAV connection
// object.
- ConnectionHandle = curl_easy_init();
+ connectionHandle = curl_easy_init();
}
// Destory the objects within the CalDAV connection
// object.
- curl_easy_cleanup(ConnectionHandle);
- ConnectionHandle = nullptr;
+ curl_easy_cleanup(connectionHandle);
+ connectionHandle = nullptr;
}
-void CalDAV::SetupConnectionData(CalDAVConnectionData *ConnData){
+void CalDAV::SetupConnectionData(CalDAVConnectionData *connData){
// Check if ConnData is a nullptr, return if it is.
- if (ConnData == nullptr){
+ if (connData == nullptr){
return;
}
// Set the connection settings to the values from ConnData.
- ConnectionData = (*ConnData);
+ connectionData = (*connData);
}
// Get the current connection settings for the CalDAV
// connection object and return a CalDAVStatus object.
- CalDAVStatus ConnectionStatus;
+ CalDAVStatus connectionStatus;
- ConnectionStatus.Hostname = ConnectionData.Hostname;
- ConnectionStatus.Port = ConnectionData.Port;
- ConnectionStatus.Username = ConnectionData.Username;
- ConnectionStatus.Prefix = ConnectionData.Prefix;
- ConnectionStatus.UseSSL = ConnectionData.UseSSL;
- ConnectionStatus.Timeout = ConnectionData.Timeout;
+ connectionStatus.hostname = connectionData.hostname;
+ connectionStatus.port = connectionData.port;
+ connectionStatus.username = connectionData.username;
+ connectionStatus.prefix = connectionData.prefix;
+ connectionStatus.useSSL = connectionData.useSSL;
+ connectionStatus.timeout = connectionData.timeout;
- return ConnectionStatus;
+ return connectionStatus;
}
CalDAVServerResult CalDAV::Connect(){
- CalDAVServerResult ServerResult;
+ CalDAVServerResult serverResult;
- string ServerAddress = "";
- string ServerUserPass = "";
+ string serverAddress = "";
+ string serverUserPass = "";
// Setup the server address.
- ServerAddress = BuildServerAddress(&ConnectionData, "/principals/");
+ serverAddress = BuildServerAddress(&connectionData, "/principals/");
// Setup the server password.
- ServerUserPass += ConnectionData.Username;
+ ServerUserPass += connectionData.username;
ServerUserPass += ":";
- ServerUserPass += ConnectionData.Password;
+ ServerUserPass += connectionData.password;
- curl_easy_setopt(ConnectionHandle, CURLOPT_URL, ServerAddress.c_str());
- curl_easy_setopt(ConnectionHandle, CURLOPT_USERPWD, ServerUserPass.c_str());
- curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
- curl_easy_setopt(ConnectionHandle, CURLOPT_FAILONERROR, 1L);
- curl_easy_setopt(ConnectionHandle, CURLOPT_TIMEOUT, ConnectionData.Timeout);
- curl_easy_setopt(ConnectionHandle, CURLOPT_WRITEFUNCTION, CalDAVReceive);
- curl_easy_setopt(ConnectionHandle, CURLOPT_WRITEDATA, &ServerData);
- curl_easy_setopt(ConnectionHandle, CURLOPT_WRITEHEADER, &ServerHeader);
+ curl_easy_setopt(connectionHandle, CURLOPT_URL, serverAddress.c_str());
+ curl_easy_setopt(connectionHandle, CURLOPT_USERPWD, serverUserPass.c_str());
+ curl_easy_setopt(connectionHandle, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+ curl_easy_setopt(connectionHandle, CURLOPT_FAILONERROR, 1L);
+ curl_easy_setopt(connectionHandle, CURLOPT_TIMEOUT, connectionData.timeout);
+ curl_easy_setopt(connectionHandle, CURLOPT_WRITEFUNCTION, calDAVReceive);
+ curl_easy_setopt(connectionHandle, CURLOPT_WRITEDATA, &serverData);
+ curl_easy_setopt(connectionHandle, CURLOPT_WRITEHEADER, &serverHeader);
// Connect to the CalDAV server.
- ServerResult.Code = curl_easy_perform(ConnectionHandle);
+ serverResult.code = curl_easy_perform(connectionHandle);
// Process the result received from the server.
- if (ServerResult.Code != CURLE_OK){
+ if (serverResult.code != CURLE_OK){
- ServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ serverResult.result = CALDAVQUERYRESULT_SERVERERROR;
} else {
- ServerResult.Result = CALDAVQUERYRESULT_OK;
+ serverResult.result = CALDAVQUERYRESULT_OK;
}
// Get the HTTP code.
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ServerResult.HTTPCode);
+ curl_easy_getinfo(connectionHandle, CURLINFO_RESPONSE_CODE, &serverResult.httpCode);
- return ServerResult;
+ return serverResult;
}
CalDAVServerResult CalDAV::GetServerResult(){
- return ConnectionServerResult;
+ return connectionServerResult;
}
CalDAVServerSupport CalDAV::GetServerSupport(){
- CalDAVServerSupport ServerStatus;
+ CalDAVServerSupport serverStatus;
// Setup the server connection.
- curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "OPTIONS");
+ curl_easy_setopt(connectionHandle, CURLOPT_CUSTOMREQUEST, "OPTIONS");
- CURLcode ServerResult = curl_easy_perform(ConnectionHandle);
+ CURLcode serverResult = curl_easy_perform(connectionHandle);
// Set the results.
- if (ServerResult == CURLE_OK){
- ConnectionServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverResult == CURLE_OK){
+ connectionServerResult.result = CALDAVQUERYRESULT_OK;
} else {
- ConnectionServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ connectionServerResult.result = CALDAVQUERYRESULT_SERVERERROR;
}
- ConnectionServerResult.Code = ServerResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ConnectionServerResult.HTTPCode);
+ connectionServerResult.code = serverResult;
+ curl_easy_getinfo(connectionHandle, CURLINFO_RESPONSE_CODE, &connectionServerResult.httpCode);
- if (ServerResult != CURLE_OK){
- return ServerStatus;
+ if (serverResult != CURLE_OK){
+ return serverStatus;
}
// Check that the server header has data in,
// otherwise return an "empty" CalDAVServerSupport.
- if (ServerHeader.size() == 0){
- return ServerStatus;
+ if (serverHeader.size() == 0){
+ return serverStatus;
}
// Process each line looking for the first DAV header
// line.
- bool NewlineMode = true;
+ bool newlineMode = true;
- string DAVLine;
+ string davLine;
- for (int CharSeek = 0; CharSeek < ServerHeader.size(); CharSeek++){
+ for (int charSeek = 0; charSeek < serverHeader.size(); charSeek++){
- if (NewlineMode == true){
+ if (newlineMode == true){
// Check if we have reached the end of the string.
- if (CharSeek >= ServerHeader.size()){
+ if (charSeek >= serverHeader.size()){
break;
// Check the first four letters to make sure
// they are 'DAV:'.
- string DAVHeaderCheck = "";
+ string davHeaderCheck = "";
try {
- DAVHeaderCheck = ServerHeader.substr(CharSeek, 4);
+ davHeaderCheck = serverHeader.substr(charSeek, 4);
}
catch (out_of_range &oor){
break;
}
- if (DAVHeaderCheck == "DAV:"){
+ if (davHeaderCheck == "DAV:"){
- CharSeek += 5;
+ charSeek += 5;
- for (; CharSeek < ServerHeader.size(); CharSeek++){
+ for (; charSeek < serverHeader.size(); charSeek++){
- if (ServerHeader[CharSeek] == '\n'){
+ if (serverHeader[charSeek] == '\n'){
break;
}
- DAVLine.push_back(ServerHeader[CharSeek]);
+ davLine.push_back(serverHeader[charSeek]);
}
}
- NewlineMode = false;
+ newlineMode = false;
}
- if (ServerHeader[CharSeek] == '\n'){
+ if (serverHeader[charSeek] == '\n'){
- NewlineMode = true;
+ newlineMode = true;
}
// Process the DAV line.
- vector<string> DAVLineData;
- string DAVSegmentString;
+ vector<string> davLineData;
+ string davSegmentString;
- for (int CharSeek = 0; CharSeek < DAVLine.size(); CharSeek++){
+ for (int charSeek = 0; charSeek < davLine.size(); charSeek++){
- if (DAVLine[CharSeek] == ' '){
+ if (davLine[charSeek] == ' '){
continue;
}
- if (DAVLine[CharSeek] == ','){
+ if (davLine[charSeek] == ','){
- DAVLineData.push_back(DAVSegmentString);
- DAVSegmentString.clear();
+ davLineData.push_back(davSegmentString);
+ davSegmentString.clear();
continue;
}
- DAVSegmentString += DAVLine[CharSeek];
+ davSegmentString += davLine[charSeek];
}
// Process the DAV values and set each value
// to true as required.
- for (int DAVItemSeek = 0;
- DAVItemSeek < DAVLineData.size();
- DAVItemSeek++){
+ for (int davItemSeek = 0;
+ davItemSeek < davLineData.size();
+ davItemSeek++){
- if (DAVLineData.at(DAVItemSeek) == "calendar-access"){
+ if (davLineData.at(davItemSeek) == "calendar-access"){
- ServerStatus.BasicSupport = true;
+ serverStatus.basicSupport = true;
}
// Reset the connection status.
- curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, NULL);
+ curl_easy_setopt(connectionHandle, CURLOPT_CUSTOMREQUEST, NULL);
- return ServerStatus;
+ return serverStatus;
}
string CalDAV::GetUserPrincipal(){
- string CurrentUserPrincipal = "";
- string UserPrincipalRequest = "";
- CalDAVSendData UserPrincipalSendData;
+ string currentUserPrincipal = "";
+ string userPrincipalRequest = "";
+ CalDAVSendData userPrincipalSendData;
- UserPrincipalRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ userPrincipalRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<d:propfind xmlns:d=\"DAV:\">\n"
" <d:prop>\n"
" <d:current-user-principal />\n"
" </d:prop>\n"
"</d:propfind>";
- UserPrincipalSendData.readptr = &UserPrincipalRequest;
- UserPrincipalSendData.sizeleft = UserPrincipalRequest.size();
+ userPrincipalSendData.readptr = &userPrincipalRequest;
+ userPrincipalSendData.sizeleft = userPrincipalRequest.size();
// Setup the header.
- struct curl_slist *UserPrincipalRequestHeader = NULL;
+ struct curl_slist *userPrincipalRequestHeader = NULL;
- UserPrincipalRequestHeader = curl_slist_append(UserPrincipalRequestHeader, "Depth: 0");
- UserPrincipalRequestHeader = curl_slist_append(UserPrincipalRequestHeader, "Prefer: return-minimal");
- UserPrincipalRequestHeader = curl_slist_append(UserPrincipalRequestHeader, "Content-Type: application/xml; charset=utf-8");
+ userPrincipalRequestHeader = curl_slist_append(userPrincipalRequestHeader, "Depth: 0");
+ userPrincipalRequestHeader = curl_slist_append(userPrincipalRequestHeader, "Prefer: return-minimal");
+ userPrincipalRequestHeader = curl_slist_append(userPrincipalRequestHeader, "Content-Type: application/xml; charset=utf-8");
- curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, UserPrincipalRequestHeader);
+ curl_easy_setopt(connectionHandle, CURLOPT_HTTPHEADER, userPrincipalRequestHeader);
- curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "PROPFIND");
- curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 1L);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, &UserPrincipalSendData);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, CalDAVSend);
+ curl_easy_setopt(connectionHandle, CURLOPT_CUSTOMREQUEST, "PROPFIND");
+ curl_easy_setopt(connectionHandle, CURLOPT_UPLOAD, 1L);
+ curl_easy_setopt(connectionHandle, CURLOPT_READDATA, &userPrincipalSendData);
+ curl_easy_setopt(connectionHandle, CURLOPT_READFUNCTION, calDAVSend);
// Process the data.
- ServerData.clear();
- ServerHeader.clear();
+ serverData.clear();
+ serverHeader.clear();
- CURLcode ServerResult = curl_easy_perform(ConnectionHandle);
+ CURLcode serverResult = curl_easy_perform(connectionHandle);
// Set the results.
- if (ServerResult == CURLE_OK){
- ConnectionServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverResult == CURLE_OK){
+ connectionServerResult.Result = CALDAVQUERYRESULT_OK;
} else {
- ConnectionServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ connectionServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
}
- ConnectionServerResult.Code = ServerResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ConnectionServerResult.HTTPCode);
+ connectionServerResult.Code = serverResult;
+ curl_easy_getinfo(connectionHandle, CURLINFO_RESPONSE_CODE, &connectionServerResult.HTTPCode);
- if (ServerResult != CURLE_OK){
+ if (serverResult != CURLE_OK){
- return CurrentUserPrincipal;
+ return currentUserPrincipal;
}
// Process the User Principal from the ServerData.
- CurrentUserPrincipal = ProcessXMLUserPrincipal();
+ currentUserPrincipal = ProcessXMLUserPrincipal();
// Reset the changed settings.
- 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_UPLOAD, 0L);
+ curl_easy_setopt(connectionHandle, CURLOPT_READDATA, NULL);
+ curl_easy_setopt(connectionHandle, CURLOPT_READFUNCTION, NULL);
- return CurrentUserPrincipal;
+ return currentUserPrincipal;
}
-string CalDAV::GetCalendarHome(string UserPrincipalURI){
+string CalDAV::GetCalendarHome(string userPrincipalURI){
- string CalendarHomeURI = "";
+ string calendarHomeURI = "";
// Build the Calendar Home URL address.
- string CalendarHomeURL = BuildServerAddress(&ConnectionData, UserPrincipalURI);
+ string calendarHomeURL = BuildServerAddress(&connectionData, userPrincipalURI);
// Setup the header request.
- CalDAVSendData CalendarHomeSendData;
+ CalDAVSendData calendarHomeSendData;
- string CalendarHomeRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ string calendarHomeRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<d:propfind xmlns:d=\"DAV:\" xmlns:c=\"urn:ietf:params:xml:ns:caldav\">\n"
" <d:prop>\n"
" <c:calendar-home-set />\n"
" </d:prop>\n"
"</d:propfind>";
- CalendarHomeSendData.readptr = &CalendarHomeRequest;
- CalendarHomeSendData.sizeleft = CalendarHomeRequest.size();
+ calendarHomeSendData.readptr = &calendarHomeRequest;
+ calendarHomeSendData.sizeleft = calendarHomeRequest.size();
// Setup the header.
- struct curl_slist *CalendarRequestHeader = NULL;
+ struct curl_slist *calendarRequestHeader = NULL;
- CalendarRequestHeader = curl_slist_append(CalendarRequestHeader, "Depth: 0");
- CalendarRequestHeader = curl_slist_append(CalendarRequestHeader, "Prefer: return-minimal");
- CalendarRequestHeader = curl_slist_append(CalendarRequestHeader, "Content-Type: application/xml; charset=utf-8");
+ calendarRequestHeader = curl_slist_append(calendarRequestHeader, "Depth: 0");
+ calendarRequestHeader = curl_slist_append(calendarRequestHeader, "Prefer: return-minimal");
+ calendarRequestHeader = curl_slist_append(calendarRequestHeader, "Content-Type: application/xml; charset=utf-8");
- curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, CalendarRequestHeader);
- curl_easy_setopt(ConnectionHandle, CURLOPT_URL, CalendarHomeURL.c_str());
- curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "PROPFIND");
- curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 1L);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, &CalendarHomeSendData);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, CalDAVSend);
+ curl_easy_setopt(connectionHandle, CURLOPT_HTTPHEADER, calendarRequestHeader);
+ curl_easy_setopt(connectionHandle, CURLOPT_URL, calendarHomeURL.c_str());
+ curl_easy_setopt(connectionHandle, CURLOPT_CUSTOMREQUEST, "PROPFIND");
+ curl_easy_setopt(connectionHandle, CURLOPT_UPLOAD, 1L);
+ curl_easy_setopt(connectionHandle, CURLOPT_READDATA, &calendarHomeSendData);
+ curl_easy_setopt(connectionHandle, CURLOPT_READFUNCTION, calDAVSend);
// Process the data.
- ServerData.clear();
- ServerHeader.clear();
+ serverData.clear();
+ serverHeader.clear();
- CURLcode ServerResult = curl_easy_perform(ConnectionHandle);
+ CURLcode serverResult = curl_easy_perform(connectionHandle);
// Set the results.
- if (ServerResult == CURLE_OK){
- ConnectionServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverResult == CURLE_OK){
+ connectionServerResult.result = CALDAVQUERYRESULT_OK;
} else {
- ConnectionServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ connectionServerResult.result = CALDAVQUERYRESULT_SERVERERROR;
}
- ConnectionServerResult.Code = ServerResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ConnectionServerResult.HTTPCode);
+ connectionServerResult.code = serverResult;
+ curl_easy_getinfo(connectionHandle, CURLINFO_RESPONSE_CODE, &connectionServerResult.httpCode);
- if (ServerResult != CURLE_OK){
+ if (serverResult != CURLE_OK){
- return CalendarHomeURI;
+ return calendarHomeURI;
}
// Process the User Principal from the ServerData.
- CalendarHomeURI = ProcessXMLCalendarHome();
+ calendarHomeURI = ProcessXMLCalendarHome();
// Reset the changed settings.
- string OriginalServerAddress = BuildServerAddress(&ConnectionData, "/principals/");
- curl_easy_setopt(ConnectionHandle, CURLOPT_URL, OriginalServerAddress.c_str());
+ 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);
+ 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;
+ return calendarHomeURI;
}
CalDAVCalendarList CalDAV::GetCalendars(){
- CalDAVCalendarList ServerList;
- CalDAVSendData CalendarListSendData;
+ CalDAVCalendarList serverList;
+ CalDAVSendData calendarListSendData;
// Build the server address.
- string UserPrincipalURI = "";
- UserPrincipalURI = GetUserPrincipal();
+ string userPrincipalURI = "";
+ userPrincipalURI = GetUserPrincipal();
- if (UserPrincipalURI.size() == 0){
+ if (userPrincipalURI.size() == 0){
- return ServerList;
+ return serverList;
}
- string CalendarHomeURI = "";
- CalendarHomeURI = GetCalendarHome(UserPrincipalURI);
+ string calendarHomeURI = "";
+ calendarHomeURI = GetCalendarHome(userPrincipalURI);
- string CalendarListURLAddress = BuildServerAddress(&ConnectionData, CalendarHomeURI);
+ string calendarListURLAddress = BuildServerAddress(&connectionData, calendarHomeURI);
- string CalendarListRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ string calendarListRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<d:propfind xmlns:d=\"DAV:\" xmlns:cs=\"http://calendarserver.org/ns/\""
" xmlns:c=\"urn:ietf:params:xml:ns:caldav\" xmlns:x0=\"http://apple.com/ns/ical/\">\n"
" <d:prop>\n"
" </d:prop>\n"
"</d:propfind>";
- CalendarListSendData.readptr = &CalendarListRequest;
- CalendarListSendData.sizeleft = CalendarListRequest.size();
+ calendarListSendData.readptr = &calendarListRequest;
+ calendarListSendData.sizeleft = calendarListRequest.size();
// Setup the header.
- struct curl_slist *CalendarListRequestHeader = NULL;
+ struct curl_slist *calendarListRequestHeader = NULL;
- CalendarListRequestHeader = curl_slist_append(CalendarListRequestHeader, "Depth: 1");
- CalendarListRequestHeader = curl_slist_append(CalendarListRequestHeader, "Prefer: return-minimal");
- CalendarListRequestHeader = curl_slist_append(CalendarListRequestHeader, "Content-Type: application/xml; charset=utf-8");
+ calendarListRequestHeader = curl_slist_append(calendarListRequestHeader, "Depth: 1");
+ calendarListRequestHeader = curl_slist_append(calendarListRequestHeader, "Prefer: return-minimal");
+ calendarListRequestHeader = curl_slist_append(calendarListRequestHeader, "Content-Type: application/xml; charset=utf-8");
- curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, CalendarListRequestHeader);
- curl_easy_setopt(ConnectionHandle, CURLOPT_URL, CalendarListURLAddress.c_str());
- curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "PROPFIND");
- curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 1L);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, &CalendarListSendData);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, CalDAVSend);
+ curl_easy_setopt(connectionHandle, CURLOPT_HTTPHEADER, calendarListRequestHeader);
+ curl_easy_setopt(connectionHandle, CURLOPT_URL, calendarListURLAddress.c_str());
+ curl_easy_setopt(connectionHandle, CURLOPT_CUSTOMREQUEST, "PROPFIND");
+ curl_easy_setopt(connectionHandle, CURLOPT_UPLOAD, 1L);
+ curl_easy_setopt(connectionHandle, CURLOPT_READDATA, &calendarListSendData);
+ curl_easy_setopt(connectionHandle, CURLOPT_READFUNCTION, calDAVSend);
// Process the data.
- ServerData.clear();
- ServerHeader.clear();
+ serverData.clear();
+ serverHeader.clear();
- CURLcode ServerResult = curl_easy_perform(ConnectionHandle);
+ CURLcode serverResult = curl_easy_perform(connectionHandle);
//ServerList = ProcessXMLCalendarList();
- if (ServerResult == CURLE_OK){
- ConnectionServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverResult == CURLE_OK){
+ connectionServerResult.result = CALDAVQUERYRESULT_OK;
} else {
- ConnectionServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ connectionServerResult.result = CALDAVQUERYRESULT_SERVERERROR;
}
- ConnectionServerResult.Code = ServerResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ConnectionServerResult.HTTPCode);
+ connectionServerResult.code = serverResult;
+ curl_easy_getinfo(connectionHandle, CURLINFO_RESPONSE_CODE, &connectionServerResult.httpCode);
- if (ServerResult != CURLE_OK){
+ if (cerverResult != CURLE_OK){
- return ServerList;
+ return serverList;
}
// Process the received XML data into a list of calendars
// and locations.
- ServerList = ProcessXMLCalendarList();
+ 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);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, NULL);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, NULL);
+ 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 ServerList;
+ return serverList;
}
-CalDAVEntryList CalDAV::GetEntryList(string *CalendarHREF){
+CalDAVEntryList CalDAV::GetEntryList(string *calendarHREF){
- CalDAVEntryList EntryList;
- CalDAVSendData EntryListSendData;
+ CalDAVEntryList entryList;
+ CalDAVSendData entryListSendData;
- if (CalendarHREF->size() == 0){
+ if (calendarHREF->size() == 0){
- return EntryList;
+ return entryList;
}
- string EntryListURLAddress = BuildServerAddress(&ConnectionData, *CalendarHREF);
+ string entryListURLAddress = BuildServerAddress(&connectionData, *calendarHREF);
- string EntryListRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+ string entryListRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
/*if (CalendarTag == nullptr){*/
- EntryListRequest += "<c:calendar-query xmlns:d=\"DAV:\" xmlns:cs=\"http://calendarserver.org/ns/\""
+ entryListRequest += "<c:calendar-query xmlns:d=\"DAV:\" xmlns:cs=\"http://calendarserver.org/ns/\""
" xmlns:c=\"urn:ietf:params:xml:ns:caldav\" xmlns:x0=\"http://apple.com/ns/ical/\">\n"
" <d:prop>\n"
" <d:getetag />\n"
}*/
- EntryListSendData.readptr = &EntryListRequest;
- EntryListSendData.sizeleft = EntryListRequest.size();
+ entryListSendData.readptr = &entryListRequest;
+ entryListSendData.sizeleft = entryListRequest.size();
- struct curl_slist *EntryListRequestHeader = NULL;
+ struct curl_slist *entryListRequestHeader = NULL;
- EntryListRequestHeader = curl_slist_append(EntryListRequestHeader, "Content-Type: application/xml; charset=utf-8");
+ entryListRequestHeader = curl_slist_append(entryListRequestHeader, "Content-Type: application/xml; charset=utf-8");
/*if (CalendarTag != nullptr){
}*/
- curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, EntryListRequestHeader);
- curl_easy_setopt(ConnectionHandle, CURLOPT_URL, EntryListURLAddress.c_str());
- curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "REPORT");
- curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 1L);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, &EntryListSendData);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, CalDAVSend);
+ curl_easy_setopt(connectionHandle, CURLOPT_HTTPHEADER, entryListRequestHeader);
+ curl_easy_setopt(connectionHandle, CURLOPT_URL, entryListURLAddress.c_str());
+ curl_easy_setopt(connectionHandle, CURLOPT_CUSTOMREQUEST, "REPORT");
+ curl_easy_setopt(connectionHandle, CURLOPT_UPLOAD, 1L);
+ curl_easy_setopt(connectionHandle, CURLOPT_READDATA, &entryListSendData);
+ curl_easy_setopt(connectionHandle, CURLOPT_READFUNCTION, calDAVSend);
// Process the data.
- ServerData.clear();
- ServerHeader.clear();
+ serverData.clear();
+ serverHeader.clear();
- CURLcode ServerResult = curl_easy_perform(ConnectionHandle);
+ CURLcode serverResult = curl_easy_perform(connectionHandle);
//ServerList = ProcessXMLCalendarList();
- if (ServerResult == CURLE_OK){
- ConnectionServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverResult == CURLE_OK){
+ connectionServerResult.result = CALDAVQUERYRESULT_OK;
} else {
- ConnectionServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ connectionServerResult.result = CALDAVQUERYRESULT_SERVERERROR;
}
- ConnectionServerResult.Code = ServerResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ConnectionServerResult.HTTPCode);
+ connectionServerResult.code = serverResult;
+ curl_easy_getinfo(connectionHandle, CURLINFO_RESPONSE_CODE, &connectionServerResult.httpCode);
- if (ServerResult != CURLE_OK){
+ if (serverResult != CURLE_OK){
- return EntryList;
+ return entryList;
}
// Process the received XML data into a list of calendars
// and locations.
- EntryList = ProcessXMLEntryList();
+ entryList = ProcessXMLEntryList();
// 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);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, NULL);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, NULL);
+ 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 EntryList;
+ return entryList;
}
-CalDAVEntryList CalDAV::GetEntryList(string *CalendarHREF, string *CalendarTag){
+CalDAVEntryList CalDAV::GetEntryList(string *calendarHREF, string *calendarTag){
- CalDAVEntryList EntryList;
- CalDAVSendData EntryListSendData;
+ CalDAVEntryList entryList;
+ CalDAVSendData entryListSendData;
- if (CalendarHREF->size() == 0){
+ if (calendarHREF->size() == 0){
- return EntryList;
+ return entryList;
}
- string EntryListURLAddress = BuildServerAddress(&ConnectionData, *CalendarHREF);
+ string entryListURLAddress = BuildServerAddress(&connectionData, *calendarHREF);
// First query: Get the list of contacts that need to be updated.
- string EntryListRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+ string entryListRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
- EntryListRequest += "<d:sync-collection xmlns:d=\"DAV:\" xmlns:cs=\"http://calendarserver.org/ns/\""
+ entryListRequest += "<d:sync-collection xmlns:d=\"DAV:\" xmlns:cs=\"http://calendarserver.org/ns/\""
" xmlns:c=\"urn:ietf:params:xml:ns:caldav\" xmlns:x0=\"http://apple.com/ns/ical/\">\n"
" <d:sync-token>";
- if (CalendarTag != nullptr){
+ if (calendarTag != nullptr){
- EntryListRequest += *CalendarTag;
+ entryListRequest += *calendarTag;
} else {
- EntryListRequest += "";
+ entryListRequest += "";
}
- EntryListRequest += "</d:sync-token>\n"
+ entryListRequest += "</d:sync-token>\n"
" <d:sync-level>1</d:sync-level>\n"
" <d:prop>\n"
" <d:getetag />\n"
" </d:prop>\n"
"</d:sync-collection>";
- EntryListSendData.readptr = &EntryListRequest;
- EntryListSendData.sizeleft = EntryListRequest.size();
+ entryListSendData.readptr = &entryListRequest;
+ entryListSendData.sizeleft = entryListRequest.size();
- struct curl_slist *EntryListRequestHeader = NULL;
+ struct curl_slist *entryListRequestHeader = NULL;
- EntryListRequestHeader = curl_slist_append(EntryListRequestHeader, "Content-Type: application/xml; charset=utf-8");
+ entryListRequestHeader = curl_slist_append(entryListRequestHeader, "Content-Type: application/xml; charset=utf-8");
- curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, EntryListRequestHeader);
- curl_easy_setopt(ConnectionHandle, CURLOPT_URL, EntryListURLAddress.c_str());
- curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "REPORT");
- curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 1L);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, &EntryListSendData);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, CalDAVSend);
+ curl_easy_setopt(connectionHandle, CURLOPT_HTTPHEADER, entryListRequestHeader);
+ curl_easy_setopt(connectionHandle, CURLOPT_URL, entryListURLAddress.c_str());
+ curl_easy_setopt(connectionHandle, CURLOPT_CUSTOMREQUEST, "REPORT");
+ curl_easy_setopt(connectionHandle, CURLOPT_UPLOAD, 1L);
+ curl_easy_setopt(connectionHandle, CURLOPT_READDATA, &entryListSendData);
+ curl_easy_setopt(connectionHandle, CURLOPT_READFUNCTION, calDAVSend);
// Process the data.
- ServerData.clear();
- ServerHeader.clear();
+ serverData.clear();
+ serverHeader.clear();
- CURLcode ServerResult = curl_easy_perform(ConnectionHandle);
+ CURLcode serverResult = curl_easy_perform(connectionHandle);
- if (ServerResult == CURLE_OK){
- ConnectionServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverResult == CURLE_OK){
+ connectionServerResult.result = CALDAVQUERYRESULT_OK;
} else {
- ConnectionServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ connectionServerResult.result = CALDAVQUERYRESULT_SERVERERROR;
}
- ConnectionServerResult.Code = ServerResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ConnectionServerResult.HTTPCode);
+ connectionServerResult.code = serverResult;
+ curl_easy_getinfo(connectionHandle, CURLINFO_RESPONSE_CODE, &connectionServerResult.httpCode);
- if (ServerResult != CURLE_OK){
+ if (serverResult != CURLE_OK){
- return EntryList;
+ return entryList;
}
- EntryList = ProcessXMLSyncTokenList();
+ entryList = ProcessXMLSyncTokenList();
// Check the last entry matches the HREF and if it
// does then delete it.
- if (EntryList.HREF.size() > 0) {
+ if (entryList.href.size() > 0) {
- if (EntryList.HREF.rbegin()->second == *CalendarHREF){
+ if (entryList.href.rbegin()->second == *calendarHREF){
- EntryList.HREF.erase((EntryList.HREF.size() - 1));
- EntryList.Tag.erase((EntryList.HREF.size() - 1));
- EntryList.Data.erase((EntryList.HREF.size() - 1));
+ entryList.href.erase((entryList.href.size() - 1));
+ entryList.tag.erase((entryList.href.size() - 1));
+ entryList.data.erase((entryList.href.size() - 1));
}
// Build the list into a new list for getting the new
// calendar data with.
- EntryListRequest.clear();
+ entryListRequest.clear();
- EntryListRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+ entryListRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
- EntryListRequest += "<c:calendar-multiget xmlns:d=\"DAV:\" "
+ entryListRequest += "<c:calendar-multiget xmlns:d=\"DAV:\" "
" xmlns:c=\"urn:ietf:params:xml:ns:caldav\">\n"
" <d:prop>\n"
" <d:getetag />\n"
" <c:calendar-data />\n"
" </d:prop>\n";
- for (std::map<int,string>::iterator HREFIter = EntryList.HREF.begin();
- HREFIter != EntryList.HREF.end(); HREFIter++){
+ for (std::map<int,string>::iterator hrefIter = entryList.href.begin();
+ hrefIter != entryList.href.end(); hrefIter++){
- string EntryListHREFString = HREFIter->second;
+ string entryListHREFString = hrefIter->second;
- EntryListRequest += " <d:href>";
- EntryListRequest += EntryListHREFString;
- EntryListRequest += "</d:href>\n";
+ entryListRequest += " <d:href>";
+ entryListRequest += entryListHREFString;
+ entryListRequest += "</d:href>\n";
}
- EntryListRequest += "</c:calendar-multiget>";
+ entryListRequest += "</c:calendar-multiget>";
- CalDAVSendData UpdatedEntryListSendData;
+ CalDAVSendData updatedEntryListSendData;
- UpdatedEntryListSendData.readptr = &EntryListRequest;
- UpdatedEntryListSendData.sizeleft = EntryListRequest.size();
+ updatedEntryListSendData.readptr = &entryListRequest;
+ updatedEntryListSendData.sizeleft = entryListRequest.size();
- curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, EntryListRequestHeader);
- curl_easy_setopt(ConnectionHandle, CURLOPT_URL, EntryListURLAddress.c_str());
- curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "REPORT");
- curl_easy_setopt(ConnectionHandle, CURLOPT_UPLOAD, 1L);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, &UpdatedEntryListSendData);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, CalDAVSend);
+ curl_easy_setopt(connectionHandle, CURLOPT_HTTPHEADER, entryListRequestHeader);
+ curl_easy_setopt(connectionHandle, CURLOPT_URL, entryListURLAddress.c_str());
+ curl_easy_setopt(connectionHandle, CURLOPT_CUSTOMREQUEST, "REPORT");
+ curl_easy_setopt(connectionHandle, CURLOPT_UPLOAD, 1L);
+ curl_easy_setopt(connectionHandle, CURLOPT_READDATA, &updatedEntryListSendData);
+ curl_easy_setopt(connectionHandle, CURLOPT_READFUNCTION, calDAVSend);
// Get the updated calendar data.
- ServerData.clear();
- ServerHeader.clear();
- EntryList.HREF.clear();
- EntryList.Tag.clear();
- EntryList.Data.clear();
+ serverData.clear();
+ serverHeader.clear();
+ entryList.href.clear();
+ entryList.tag.clear();
+ entryList.data.clear();
- ServerResult = curl_easy_perform(ConnectionHandle);
+ serverResult = curl_easy_perform(connectionHandle);
// Check the last entry matches the HREF and if it
// does then delete it.
- if (ServerResult == CURLE_OK){
- ConnectionServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverResult == CURLE_OK){
+ connectionServerResult.result = CALDAVQUERYRESULT_OK;
} else {
- ConnectionServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ connectionServerResult.result = CALDAVQUERYRESULT_SERVERERROR;
}
- ConnectionServerResult.Code = ServerResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ConnectionServerResult.HTTPCode);
+ connectionServerResult.code = serverResult;
+ curl_easy_getinfo(connectionHandle, CURLINFO_RESPONSE_CODE, &connectionServerResult.httpCode);
- if (ServerResult != CURLE_OK){
+ if (serverResult != CURLE_OK){
- return EntryList;
+ return entryList;
}
- EntryList = ProcessXMLEntryList();
+ entryList = ProcessXMLEntryList();
// Second query: Get the list of contact data for the contacts that have
// beenchanged.
// 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);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READDATA, NULL);
- curl_easy_setopt(ConnectionHandle, CURLOPT_READFUNCTION, NULL);
+ 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 EntryList;
+ return entryList;
}
-CalDAVServerResult CalDAV::AddCalendar(string CalendarName){
+CalDAVServerResult CalDAV::AddCalendar(string calendarName){
- CalDAVServerResult ServerResult;
+ CalDAVServerResult serverResult;
- AddCalendar(&CalendarName, nullptr);
+ AddCalendar(&calendarName, nullptr);
- return ServerResult;
+ return serverResult;
}
-CalDAVServerResult CalDAV::AddCalendar(string *CalendarName, string *CalendarShortName){
+CalDAVServerResult CalDAV::AddCalendar(string *calendarName, string *calendarShortName){
- CalDAVServerResult ServerResult;
- CalDAVSendData CalendarAddSendData;
+ CalDAVServerResult serverResult;
+ CalDAVSendData calendarAddSendData;
// Build the server address.
- string UserPrincipalURI = "";
- UserPrincipalURI = GetUserPrincipal();
+ string userPrincipalURI = "";
+ userPrincipalURI = GetUserPrincipal();
- if (UserPrincipalURI.size() == 0){
+ if (userPrincipalURI.size() == 0){
return ServerResult;
}
- string CalendarHomeURI = "";
- CalendarHomeURI = GetCalendarHome(UserPrincipalURI);
+ string calendarHomeURI = "";
+ calendarHomeURI = GetCalendarHome(userPrincipalURI);
// Generate the UUID.
string UUIDValue = "";
- if (CalendarShortName == nullptr){
+ if (calendarShortName == nullptr){
UUIDValue = GenerateUUID();
UUIDValue.erase(UUIDValue.end()-1);
} else {
- UUIDValue = *CalendarShortName;
+ UUIDValue = *calendarShortName;
}
- string CalendarHomeURL = CalendarHomeURI;
- CalendarHomeURL.append(UUIDValue);
- CalendarHomeURL.append("/");
+ string calendarHomeURL = calendarHomeURI;
+ calendarHomeURL.append(UUIDValue);
+ calendarHomeURL.append("/");
// Build the calendar list address.
- string CalendarListURLAddress = BuildServerAddress(&ConnectionData, CalendarHomeURL);
+ string calendarListURLAddress = BuildServerAddress(&connectionData, calendarHomeURL);
- string CalendarAddRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ string calendarAddRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<c:mkcalendar xmlns:d=\"DAV:\" xmlns:c=\"urn:ietf:params:xml:ns:caldav\">\n"
" <d:set>\n"
" <d:prop>\n"
" <d:displayname>";
- CalendarAddRequest += *CalendarName;
- CalendarAddRequest += "</d:displayname>\n"
+ calendarAddRequest += *calendarName;
+ calendarAddRequest += "</d:displayname>\n"
" <c:supported-calendar-component-set>\n"
" <c:comp name=\"VTODO\"/>\n"
" <c:comp name=\"VEVENT\"/>\n"
" </d:set>\n"
"</c:mkcalendar>";
- CalendarAddSendData.readptr = &CalendarAddRequest;
- CalendarAddSendData.sizeleft = CalendarAddRequest.size();
+ calendarAddSendData.readptr = &calendarAddRequest;
+ calendarAddSendData.sizeleft = calendarAddRequest.size();
// Setup the header.
- struct curl_slist *CalendarRequestHeader = NULL;
+ 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);
+ 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();
+ serverData.clear();
+ serverHeader.clear();
- CURLcode ServerConnectionResult = curl_easy_perform(ConnectionHandle);
+ CURLcode serverConnectionResult = curl_easy_perform(connectionHandle);
- if (ServerConnectionResult == CURLE_OK){
- ServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverConnectionResult == CURLE_OK){
+ serverResult.result = CALDAVQUERYRESULT_OK;
} else {
- ServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ serverResult.result = CALDAVQUERYRESULT_SERVERERROR;
}
- ServerResult.Code = ServerConnectionResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ServerResult.HTTPCode);
+ 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);
+ 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;
+ return serverResult;
}
-CalDAVServerResult CalDAV::EditCalendarProcess(string *CalendarHREF,
- string *CalendarName,
- Colour *CalendarColour,
- string *CalendarDescription,
- int *CalendarOrder){
+CalDAVServerResult CalDAV::EditCalendarProcess(string *calendarHREF,
+ string *calendarName,
+ Colour *calendarColour,
+ string *calendarDescription,
+ int *calendarOrder){
- CalDAVServerResult ServerResult;
- CalDAVSendData CalendarEditSendData;
+ CalDAVServerResult serverResult;
+ CalDAVSendData calendarEditSendData;
// Build the server address.
- string UserPrincipalURI = "";
- UserPrincipalURI = GetUserPrincipal();
+ string userPrincipalURI = "";
+ userPrincipalURI = GetUserPrincipal();
- if (UserPrincipalURI.size() == 0){
+ if (userPrincipalURI.size() == 0){
- return ServerResult;
+ return serverResult;
}
- string CalendarHomeURI = "";
- CalendarHomeURI = GetCalendarHome(UserPrincipalURI);
+ string calendarHomeURI = "";
+ calendarHomeURI = GetCalendarHome(userPrincipalURI);
// Generate the UUID.
string UUIDValue = GenerateUUID();
UUIDValue.erase(UUIDValue.end()-1);
- string CalendarHomeURL = CalendarHomeURI;
- CalendarHomeURL.append(UUIDValue);
- CalendarHomeURL.append("/");
+ string calendarHomeURL = calendarHomeURI;
+ calendarHomeURL.append(UUIDValue);
+ calendarHomeURL.append("/");
// Build the calendar list address.
- string CalendarEditURLAddress = BuildServerAddress(&ConnectionData, (*CalendarHREF));
+ string calendarEditURLAddress = BuildServerAddress(&connectionData, (*calendarHREF));
- string CalendarEditRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ string calendarEditRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<d:propertyupdate xmlns:d=\"DAV:\" xmlns:c=\"urn:ietf:params:xml:ns:caldav\"\n"
" xmlns:x0=\"http://apple.com/ns/ical/\">\n"
" <d:set>\n"
// Update the calendar name.
- if (CalendarName != nullptr){
+ if (calendarName != nullptr){
- CalendarEditRequest += "<d:displayname>";
- CalendarEditRequest += (*CalendarName);
- CalendarEditRequest += "</d:displayname>\n";
+ calendarEditRequest += "<d:displayname>";
+ calendarEditRequest += (*calendarName);
+ calendarEditRequest += "</d:displayname>\n";
}
// Update the calendar colour.
- if (CalendarColour != nullptr){
+ if (calendarColour != nullptr){
- CalendarEditRequest += "<x0:calendar-color>";
- CalendarEditRequest += (*CalendarColour);
- CalendarEditRequest += "</x0:calendar-color>\n";
+ calendarEditRequest += "<x0:calendar-color>";
+ calendarEditRequest += (*calendarColour);
+ calendarEditRequest += "</x0:calendar-color>\n";
}
// Update the calendar description.
- if (CalendarDescription != nullptr){
+ if (calendarDescription != nullptr){
- CalendarEditRequest += "<c:calendar-description>";
- CalendarEditRequest += (*CalendarDescription);
- CalendarEditRequest += "</c:calendar-description>\n";
+ calendarEditRequest += "<c:calendar-description>";
+ calendarEditRequest += (*calendarDescription);
+ calendarEditRequest += "</c:calendar-description>\n";
}
// Update the calendar order.
- if (CalendarOrder != nullptr){
+ if (calendarOrder != nullptr){
- CalendarEditRequest += "<x0:calendar-order>";
- CalendarEditRequest += to_string((*CalendarOrder));
- CalendarEditRequest += "</x0:calendar-order>\n";
+ calendarEditRequest += "<x0:calendar-order>";
+ calendarEditRequest += to_string((*calendarOrder));
+ calendarEditRequest += "</x0:calendar-order>\n";
}
- CalendarEditRequest += " </d:prop>\n"
+ calendarEditRequest += " </d:prop>\n"
" </d:set>\n"
"</d:propertyupdate>";
- CalendarEditSendData.readptr = &CalendarEditRequest;
- CalendarEditSendData.sizeleft = CalendarEditRequest.size();
+ calendarEditSendData.readptr = &calendarEditRequest;
+ calendarEditSendData.sizeleft = calendarEditRequest.size();
// Setup the header.
- struct curl_slist *CalendarRequestHeader = NULL;
+ 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);
+ 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();
+ serverData.clear();
+ serverHeader.clear();
- CURLcode ServerConnectionResult = curl_easy_perform(ConnectionHandle);
+ CURLcode serverConnectionResult = curl_easy_perform(connectionHandle);
- if (ServerConnectionResult == CURLE_OK){
- ServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverConnectionRsult == CURLE_OK){
+ serverResult.result = CALDAVQUERYRESULT_OK;
} else {
- ServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ serverResult.result = CALDAVQUERYRESULT_SERVERERROR;
}
- ServerResult.Code = ServerConnectionResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ServerResult.HTTPCode);
+ 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);
+ 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);
+CalDAVServerResult CalDAV::EditCalendar(string *calendarHREF,
+ string *calendarName,
+ Colour *calendarColour,
+ string *calendarDescription,
+ int *calendarOrder){
+
+ CalDAVServerResult serverResult;
+
+ serverResult = EditCalendarProcess(calendarHREF,
+ calendarName,
+ calendarColour,
+ calendarDescription,
+ calendarOrder);
- return ServerResult;
+ return serverResult;
}
Colour *CalendarColour){
- CalDAVServerResult ServerResult;
+ CalDAVServerResult serverResult;
- ServerResult = EditCalendarProcess(CalendarHREF,
+ serverResult = EditCalendarProcess(calendarHREF,
nullptr,
- CalendarColour,
+ calendarColour,
nullptr,
nullptr);
- return ServerResult;
+ return serverResult;
}
-CalDAVServerResult CalDAV::EditCalendar(string *CalendarHREF,
- string *CalendarName){
+CalDAVServerResult CalDAV::EditCalendar(string *calendarHREF,
+ string *calendarName){
- CalDAVServerResult ServerResult;
+ CalDAVServerResult serverResult;
- ServerResult = EditCalendarProcess(CalendarHREF,
- CalendarName,
+ serverResult = EditCalendarProcess(calendarHREF,
+ calendarName,
nullptr,
nullptr,
nullptr);
- return ServerResult;
+ return serverResult;
}
-CalDAVServerResult CalDAV::EditCalendar(string *CalendarHREF,
- int *CalendarOrder){
+CalDAVServerResult CalDAV::EditCalendar(string *calendarHREF,
+ int *calendarOrder){
- CalDAVServerResult ServerResult;
+ CalDAVServerResult serverResult;
- ServerResult = EditCalendarProcess(CalendarHREF,
+ serverResult = EditCalendarProcess(calendarHREF,
nullptr,
nullptr,
nullptr,
- CalendarOrder);
+ calendarOrder);
- return ServerResult;
+ return serverResult;
}
-CalDAVServerResult CalDAV::EditCalendarDescription(string *CalendarHREF,
- string *CalendarDescription){
+CalDAVServerResult CalDAV::EditCalendarDescription(string *calendarHREF,
+ string *calendarDescription){
- CalDAVServerResult ServerResult;
+ CalDAVServerResult serverResult;
- ServerResult = EditCalendarProcess(CalendarHREF,
+ serverResult = EditCalendarProcess(calendarHREF,
nullptr,
nullptr,
- CalendarDescription,
+ calendarDescription,
nullptr);
- return ServerResult;
+ return serverResult;
}
-CalDAVServerResult CalDAV::DeleteCalendar(string *CalendarHREF){
+CalDAVServerResult CalDAV::DeleteCalendar(string *calendarHREF){
- CalDAVServerResult ServerResult;
+ CalDAVServerResult serverResult;
// Build the server address.
- string UserPrincipalURI = "";
- UserPrincipalURI = GetUserPrincipal();
+ string userPrincipalURI = "";
+ userPrincipalURI = GetUserPrincipal();
- if (UserPrincipalURI.size() == 0){
+ if (userPrincipalURI.size() == 0){
- return ServerResult;
+ return serverResult;
}
- string CalendarHomeURI = "";
- CalendarHomeURI = GetCalendarHome(UserPrincipalURI);
+ string calendarHomeURI = "";
+ calendarHomeURI = GetCalendarHome(userPrincipalURI);
// Generate the UUID.
string UUIDValue = GenerateUUID();
UUIDValue.erase(UUIDValue.end()-1);
- string CalendarHomeURL = CalendarHomeURI;
- CalendarHomeURL.append(UUIDValue);
- CalendarHomeURL.append("/");
+ string calendarHomeURL = calendarHomeURI;
+ calendarHomeURL.append(UUIDValue);
+ calendarHomeURL.append("/");
// Build the calendar list address.
- struct curl_slist *DeleteRequestHeader = NULL;
+ struct curl_slist *deleteRequestHeader = NULL;
- DeleteRequestHeader = curl_slist_append(DeleteRequestHeader, "Depth: infinity");
+ deleteRequestHeader = curl_slist_append(deleteRequestHeader, "Depth: infinity");
- string CalendarDeleteURLAddress = BuildServerAddress(&ConnectionData, (*CalendarHREF));
+ 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");
+ 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();
+ serverData.clear();
+ serverHeader.clear();
- CURLcode ServerConnectionResult = curl_easy_perform(ConnectionHandle);
+ CURLcode serverConnectionResult = curl_easy_perform(connectionHandle);
- if (ServerConnectionResult == CURLE_OK){
- ServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverConnectionResult == CURLE_OK){
+ serverResult.Result = CALDAVQUERYRESULT_OK;
} else {
- ServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ serverResult.Result = CALDAVQUERYRESULT_SERVERERROR;
}
- ServerResult.Code = ServerConnectionResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ServerResult.HTTPCode);
+ 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);
+ 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;
+ return serverResult;
}
-CalDAVServerResult CalDAV::GetEntryETag(string *CalendarEntryHREF, string *ETagValue){
+CalDAVServerResult CalDAV::GetEntryETag(string *calendarEntryHREF, string *eTagValue){
- CalDAVServerResult ServerResult;
- CalDAVSendData EntryETagGetData;
+ CalDAVServerResult serverResult;
+ CalDAVSendData entryETagGetData;
// Build the server address.
- string UserPrincipalURI = "";
- UserPrincipalURI = GetUserPrincipal();
+ string userPrincipalURI = "";
+ userPrincipalURI = GetUserPrincipal();
- if (UserPrincipalURI.size() == 0){
+ if (userPrincipalURI.size() == 0){
- return ServerResult;
+ return serverResult;
}
- string CalendarHomeURI = "";
- CalendarHomeURI = GetCalendarHome(UserPrincipalURI);
+ string calendarHomeURI = "";
+ calendarHomeURI = GetCalendarHome(userPrincipalURI);
// Split the path and filename.
- string EntryURIPath;
- string EntryFilename;
+ string entryURIPath;
+ string entryFilename;
- SplitPathFilename(CalendarEntryHREF, &EntryURIPath, &EntryFilename);
+ SplitPathFilename(calendarEntryHREF, &entryURIPath, &entryFilename);
// Build the request for the server.
- string EntryETagRequest = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+ 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"
+ entryETagRequest += (*calendarEntryHREF);
+ entryETagRequest += "</d:href>\n"
"</c:calendar-multiget>";
- EntryETagGetData.readptr = &EntryETagRequest;
- EntryETagGetData.sizeleft = EntryETagRequest.size();
+ entryETagGetData.readptr = &entryETagRequest;
+ entryETagGetData.sizeleft = entryETagRequest.size();
// Build the calendar list address.
- struct curl_slist *GetETagRequestHeader = NULL;
+ 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");
+ 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);
+ 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);
+ 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();
+ serverData.clear();
+ serverHeader.clear();
- CURLcode ServerConnectionResult = curl_easy_perform(ConnectionHandle);
+ CURLcode serverConnectionResult = curl_easy_perform(connectionHandle);
- if (ServerConnectionResult == CURLE_OK){
- ServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverConnectionResult == CURLE_OK){
+ serverResult.result = CALDAVQUERYRESULT_OK;
} else {
- ServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ serverResult.result = CALDAVQUERYRESULT_SERVERERROR;
}
- ServerResult.Code = ServerConnectionResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ServerResult.HTTPCode);
+ serverResult.code = serverConnectionResult;
+ curl_easy_getinfo(connectionHandle, CURLINFO_RESPONSE_CODE, &serverResult.httpCode);
- if (ServerConnectionResult != CURLE_OK){
- return ServerResult;
+ if (serverConnectionResult != CURLE_OK){
+ return serverResult;
}
// Get the entity tag from the result.
- *ETagValue = ProcessXMLEntryETag();
+ *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);
+ 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;
+ return serverResult;
}
-CalDAVServerResult CalDAV::AddEntry(string *CalendarEntryHREF, string *EntryData){
+CalDAVServerResult CalDAV::AddEntry(string *calendarEntryHREF, string *entryData){
// Add an entry to the calendar collection.
- CalDAVServerResult ServerResult;
- CalDAVSendData EntryAddSendData;
+ CalDAVServerResult serverResult;
+ CalDAVSendData entryAddSendData;
// Build the calendar list address.
- string EntryAddURLAddress = BuildServerAddress(&ConnectionData, (*CalendarEntryHREF));
+ string entryAddURLAddress = BuildServerAddress(&connectionData, (*calendarEntryHREF));
- EntryAddSendData.readptr = EntryData;
- EntryAddSendData.sizeleft = EntryData->size();
+ entryAddSendData.readptr = entryData;
+ entryAddSendData.sizeleft = entryData->size();
- struct curl_slist *CalendarRequestHeader = NULL;
+ struct curl_slist *calendarRequestHeader = NULL;
- CalendarRequestHeader = curl_slist_append(CalendarRequestHeader, "Content-Type: text/calendar; charset=utf-8");
+ 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);
+ 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();
+ serverData.clear();
+ serverHeader.clear();
- CURLcode ServerConnectionResult = curl_easy_perform(ConnectionHandle);
+ CURLcode serverConnectionResult = curl_easy_perform(connectionHandle);
- if (ServerConnectionResult == CURLE_OK){
- ServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverConnectionResult == CURLE_OK){
+ serverResult.result = CALDAVQUERYRESULT_OK;
} else {
- ServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ serverResult.result = CALDAVQUERYRESULT_SERVERERROR;
}
- ServerResult.Code = ServerConnectionResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ServerResult.HTTPCode);
+ 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);
+ 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;
+ return serverResult;
}
-CalDAVServerResult CalDAV::EditEntry(string *CalendarEntryHREF, string *EntryData, string *EntryETag){
+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;
+ CalDAVServerResult serverResult;
+ CalDAVSendData entryAddSendData;
// Build the calendar list address.
- string EntryAddURLAddress = BuildServerAddress(&ConnectionData, (*CalendarEntryHREF));
+ string entryAddURLAddress = BuildServerAddress(&connectionData, (*calendarEntryHREF));
- EntryAddSendData.readptr = EntryData;
- EntryAddSendData.sizeleft = EntryData->size();
+ entryAddSendData.readptr = entryData;
+ entryAddSendData.sizeleft = entryData->size();
- string IfMatchHeader = "If-Match: \"";
- IfMatchHeader.append(*EntryETag);
- IfMatchHeader.append("\"");
+ string ifMatchHeader = "If-Match: \"";
+ ifMatchHeader.append(*entryETag);
+ ifMatchHeader.append("\"");
- struct curl_slist *CalendarRequestHeader = NULL;
+ 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());
+ 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());
- 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);
+ 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();
+ serverData.clear();
+ serverHeader.clear();
- CURLcode ServerConnectionResult = curl_easy_perform(ConnectionHandle);
+ CURLcode serverConnectionResult = curl_easy_perform(connectionHandle);
- if (ServerConnectionResult == CURLE_OK){
- ServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverConnectionResult == CURLE_OK){
+ serverResult.result = CALDAVQUERYRESULT_OK;
} else {
- ServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ serverResult.result = CALDAVQUERYRESULT_SERVERERROR;
}
- ServerResult.Code = ServerConnectionResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ServerResult.HTTPCode);
+ 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);
+ 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;
+ return serverResult;
}
-CalDAVServerResult CalDAV::DeleteEntry(string *CalendarEntryHREF){
+CalDAVServerResult CalDAV::DeleteEntry(string *calendarEntryHREF){
// Delete an entry in the calendar collection.
- CalDAVServerResult ServerResult;
+ CalDAVServerResult serverResult;
// Build the calendar list address.
- string EntryDeleteURLAddress = BuildServerAddress(&ConnectionData, (*CalendarEntryHREF));
+ string entryDeleteURLAddress = BuildServerAddress(&connectionData, (*calendarEntryHREF));
- curl_easy_setopt(ConnectionHandle, CURLOPT_HTTPHEADER, NULL);
- curl_easy_setopt(ConnectionHandle, CURLOPT_URL, EntryDeleteURLAddress.c_str());
- curl_easy_setopt(ConnectionHandle, CURLOPT_CUSTOMREQUEST, "DELETE");
+ curl_easy_setopt(connectionHandle, CURLOPT_HTTPHEADER, NULL);
+ curl_easy_setopt(connectionHandle, CURLOPT_URL, entryDeleteURLAddress.c_str());
+ curl_easy_setopt(connectionHandle, CURLOPT_CUSTOMREQUEST, "DELETE");
// Delete the calendar.
- ServerData.clear();
- ServerHeader.clear();
+ serverData.clear();
+ serverHeader.clear();
- CURLcode ServerConnectionResult = curl_easy_perform(ConnectionHandle);
+ CURLcode serverConnectionResult = curl_easy_perform(connectionHandle);
- if (ServerConnectionResult == CURLE_OK){
- ServerResult.Result = CALDAVQUERYRESULT_OK;
+ if (serverConnectionResult == CURLE_OK){
+ serverResult.result = CALDAVQUERYRESULT_OK;
} else {
- ServerResult.Result = CALDAVQUERYRESULT_SERVERERROR;
+ serverResult.result = CALDAVQUERYRESULT_SERVERERROR;
}
- ServerResult.Code = ServerConnectionResult;
- curl_easy_getinfo(ConnectionHandle, CURLINFO_RESPONSE_CODE, &ServerResult.HTTPCode);
+ 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);
+ 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;
+ return serverResult;
}
-bool CalDAVObjectValidSettings(CalDAVConnectionData *ConnData){
+bool CalDAVObjectValidSettings(CalDAVConnectionData *connData){
// Check if the passed CalDAV Connection Data is has
// an address set. Return false if nullptr is used.
- if (ConnData == nullptr){
+ if (connData == nullptr){
return false;
// Check the server hostname. Return false
// if no value has been set.
- if (ConnData->Hostname.size() == 0){
+ if (connData->hostname.size() == 0){
return false;
// no value has been set or the port number
// is less than 1 or higher than 65535.
- if (ConnData->Port < 1 || ConnData->Port > 65535){
+ if (connData->port < 1 || connData->port > 65535){
return false;
// Check the server username. Return false
// if no value has been set.
- if (ConnData->Username.size() == 0){
+ if (connData->username.size() == 0){
return false;
// Check the server password. Return false
// if no value has been set.
- if (ConnData->Password.size() == 0){
+ if (connData->password.size() == 0){
return false;
}
-string BuildServerAddress(CalDAVConnectionData *ConnData, string URIAddress){
+string BuildServerAddress(CalDAVConnectionData *connData, string uriAddress){
- string ServerAddress;
+ string serverAddress;
// Setup the server address.
- if (ConnData->UseSSL == true){
- ServerAddress += "https://";
+ if (connData->useSSL == true){
+ serverAddress += "https://";
} else {
- ServerAddress += "http://";
+ serverAddress += "http://";
}
- ServerAddress += ConnData->Hostname;
+ serverAddress += connData->hostname;
// Check if server port is 80, otherwise
// specifiy the port number in the address.
- if (ConnData->Port != 80){
- ServerAddress += ":";
- ServerAddress += to_string(ConnData->Port);
+ if (connData->port != 80){
+ serverAddress += ":";
+ serverAddress += to_string(connData->port);
}
- ServerAddress += URIAddress;
+ serverAddress += uriAddress;
- return ServerAddress;
+ return serverAddress;
}
\ No newline at end of file
Home |
News |
Projects |
Releases
Bugs |
RFE |
Repositories |
Help
