Updated code for testing EscapeString in CommonFunctions/EscapeString

[xestiaab/.git] / source / carddav / carddav-sslverify.cpp

diff --git a/source/carddav/carddav-sslverify.cpp b/source/carddav/carddav-sslverify.cpp
index 89998de..3c34641 100644 (file)
--- a/source/carddav/carddav-sslverify.cpp
+++ b/source/carddav/carddav-sslverify.cpp
@@ -1,3 +1,21 @@
+// carddav-sslverify.cpp - CardDAV Object - SSL verification 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 @@
 
 CURLcode CardDAV::SSLVerifyTest(){
 
+       // Verify the SSL information.
+       
        PageData.Clear();
        PageHeader.Clear();
 
@@ -29,19 +49,6 @@ CURLcode CardDAV::SSLVerifyTest(){
 
        conn = curl_easy_init();
 
-       /*struct CardDAVCURLPasser {
-
-               CardDAV *Data;
-               bool HeaderMode = TRUE;
-
-       } CardDAVHeader, CardDAVFooter;
-
-       CardDAVHeader.Data = this;
-       CardDAVHeader.HeaderMode = TRUE;
-
-       CardDAVFooter.Data = this;
-       CardDAVFooter.HeaderMode = FALSE;*/
-
        wxString Data1;
        wxString Data2;
 
@@ -62,8 +69,6 @@ CURLcode CardDAV::SSLVerifyTest(){
                curl_easy_setopt(conn, CURLOPT_URL, (const char*)ServerAddressSSL.mb_str(wxConvUTF8));
                curl_easy_setopt(conn, CURLOPT_CERTINFO, 1);
                curl_easy_setopt(conn, CURLOPT_VERBOSE, 1L);
-               //curl_easy_setopt(conn, CURLOPT_SSL_VERIFYPEER, FALSE);
-               //curl_easy_setopt(conn, CURLOPT_SSL_VERIFYHOST, FALSE);
                curl_easy_setopt(conn, CURLOPT_ERRORBUFFER, curlerrbuffer);
                curl_easy_setopt(conn, CURLOPT_WRITEFUNCTION, WritebackFunc);
                curl_easy_setopt(conn, CURLOPT_WRITEDATA, &PageData);