X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcarddav%2Fcarddav-serveretag.cpp;h=cf323387d84ec45a995ddd7c70992f8a8cd4b731;hb=26c542881613813bd6a671a56e78f129944f68e6;hp=85b0e15f2f2cc5ce27b2058a48c8237042ebeafb;hpb=911611528b36f56f7de9b6bf027b4c2a1a54df00;p=xestiaab%2F.git

diff --git a/source/carddav/carddav-serveretag.cpp b/source/carddav/carddav-serveretag.cpp
index 85b0e15..cf32338 100644
--- a/source/carddav/carddav-serveretag.cpp
+++ b/source/carddav/carddav-serveretag.cpp
@@ -1,3 +1,21 @@
+// carddav-serveretag.cpp - CardDAV Object - Server ETag subroutines.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include "carddav.h"
 #include "../version.h"
 #include <wx/wx.h>
@@ -12,6 +30,8 @@
 
 void CardDAV::GetServerETagValueThread()
 {
+	
+	// Get the server etag value (threaded).
 
 	PageData.Clear();
 	PageHeader.Clear();
@@ -51,34 +71,6 @@ void CardDAV::GetServerETagValueThread()
 	ServerAddressNormal = wxT("http://") + ServerAddressURL;
 	
 	ServerAuth = ServerUser + wxT(":") + ServerPass;
-	
-	// Workout if path is directory or filename.
-	
-	/*if (ServerAddress){
-		FilenameIsDirectory = TRUE;
-	} else {
-		FilenameIsDirectory = FALSE;
-	}*/
-	
-	// Try SSL first.
-
-
-	/*
-	char *ServerAdrSSLChar = new char[(ServerAddressSSL.Length() - 1)];
-	//memset(ServerAdrSSLChar, 0, ServerAddressSSL.Length());
-	strncpy(ServerAdrSSLChar, (const char*)ServerAddressSSL.mb_str(wxConvUTF8), (ServerAddressSSL.Length() - 1));
-	
-	char *ServerAdrNorChar = new char[(ServerAddressNormal.Length() - 1)];
-	//memset(ServerAdrNorChar, 0, ServerAddressSSL.Length());	
-	strncpy(ServerAdrNorChar, (const char*)ServerAddressNormal.mb_str(wxConvUTF8), (ServerAddressNormal.Length() - 1));
-
-	char *ServerAuthChar = new char[(ServerAuth.Length() - 1)];
-	//memset(ServerAuthChar, 0, ServerAddressSSL.Length());	
-	strncpy(ServerAuthChar, (const char*)ServerAuth.mb_str(wxConvUTF8), (ServerAuth.Length() - 1));
-	
-	*/
-
-	//std::string WriteDataString = std::string(ServerUploadData.mb_str());
 
 	std::map<int,int>::iterator ActIter;
 	struct UploadDataStruc UploadData;
@@ -91,9 +83,6 @@ void CardDAV::GetServerETagValueThread()
 	"<C:addressbook-query xmlns:D=\"DAV:\""
 	"	xmlns:C=\"urn:ietf:params:xml:ns:carddav\">"
 	"<D:prop><D:getetag/>"
-	//"<C:address-data>"
-	//"	<C:allprop/>"
-	//"</C:address-data></D:prop>"
 	"</D:prop>"
 	"<C:filter/>"
 	"</C:addressbook-query>";
@@ -117,14 +106,6 @@ void CardDAV::GetServerETagValueThread()
 		curl_easy_setopt(conn, CURLOPT_PROGRESSFUNCTION, ProgressFunc);
 		curl_easy_setopt(conn, CURLOPT_CUSTOMREQUEST, "REPORT");
 		curl_easy_setopt(conn, CURLOPT_NOSIGNAL, 1);
-
-		//UploadData.readptr = &CardDAVDataQuery;
-		//UploadData.sizeleft = CardDAVDataQuery.Len();
-		//curl_easy_setopt(conn, CURLOPT_UPLOAD, 1);
-		//curl_easy_setopt(conn, CURLOPT_READDATA, &UploadData);
-		//curl_easy_setopt(conn, CURLOPT_READFUNCTION, UploadReadFunc);
-		
-		//curl_easy_setopt(conn, CURLOPT_WRITEFUNCTION, writefunc);
 		curl_easy_setopt(conn, CURLOPT_POSTFIELDS, query);
 		curl_easy_setopt(conn, CURLOPT_POSTFIELDSIZE, strlen(query));
 
@@ -184,16 +165,11 @@ void CardDAV::GetServerETagValueThread()
 		// the certificates as PEM files.
 		
 		if (claconncode == CURLE_SSL_CACERT && wxFile::Exists(ServerCertFilename) == TRUE){
-		
-			//curl_easy_cleanup(conn);
-			//conn = curl_easy_init();
 
 			CURL *sslerrconn;
 			sslerrconn = curl_easy_init();
 			CURLcode sslerrconncode;
 
-			//claconncode = (curl_easy_perform(conn));
-
 			wxString ServerAddressOnly = wxT("https://") + ServerAddress + wxT(":") + wxString::Format(wxT("%i"), ServerPort) + wxT("/");
 
 			PageData.clear();
@@ -385,14 +361,6 @@ void CardDAV::GetServerETagValueThread()
 		curl_easy_setopt(conn, CURLOPT_PROGRESSFUNCTION, ProgressFunc);
 		curl_easy_setopt(conn, CURLOPT_CUSTOMREQUEST, "REPORT");
 		curl_easy_setopt(conn, CURLOPT_NOSIGNAL, 1);
-
-		//UploadData.readptr = &CardDAVDataQuery;
-		//UploadData.sizeleft = CardDAVDataQuery.Len();
-		//curl_easy_setopt(conn, CURLOPT_UPLOAD, 1);
-		//curl_easy_setopt(conn, CURLOPT_READDATA, &UploadData);
-		//curl_easy_setopt(conn, CURLOPT_READFUNCTION, UploadReadFunc);
-		
-		//curl_easy_setopt(conn, CURLOPT_WRITEFUNCTION, writefunc);
 		curl_easy_setopt(conn, CURLOPT_POSTFIELDS, query);
 		curl_easy_setopt(conn, CURLOPT_POSTFIELDSIZE, strlen(query));		
 		
@@ -579,6 +547,8 @@ void CardDAV::GetServerETagValueThread()
 
 void CardDAV::GetServerETagValue(){
 
+	// Get the server etag value.
+	
 	std::thread ConnectThread(&CardDAV::GetServerETagValueThread, this);
 	ConnectThread.detach();